cppcheck: fix realloc, vanullarg, unsignedcmp

diff --git a/src/token.c b/src/token.c
index 4860afd3a43cae9276ca4ec6ed7e96fc46bbd2e8..5f56e75d8780dc453122cc1ddd26ca1cb3b4596d 100644 (file)
--- a/src/token.c
+++ b/src/token.c
@@ -93,8 +93,16 @@ struct psi_token *psi_token_cat(unsigned argc, ...) {
 
                if (T) {
                        size_t token_len = T->size, fname_len = strlen(T->file);
+                       struct psi_token *tmp = realloc(T, psi_token_alloc_size(T->size += arg->size + 1, fname_len));
+
+                       if (tmp) {
+                               T = tmp;
+                       } else {
+                               free(T);
+                               va_end(argv);
+                               return NULL;
+                       }
 
-                       T = realloc(T, psi_token_alloc_size(T->size += arg->size + 1, fname_len));
                        T->text = &T->buf[0];
                        T->file = &T->buf[T->size + 1];
                        T->buf[token_len] = ' ';
@@ -139,29 +147,29 @@ struct psi_token *psi_token_translit(struct psi_token *T, char *from, char *to)
 
 static inline uint64_t psi_hash(char *digest_buf, ...)
 {
-    uint64_t hash = 5381;
-    uint8_t c;
-    const uint8_t *ptr;
-    va_list argv;
+       uint64_t hash = 5381;
+       uint8_t c;
+       const uint8_t *ptr;
+       va_list argv;
 
-    va_start(argv, digest_buf);
-    while ((ptr = va_arg(argv, const uint8_t *))) {
+       va_start(argv, digest_buf);
+       while ((ptr = va_arg(argv, const uint8_t *))) {
                while ((c = *ptr++)) {
                        hash = ((hash << 5) + hash) + c;
                }
-    }
-    va_end(argv);
+       }
+       va_end(argv);
 
-    if (digest_buf) {
-       sprintf(digest_buf, "%" PRIx64, hash);
-    }
+       if (digest_buf) {
+               sprintf(digest_buf, "%" PRIx64, hash);
+       }
 
-    return hash;
+       return hash;
 }
 
 uint64_t psi_token_hash(struct psi_token *t, char *digest_buf) {
        char loc_buf[48];
 
        sprintf(loc_buf, "%u%u", t->line, t->col);
-       return psi_hash(digest_buf, t->file, loc_buf, NULL);
+       return psi_hash(digest_buf, t->file, loc_buf, (char *) NULL);
 }

diff --git a/src/token.h b/src/token.h
index fcf3f4e49f5b3ced600063831438944539db3cb3..413a14c6e236f4c9853c11a7b91228394c27af6f 100644 (file)
--- a/src/token.h
+++ b/src/token.h
@@ -108,12 +108,12 @@ static inline size_t psi_t_size(token_t t)
 static inline const char *psi_t_indent(unsigned level) {
        static const char indent[] =
                        "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-       return &indent[32 - MAX(0, MIN(32, level))];
+       return &indent[32 - MIN(32, level)];
 }
 
 static inline const char *psi_t_indirection(unsigned pointer_level) {
        static const char indir[] = "********************************";
-       return &indir[32 - MAX(0, MIN(32, pointer_level))];
+       return &indir[32 - MIN(32, pointer_level)];
 }
 
 struct psi_token {