summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/cbasetypes.h1
-rw-r--r--src/common/core.h2
-rw-r--r--src/common/db.h2
-rw-r--r--src/common/grfio.h3
-rw-r--r--src/common/lock.h3
-rw-r--r--src/common/malloc.h3
-rw-r--r--src/common/mapindex.c3
-rw-r--r--src/common/mapindex.h10
-rw-r--r--src/common/md5calc.h2
-rw-r--r--src/common/mmo.h2
-rw-r--r--src/common/nullpo.h2
-rw-r--r--src/common/plugin.h2
-rw-r--r--src/common/plugins.h2
-rw-r--r--src/common/showmsg.h2
-rw-r--r--src/common/socket.h2
-rw-r--r--src/common/strlib.h7
-rw-r--r--src/common/timer.h2
-rw-r--r--src/common/utils.h6
-rw-r--r--src/common/version.h2
19 files changed, 34 insertions, 24 deletions
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index 76f494851..1eea1c465 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -1,5 +1,6 @@
#ifndef _CBASETYPES_H_
#define _CBASETYPES_H_
+
/* +--------+-----------+--------+---------+
* | ILP32 | LP64 | ILP64 | (LL)P64 |
* +------------+--------+-----------+--------+---------+
diff --git a/src/common/core.h b/src/common/core.h
index 06ce86448..5e396cc7a 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -20,4 +20,4 @@ extern void set_server_type(void);
extern void set_termfunc(void (*termfunc)(void));
extern void do_final(void);
-#endif // _CORE_H_
+#endif /* _CORE_H_ */
diff --git a/src/common/db.h b/src/common/db.h
index a79c88822..0c19b5fc2 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -702,4 +702,4 @@ void* linkdb_search ( struct linkdb_node** head, void *key);
void* linkdb_erase ( struct linkdb_node** head, void *key);
void linkdb_final ( struct linkdb_node** head );
-#endif
+#endif /* _DB_H_ */
diff --git a/src/common/grfio.h b/src/common/grfio.h
index 572258b04..0d6268b0d 100644
--- a/src/common/grfio.h
+++ b/src/common/grfio.h
@@ -19,4 +19,5 @@ int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char*
int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
int deflate_file (const char *source, const char *filename);
-#endif // _GRFIO_H_
+#endif /* _GRFIO_H_ */
+
diff --git a/src/common/lock.h b/src/common/lock.h
index e90fbf745..537305ccf 100644
--- a/src/common/lock.h
+++ b/src/common/lock.h
@@ -9,5 +9,4 @@
FILE* lock_fopen(const char* filename,int *info);
int lock_fclose(FILE *fp,const char* filename,int *info);
-#endif
-
+#endif /* _LOCK_H_ */
diff --git a/src/common/malloc.h b/src/common/malloc.h
index 1af9cba62..5411d670d 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -3,6 +3,7 @@
#ifndef _MALLOC_H_
#define _MALLOC_H_
+
// Q: What are the 'a'-variant allocation functions?
// A: They allocate memory from the stack, which is automatically
// freed when the invoking function returns.
@@ -157,4 +158,4 @@ unsigned int malloc_usage (void);
void malloc_init (void);
void malloc_final (void);
-#endif
+#endif /* _MALLOC_H_ */
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index 070326463..be6580ae5 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -1,3 +1,6 @@
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/common/mapindex.h b/src/common/mapindex.h
index 7a0286adf..68989031d 100644
--- a/src/common/mapindex.h
+++ b/src/common/mapindex.h
@@ -1,5 +1,9 @@
-#ifndef _MAX_INDEX_H
-#define _MAX_INDEX_H
+// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
+#ifndef _MAPINDEX_H_
+#define _MAPINDEX_H_
+
//File in charge of assigning a numberic ID to each map in existance for space saving when passing map info between servers.
extern char mapindex_cfgfile[80];
@@ -38,4 +42,4 @@ const char* mapindex_id2name(unsigned short);
void mapindex_init(void);
void mapindex_final(void);
-#endif
+#endif /* _MAPINDEX_H_ */
diff --git a/src/common/md5calc.h b/src/common/md5calc.h
index 9bc554f69..fc1c274f2 100644
--- a/src/common/md5calc.h
+++ b/src/common/md5calc.h
@@ -4,4 +4,4 @@
void MD5_String(const char * string, char * output);
void MD5_String2binary(const char * string, char * output);
-#endif
+#endif /* _MD5CALC_H_ */
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 48a8266e7..f946b46cb 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -511,4 +511,4 @@ enum {
#endif
#endif
-#endif // _MMO_H_
+#endif /* _MMO_H_ */
diff --git a/src/common/nullpo.h b/src/common/nullpo.h
index d5ccb8f95..71525dd00 100644
--- a/src/common/nullpo.h
+++ b/src/common/nullpo.h
@@ -234,4 +234,4 @@ void nullpo_info_f(const char *file, int line, const char *func,
__attribute__((format(printf,4,5)));
-#endif
+#endif /* _NULLPO_H_ */
diff --git a/src/common/plugin.h b/src/common/plugin.h
index f30a15e5e..3ddbaae98 100644
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -80,4 +80,4 @@ typedef void Plugin_Event_Func(void);
#define PLUGIN_EVENTS_TABLE struct _Plugin_Event_Table plugin_event_table[]
void** plugin_call_table;
-#endif // _PLUGIN_H_
+#endif /* _PLUGIN_H_ */
diff --git a/src/common/plugins.h b/src/common/plugins.h
index 9cb4b94b4..70dd6b326 100644
--- a/src/common/plugins.h
+++ b/src/common/plugins.h
@@ -63,4 +63,4 @@ void plugin_unload(Plugin* plugin);
void plugins_init(void);
void plugins_final(void);
-#endif // _PLUGINS_H_
+#endif /* _PLUGINS_H_ */
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index cf9c16d23..31933f17a 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -93,4 +93,4 @@ extern int ShowDebug(const char *, ...);
extern int ShowError(const char *, ...);
extern int ShowFatalError(const char *, ...);
-#endif
+#endif /* _SHOWMSG_H_ */
diff --git a/src/common/socket.h b/src/common/socket.h
index 1c4a1bd8c..0c96edb20 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -141,4 +141,4 @@ int socket_getips(uint32* ips, int max);
extern uint32 addr_[16]; // ip addresses of local host (host byte order)
extern int naddr_; // # of ip addresses
-#endif // _SOCKET_H_
+#endif /* _SOCKET_H_ */
diff --git a/src/common/strlib.h b/src/common/strlib.h
index f242b5cc4..8303c182f 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -1,8 +1,9 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef _J_STR_LIB_H_
-#define _J_STR_LIB_H_
+#ifndef _STRLIB_H_
+#define _STRLIB_H_
+
#define J_MAX_MALLOC_SIZE 65535
// String function library.
// code by Jioh L. Jung (ziozzang@4wish.net)
@@ -26,4 +27,4 @@ const char *stristr(const char *haystack, const char *needle);
size_t strnlen (const char* string, size_t maxlen);
#endif
-#endif
+#endif /* _STRLIB_H_ */
diff --git a/src/common/timer.h b/src/common/timer.h
index 4b683d966..23cb6beaa 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -59,4 +59,4 @@ unsigned long get_uptime(void);
void timer_init(void);
void timer_final(void);
-#endif // _TIMER_H_
+#endif /* _TIMER_H_ */
diff --git a/src/common/utils.h b/src/common/utils.h
index efd477c9b..3e74374bc 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -1,8 +1,8 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder
-#ifndef COMMON_UTILS_H
-#define COMMON_UTILS_H
+#ifndef _UTILS_H_
+#define _UTILS_H_
#include <stdarg.h>
@@ -41,4 +41,4 @@ extern unsigned short GetWord(unsigned long val, size_t num);
extern unsigned short MakeWord(unsigned char byte0, unsigned char byte1);
extern unsigned long MakeDWord(unsigned short word0, unsigned short word1);
-#endif
+#endif /* _UTILS_H_ */
diff --git a/src/common/version.h b/src/common/version.h
index 2560c1019..71a93dcd9 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -27,4 +27,4 @@
// C言語の仕様上、最初に0を付けると8進数になるので間違えないで下さい。
#define ATHENA_MOD_VERSION 1249 // mod version (patch No.)
-#endif
+#endif /* _VERSION_H_ */
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-11 17:24:38 +0000