From 120b6a38af546987948505832c1d8d6fb3c853af Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 21 Feb 2007 15:09:20 +0000
Subject: Applied a consistent look to all header files (copyright, ifdefs)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9891 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/atcommand.h   |  3 +--
 src/map/battle.h      |  2 +-
 src/map/charcommand.h |  2 +-
 src/map/charsave.h    |  2 +-
 src/map/chat.h        |  2 +-
 src/map/chrif.h       |  2 +-
 src/map/clif.h        |  4 +---
 src/map/date.h        |  3 ++-
 src/map/guild.h       |  2 +-
 src/map/intif.h       |  2 +-
 src/map/irc.c         |  6 ++----
 src/map/irc.h         |  8 ++++++++
 src/map/itemdb.h      |  2 +-
 src/map/log.h         |  2 +-
 src/map/mail.h        |  6 ++++--
 src/map/map.h         |  2 +-
 src/map/mercenary.c   |  3 +++
 src/map/mercenary.h   | 10 ++++++++--
 src/map/mob.h         |  2 +-
 src/map/npc.h         |  3 +--
 src/map/party.h       |  2 +-
 src/map/pc.h          |  3 ++-
 src/map/pet.h         |  3 +--
 src/map/script.h      |  3 +--
 src/map/skill.h       |  2 +-
 src/map/status.h      |  2 +-
 src/map/storage.h     |  2 +-
 src/map/trade.h       |  2 +-
 src/map/unit.c        |  4 ++--
 src/map/unit.h        |  5 +++--
 src/map/vending.h     |  2 +-
 31 files changed, 56 insertions(+), 42 deletions(-)

(limited to 'src/map')

diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index 84b4fa0ed..644237245 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -325,5 +325,4 @@ extern char atcommand_symbol;
 #define MAX_MSG 1000
 extern char* msg_table[MAX_MSG];
 
-#endif
-
+#endif /* _ATCOMMAND_H_ */
diff --git a/src/map/battle.h b/src/map/battle.h
index 12e217218..c04fcfbfb 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -444,4 +444,4 @@ extern void battle_set_defaults(void);
 extern int battle_set_value(char *, char *);
 int battle_get_value(char *);
 
-#endif
+#endif /* _BATTLE_H_ */
diff --git a/src/map/charcommand.h b/src/map/charcommand.h
index 5982ffe30..979594251 100644
--- a/src/map/charcommand.h
+++ b/src/map/charcommand.h
@@ -70,5 +70,5 @@ int get_charcommand_level(const CharCommandType type);
 
 int charcommand_config_read(const char *cfgName);
 extern char charcommand_symbol;
-#endif
 
+#endif /* _CHARCOMMAND_H_ */
diff --git a/src/map/charsave.h b/src/map/charsave.h
index 5743c1c65..5734ebf58 100644
--- a/src/map/charsave.h
+++ b/src/map/charsave.h
@@ -18,4 +18,4 @@
 	void charsave_save_scdata(int account_id, int char_id, struct status_change* sc_data, int max_sc);
 #endif
 
-#endif
+#endif /* _CHARSAVE_H_ */
diff --git a/src/map/chat.h b/src/map/chat.h
index 702fd7dad..bfb1a0a80 100644
--- a/src/map/chat.h
+++ b/src/map/chat.h
@@ -19,4 +19,4 @@ int chat_enableevent(struct chat_data *cd);
 int chat_disableevent(struct chat_data *cd);
 int chat_npckickall(struct chat_data *cd);
 
-#endif
+#endif /* _CHAT_H_ */
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 302b31f56..a94591cd4 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -55,4 +55,4 @@ int do_init_chrif(void);
 
 int chrif_flush_fifo(void);
 
-#endif
+#endif /* _CHRIF_H_ */
diff --git a/src/map/clif.h b/src/map/clif.h
index 5ce426f96..ca3ae2278 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -362,6 +362,4 @@ int clif_hom_food(struct map_session_data *sd,int foodid,int fail);	//[orn]
 void clif_send_homdata(struct map_session_data *sd, int type, int param);	//[orn]
 int clif_hwalkok(struct homun_data *hd);	//[orn]
 
-#endif
-
-
+#endif /* _CLIF_H_ */
diff --git a/src/map/date.h b/src/map/date.h
index 2b8ffe991..cc19d88d1 100644
--- a/src/map/date.h
+++ b/src/map/date.h
@@ -3,7 +3,6 @@
 
 #ifndef _DATE_H_
 #define _DATE_H_
-#endif
 
 int date_get_year(void);
 int date_get_month(void);
@@ -15,3 +14,5 @@ int date_get_sec(void);
 int is_day_of_sun(void);
 int is_day_of_moon(void);
 int is_day_of_star(void);
+
+#endif /* _DATE_H_ */
diff --git a/src/map/guild.h b/src/map/guild.h
index 6171c72f2..e569c0d15 100644
--- a/src/map/guild.h
+++ b/src/map/guild.h
@@ -91,4 +91,4 @@ int guild_agit_break(struct mob_data *md);
 
 void do_final_guild(void);
 
-#endif
+#endif /* _GUILD_H_ */
diff --git a/src/map/intif.h b/src/map/intif.h
index 56f2f4783..b1d82940c 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -70,4 +70,4 @@ int intif_homunculus_requestdelete(int homun_id);
 
 int CheckForCharServer(void);
 
-#endif
+#endif /* _INTIF_H_ */
diff --git a/src/map/irc.c b/src/map/irc.c
index 55eafdcd9..2300dd3ac 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -1,5 +1,5 @@
-#ifndef _IRC_H_
-#define _IRC_H_
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
 
 #include <ctype.h>
 #include <stdio.h>
@@ -545,5 +545,3 @@ int irc_read_conf(char *file) {
 
 	return 1;
 }
-
-#endif //_IRC_H_
diff --git a/src/map/irc.h b/src/map/irc.h
index 2297f013b..163ac0793 100644
--- a/src/map/irc.h
+++ b/src/map/irc.h
@@ -1,3 +1,9 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _IRC_H_
+#define _IRC_H_
+
 #include "map.h"
 
 // IRC .conf file [Zido]
@@ -53,3 +59,5 @@ int set_access(char *nick,int level); // [Zido]
 int get_access(char *nick); // [Zido]
 int irc_rmnames(void); // [Zido]
 int irc_read_conf(char *file); // [Zido]
+
+#endif /* _IRC_H_ */
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 0b9e2a466..fb3d25964 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -142,4 +142,4 @@ void itemdb_reload(void);
 void do_final_itemdb(void);
 int do_init_itemdb(void);
 
-#endif
+#endif /* _ITEMDB_H_ */
diff --git a/src/map/log.h b/src/map/log.h
index 872506ac5..9f82f61a2 100644
--- a/src/map/log.h
+++ b/src/map/log.h
@@ -53,4 +53,4 @@ extern struct Log_Config {
 	char log_branch_db[32], log_pick_db[32], log_zeny_db[32], log_mvpdrop_db[32], log_gm_db[32], log_npc_db[32], log_chat_db[32];
 } log_config;
 
-#endif
+#endif /* _LOG_H_ */
diff --git a/src/map/mail.h b/src/map/mail.h
index d6f865f78..fca124ae4 100644
--- a/src/map/mail.h
+++ b/src/map/mail.h
@@ -1,8 +1,8 @@
 // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-// Mail System for eAthena
-// Created by Valaris
+#ifndef _MAIL_H_
+#define _MAIL_H_
 
 int mail_check(struct map_session_data *sd, int type);
 int mail_read(struct map_session_data *sd, int message_id);
@@ -10,3 +10,5 @@ int mail_delete(struct map_session_data *sd, int message_id);
 int mail_send(struct map_session_data *sd, char *name, char *message, int flag);
 
 int do_init_mail(void);
+
+#endif /* _MAIL_H_ */
diff --git a/src/map/map.h b/src/map/map.h
index a8e24d7fe..69cd1383b 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -1503,4 +1503,4 @@ typedef struct homun_data       TBL_HOM;
 extern int lowest_gm_level;
 extern char main_chat_nick[16];
 
-#endif
+#endif /* _MAP_H_ */
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index f7799e500..a11373032 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -1,3 +1,6 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index e5e194967..6103acc00 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -1,5 +1,9 @@
-// Homunculus and future Mercenary system code go here [Celest]
-// implemented by [orn]
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _MERCENARY_H_
+#define _MERCENARY_H_
+
 struct homunculus_db {
 	int class_ ;
 	char name[NAME_LENGTH];
@@ -81,3 +85,5 @@ int merc_skill_tree_get_max(int id, int b_class);
 void merc_hom_init_timers(struct homun_data * hd);
 void merc_skill_reload(void);
 void merc_reload(void);
+
+#endif /* _MERCENARY_H_ */
diff --git a/src/map/mob.h b/src/map/mob.h
index f13cce8da..09dfb5a2a 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -203,4 +203,4 @@ int mob_clone_delete(int class_);
 
 void mob_reload(void);
 
-#endif
+#endif /* _MOB_H_ */
diff --git a/src/map/npc.h b/src/map/npc.h
index ea28964f5..86bce296c 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -88,5 +88,4 @@ extern char *current_file;
 
 struct npc_data *fake_nd;
 
-#endif
-
+#endif /* _NPC_H_ */
diff --git a/src/map/party.h b/src/map/party.h
index 0b7c9a858..4c87dd501 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -47,4 +47,4 @@ int party_sub_count(struct block_list *bl, va_list ap);
 int party_foreachsamemap(int (*func)(struct block_list *,va_list),struct map_session_data *sd,int type,...);
 
 
-#endif
+#endif /* _PARTY_H_ */
diff --git a/src/map/pc.h b/src/map/pc.h
index f95a27085..dc6be203d 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -315,4 +315,5 @@ int duel_checktime(struct map_session_data* sd);
 
 int pc_read_motd(void); // [Valaris]
 int pc_disguise(struct map_session_data *sd, int class_);
-#endif
+
+#endif /* _PC_H_ */
diff --git a/src/map/pet.h b/src/map/pet.h
index 3bb6d0906..821874359 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -65,5 +65,4 @@ int read_petdb(void);
 int do_init_pet(void);
 int do_final_pet(void);
 
-#endif
-
+#endif /* _PET_H_ */
diff --git a/src/map/script.h b/src/map/script.h
index 09b4a797b..bad0374dd 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -90,5 +90,4 @@ int script_reload(void);
 
 extern char mapreg_txt[];
 
-#endif
-
+#endif /* _SCRIPT_H_ */
diff --git a/src/map/skill.h b/src/map/skill.h
index ddb9042a0..cab8039c0 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -956,4 +956,4 @@ enum {
 	UNT_GROUNDDRIFT_FIRE,
 };
 
-#endif
+#endif /* _SKILL_H_ */
diff --git a/src/map/status.h b/src/map/status.h
index ce8fbd827..3c8d37e69 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -657,4 +657,4 @@ int status_check_visibility(struct block_list *src, struct block_list *target);
 int status_readdb(void);
 int do_init_status(void);
 
-#endif
+#endif /* _STATUS_H_ */
diff --git a/src/map/storage.h b/src/map/storage.h
index 2140a2ec5..a9f109319 100644
--- a/src/map/storage.h
+++ b/src/map/storage.h
@@ -42,4 +42,4 @@ int storage_comp_item(const void *_i1, const void *_i2);
 void sortage_sortitem(struct storage* stor);
 void sortage_gsortitem(struct guild_storage* gstor);
 
-#endif
+#endif /* _STORAGE_H_ */
diff --git a/src/map/trade.h b/src/map/trade.h
index bcd609271..cbcf34f2a 100644
--- a/src/map/trade.h
+++ b/src/map/trade.h
@@ -12,4 +12,4 @@ void trade_tradeok(struct map_session_data *sd);
 void trade_tradecancel(struct map_session_data *sd);
 void trade_tradecommit(struct map_session_data *sd);
 
-#endif	// _TRADE_H_
+#endif /* _TRADE_H_ */
diff --git a/src/map/unit.c b/src/map/unit.c
index 80e0137cf..79dcd3a80 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1,6 +1,6 @@
-// Copyright (c) jAthena Dev Teams - Licensed under GNU GPL
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
-// Merged originally from jA by Skotlex
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/map/unit.h b/src/map/unit.h
index 9b53f90bf..32fc3cce7 100644
--- a/src/map/unit.h
+++ b/src/map/unit.h
@@ -1,6 +1,6 @@
-// Copyright (c) jAthena Dev Teams - Licensed under GNU GPL
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
-// Merged originally from jA by Skotlex
+
 #ifndef _UNIT_H_
 #define _UNIT_H_
 
@@ -69,4 +69,5 @@ int do_final_unit(void);
 
 extern const int dirx[8];
 extern const int diry[8];
+
 #endif /* _UNIT_H_ */
diff --git a/src/map/vending.h b/src/map/vending.h
index f4014a894..d9db08b6d 100644
--- a/src/map/vending.h
+++ b/src/map/vending.h
@@ -11,4 +11,4 @@ void vending_openvending(struct map_session_data *sd,int len,char *message,int f
 void vending_vendinglistreq(struct map_session_data *sd,int id);
 void vending_purchasereq(struct map_session_data *sd,int len,int id,unsigned char *p);
 
-#endif	// _VENDING_H_
+#endif /* _VENDING_H_ */
-- 
cgit v1.2.3-70-g09d2