diff options
| author | cathook <cat.hook31894@gmail.com> | 2013-12-16 23:43:41 +0800 |
|---|---|---|
| committer | cathook <cat.hook31894@gmail.com> | 2013-12-16 23:43:41 +0800 |
| commit | 08b04db06e38944901c76bb486b6e6b32d8e26e7 (patch) | |
| tree | 63ece26d5f9fb45f9de6a9f50fc4ec58352ab62a | |
| parent | accc0ab0e46efb18519c625196821ec67b46b254 (diff) | |
| parent | de80501a9f7d24be51e4f3ac6efcdcd7b9611d6a (diff) | |
| download | ctl-08b04db06e38944901c76bb486b6e6b32d8e26e7.tar.gz ctl-08b04db06e38944901c76bb486b6e6b32d8e26e7.tar.zst ctl-08b04db06e38944901c76bb486b6e6b32d8e26e7.zip | |
Merge branch 'feature-utility' into develop
| -rw-r--r-- | include/utility.h | 5 | ||||
| -rw-r--r-- | src/utility.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/utility.h b/include/utility.h index 2e2de7e..c8844e8 100644 --- a/include/utility.h +++ b/include/utility.h @@ -23,12 +23,14 @@ /* cvoid const void */ /* pcvoid (cosnt void)* */ /* ppcvoid (const void)** */ +/* ... etc */ /* */ /* Type transform: */ /* Char(), pChar(), ppChar() */ /* Void(), pVoid(), ppVoid() */ /* cChar(), pcChar(), ppcChar() */ /* cVoid(), pcVoid(), ppcVoid() */ +/* ... etc */ /* */ /* Functions: */ /* ctl_malloc like malloc(), but will exit on error */ @@ -42,7 +44,8 @@ /**********************************************************/ typedef enum{ - BAD_MEMORY = 0x01 + CTL_MEMORY = 0x01, + CTL_USER = 0x02 } ErrorType; // int diff --git a/src/utility.c b/src/utility.c index 7287908..636d04c 100644 --- a/src/utility.c +++ b/src/utility.c @@ -8,7 +8,7 @@ pvoid ctl_malloc(size_t size){ void *ptr = malloc(size); if(ptr == NULL){ - ctl_die(BAD_MEMORY); + ctl_die(CTL_MEMORY); } return ptr; } @@ -17,7 +17,7 @@ pvoid ctl_malloc(size_t size){ pvoid ctl_realloc(pvoid ptr, size_t size){ ptr = realloc(ptr, size); if(ptr == NULL){ - ctl_die(BAD_MEMORY); + ctl_die(CTL_MEMORY); } return ptr; } @@ -32,7 +32,7 @@ pvoid ctl_free(pvoid ptr){ void ctl_die(ErrorType e){ fprintf(stderr, "exit(%d): ", (int)e); switch(e){ - case BAD_MEMORY: + case CTL_MEMORY: fprintf(stderr, "bad memory mananger\n"); break; } |