diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-04-07 18:00:13 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-04-07 18:00:13 +0000 |
| commit | 1a348ede4934a1ba78f337ee1dffe11a699f4bef (patch) | |
| tree | 883d4c1ae282fb67e1720f81c20f564499298ff4 /src/common/utils.h | |
| parent | 7cb0d361f1b4260b47ab1da99224332947320553 (diff) | |
| parent | a6cd6538e4271ea08dc86803e8b7e8c8f235960b (diff) | |
| download | hercules-1a348ede4934a1ba78f337ee1dffe11a699f4bef.tar.gz hercules-1a348ede4934a1ba78f337ee1dffe11a699f4bef.tar.bz2 hercules-1a348ede4934a1ba78f337ee1dffe11a699f4bef.tar.xz hercules-1a348ede4934a1ba78f337ee1dffe11a699f4bef.zip | |
branch for major stability breakage
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@1440 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/utils.h')
| -rw-r--r-- | src/common/utils.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/common/utils.h b/src/common/utils.h index 248bcd867..63c3f21ec 100644 --- a/src/common/utils.h +++ b/src/common/utils.h @@ -1,5 +1,6 @@ -#ifndef UTILS_H -#define UTILS_H +#ifndef COMMON_UTILS_H +#define COMMON_UTILS_H + #ifndef NULL #define NULL (void *)0 @@ -20,16 +21,23 @@ #endif -void dump(unsigned char *buffer, int num); + void dump(unsigned char *buffer, int num); + #define CREATE(result, type, number) do {\ if ((number) * sizeof(type) <= 0) \ printf("SYSERR: Zero bytes or less requested at %s:%d.\n", __FILE__, __LINE__); \ - if (!((result) = (type *) calloc ((number), sizeof(type)))) \ + if (!((result) = (type *) aCalloc ((number), sizeof(type)))) \ + { perror("SYSERR: malloc failure"); abort(); } } while(0) + +#define CREATE_A(result, type, number) do {\ + if ((number) * sizeof(type) <= 0) \ + printf("SYSERR: Zero bytes or less requested at %s:%d.\n", __FILE__, __LINE__); \ + if (!((result) = (type *) aCallocA ((number), sizeof(type)))) \ { perror("SYSERR: malloc failure"); abort(); } } while(0) #define RECREATE(result,type,number) do {\ - if (!((result) = (type *) realloc ((result), sizeof(type) * (number))))\ + if (!((result) = (type *) aRealloc ((result), sizeof(type) * (number))))\ { printf("SYSERR: realloc failure"); abort(); } } while(0) struct StringBuf { |