From: Zhanna Tsitkov <tsitkova@mit.edu>
Date: Thu, 19 Sep 2013 14:00:41 +0000 (-0400)
Subject: Use macros instead of magic numbers in json.c
X-Git-Tag: krb5-1.12-alpha1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d832972094477cd9fe6b97991e62b00c7174d8a;p=thirdparty%2Fkrb5.git

Use macros instead of magic numbers in json.c

Avoid using "magic numbers" for better maintainability.
---

diff --git a/src/util/support/json.c b/src/util/support/json.c
index b99fabd496..d23267c174 100644
--- a/src/util/support/json.c
+++ b/src/util/support/json.c
@@ -79,6 +79,7 @@
 #include <k5-buf.h>
 
 #define MAX_DECODE_DEPTH 64
+#define MIN_ALLOC_SLOT   16
 
 typedef void (*type_dealloc_fn)(void *val);
 
@@ -235,10 +236,10 @@ k5_json_array_add(k5_json_array array, k5_json_value val)
     size_t new_alloc;
 
     if (array->len >= array->allocated) {
-        /* Increase the number of slots by 50% (16 slots minimum). */
+        /* Increase the number of slots by 50% (MIN_ALLOC_SLOT minimum). */
         new_alloc = array->len + 1 + (array->len >> 1);
-        if (new_alloc < 16)
-            new_alloc = 16;
+        if (new_alloc < MIN_ALLOC_SLOT)
+            new_alloc = MIN_ALLOC_SLOT;
         ptr = realloc(array->values, new_alloc * sizeof(*array->values));
         if (ptr == NULL)
             return ENOMEM;
@@ -452,10 +453,10 @@ k5_json_object_set(k5_json_object obj, const char *key, k5_json_value val)
         return 0;
 
     if (obj->len >= obj->allocated) {
-        /* Increase the number of slots by 50% (16 slots minimum). */
+        /* Increase the number of slots by 50% (MIN_ALLOC_SLOT minimum). */
         new_alloc = obj->len + 1 + (obj->len >> 1);
-        if (new_alloc < 16)
-            new_alloc = 16;
+        if (new_alloc < MIN_ALLOC_SLOT)
+            new_alloc = MIN_ALLOC_SLOT;
         ptr = realloc(obj->entries, new_alloc * sizeof(*obj->entries));
         if (ptr == NULL)
             return ENOMEM;