Skip to content

Commit

Permalink
Use macros instead of magic numbers in json.c
Browse files Browse the repository at this point in the history
Avoid using "magic numbers" for better maintainability.
  • Loading branch information
tsitkov committed Sep 19, 2013
1 parent 3d359e4 commit 2d83297
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/util/support/json.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 2d83297

Please sign in to comment.