diff options
author | Prasanna Kumar Kalever <prasanna.kalever@redhat.com> | 2017-02-02 16:45:10 +0530 |
---|---|---|
committer | Prasanna Kumar Kalever <prasanna.kalever@redhat.com> | 2017-02-05 20:53:35 +0530 |
commit | acd4965776507abe1102b3a2bfa5ed9cd0340e14 (patch) | |
tree | 6bbf67ce94d1140e6550d2ea4ecc128f3e8123ed /utils.c | |
parent | ff74a2144e02af11373375f8d40e9b312a0dd0c6 (diff) |
gluster-block: refresh logging
add more meaningful log messages
minor code changes such as renaming, indentation and et cetera.
Signed-off-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
Diffstat (limited to 'utils.c')
-rw-r--r-- | utils.c | 63 |
1 files changed, 35 insertions, 28 deletions
@@ -16,38 +16,40 @@ int blockMetaKeyEnumParse(const char *opt) { - int i; + int i; - if (!opt) { - return METAKEY__MAX; - } - for (i = 0; i < METAKEY__MAX; i++) { - if (!strcmp(opt, MetakeyLookup[i])) { - return i; - } + if (!opt) { + return GB_METAKEY_MAX; + } + + for (i = 0; i < GB_METAKEY_MAX; i++) { + if (!strcmp(opt, MetakeyLookup[i])) { + return i; } + } - return i; + return i; } int blockMetaStatusEnumParse(const char *opt) { - int i; + int i; - if (!opt) { - return METASTATUS__MAX; - } - for (i = 0; i < METASTATUS__MAX; i++) { - if (!strcmp(opt, MetaStatusLookup[i])) { - return i; - } + if (!opt) { + return GB_METASTATUS_MAX; + } + + for (i = 0; i < GB_METASTATUS_MAX; i++) { + if (!strcmp(opt, MetaStatusLookup[i])) { + return i; } + } - return i; + return i; } @@ -56,11 +58,12 @@ gbAlloc(void *ptrptr, size_t size, const char *filename, const char *funcname, size_t linenr) { *(void **)ptrptr = calloc(1, size); + if (*(void **)ptrptr == NULL) { - ERROR("%s", "Error: memory allocation failed"); errno = ENOMEM; return -1; } + return 0; } @@ -70,11 +73,12 @@ gbAllocN(void *ptrptr, size_t size, size_t count, const char *filename, const char *funcname, size_t linenr) { *(void**)ptrptr = calloc(count, size); + if (*(void**)ptrptr == NULL) { - ERROR("%s", "Error: memory allocation failed"); errno = ENOMEM; return -1; } + return 0; } @@ -84,8 +88,9 @@ gbFree(void *ptrptr) { int save_errno = errno; - if(*(void**)ptrptr == NULL) + if(*(void**)ptrptr == NULL) { return; + } free(*(void**)ptrptr); *(void**)ptrptr = NULL; @@ -97,13 +102,15 @@ int gbStrdup(char **dest, const char *src, const char *filename, const char *funcname, size_t linenr) { - *dest = NULL; - if (!src) - return 0; - if (!(*dest = strdup(src))) { - ERROR("%s", "Error: string duplication failed"); - return -1; - } + *dest = NULL; + if (!src) { return 0; + } + + if (!(*dest = strdup(src))) { + return -1; + } + + return 0; } |