diff options
Diffstat (limited to 'devel/jansson/files')
| -rw-r--r-- | devel/jansson/files/patch-src_hashtable.c | 12 | ||||
| -rw-r--r-- | devel/jansson/files/patch-src_jansson.h | 10 | ||||
| -rw-r--r-- | devel/jansson/files/patch-src_value.c | 14 |
3 files changed, 18 insertions, 18 deletions
diff --git a/devel/jansson/files/patch-src_hashtable.c b/devel/jansson/files/patch-src_hashtable.c index fb57b4d9246f..6f97889ce76e 100644 --- a/devel/jansson/files/patch-src_hashtable.c +++ b/devel/jansson/files/patch-src_hashtable.c @@ -1,6 +1,6 @@ ---- src/hashtable.c.orig 2016-08-25 17:21:36 UTC +--- src/hashtable.c.orig 2018-02-08 09:05:40 UTC +++ src/hashtable.c -@@ -108,10 +108,10 @@ static int hashtable_do_del(hashtable_t +@@ -108,10 +108,10 @@ static int hashtable_do_del(hashtable_t *hashtable, { pair_t *pair; bucket_t *bucket; @@ -14,7 +14,7 @@ pair = hashtable_find_pair(hashtable, bucket, key, hash); if(!pair) -@@ -154,7 +154,7 @@ static int hashtable_do_rehash(hashtable +@@ -154,7 +154,7 @@ static int hashtable_do_rehash(hashtable_t *hashtable) { list_t *list, *next; pair_t *pair; @@ -23,7 +23,7 @@ struct hashtable_bucket *new_buckets; new_order = hashtable->order + 1; -@@ -180,8 +180,8 @@ static int hashtable_do_rehash(hashtable +@@ -180,8 +180,8 @@ static int hashtable_do_rehash(hashtable_t *hashtable) for(; list != &hashtable->list; list = next) { next = list->next; pair = list_to_pair(list); @@ -34,7 +34,7 @@ } return 0; -@@ -220,7 +220,7 @@ int hashtable_set(hashtable_t *hashtable +@@ -220,7 +220,7 @@ int hashtable_set(hashtable_t *hashtable, const char * { pair_t *pair; bucket_t *bucket; @@ -43,7 +43,7 @@ /* rehash if the load ratio exceeds 1 */ if(hashtable->size >= hashsize(hashtable->order)) -@@ -228,8 +228,8 @@ int hashtable_set(hashtable_t *hashtable +@@ -228,8 +228,8 @@ int hashtable_set(hashtable_t *hashtable, const char * return -1; hash = hash_str(key); diff --git a/devel/jansson/files/patch-src_jansson.h b/devel/jansson/files/patch-src_jansson.h index edca944cf86f..5a788d2bdd06 100644 --- a/devel/jansson/files/patch-src_jansson.h +++ b/devel/jansson/files/patch-src_jansson.h @@ -1,6 +1,6 @@ ---- src/jansson.h.orig 2016-08-26 17:37:02 UTC +--- src/jansson.h.orig 2018-11-26 08:10:21 UTC +++ src/jansson.h -@@ -159,10 +159,10 @@ int json_object_iter_set_new(json_t *obj +@@ -219,10 +219,10 @@ int json_object_iter_set_new(json_t *object, void *ite key = json_object_iter_key(n), \ n = json_object_iter_next(object, json_object_key_to_iter(key))) @@ -15,13 +15,13 @@ static JSON_INLINE int json_object_set(json_t *object, const char *key, json_t *value) -@@ -183,11 +183,11 @@ int json_object_iter_set(json_t *object, +@@ -243,11 +243,11 @@ int json_object_iter_set(json_t *object, void *iter, j } size_t json_array_size(const json_t *array); --json_t *json_array_get(const json_t *array, size_t index); +-json_t *json_array_get(const json_t *array, size_t index) JANSSON_ATTRS(warn_unused_result); -int json_array_set_new(json_t *array, size_t index, json_t *value); -+json_t *json_array_get(const json_t *array, size_t idx); ++json_t *json_array_get(const json_t *array, size_t idx) JANSSON_ATTRS(warn_unused_result); +int json_array_set_new(json_t *array, size_t idx, json_t *value); int json_array_append_new(json_t *array, json_t *value); -int json_array_insert_new(json_t *array, size_t index, json_t *value); diff --git a/devel/jansson/files/patch-src_value.c b/devel/jansson/files/patch-src_value.c index 1879d3aad9ed..1f6d76e48d71 100644 --- a/devel/jansson/files/patch-src_value.c +++ b/devel/jansson/files/patch-src_value.c @@ -1,6 +1,6 @@ ---- src/value.c.orig 2016-08-25 17:21:36 UTC +--- src/value.c.orig 2018-11-26 08:10:21 UTC +++ src/value.c -@@ -375,20 +375,20 @@ size_t json_array_size(const json_t *jso +@@ -374,20 +374,20 @@ size_t json_array_size(const json_t *json) return json_to_array(json)->entries; } @@ -25,7 +25,7 @@ { json_array_t *array; -@@ -402,14 +402,14 @@ int json_array_set_new(json_t *json, siz +@@ -401,14 +401,14 @@ int json_array_set_new(json_t *json, size_t index, jso } array = json_to_array(json); @@ -43,7 +43,7 @@ return 0; } -@@ -481,7 +481,7 @@ int json_array_append_new(json_t *json, +@@ -480,7 +480,7 @@ int json_array_append_new(json_t *json, json_t *value) return 0; } @@ -52,7 +52,7 @@ { json_array_t *array; json_t **old_table; -@@ -495,7 +495,7 @@ int json_array_insert_new(json_t *json, +@@ -494,7 +494,7 @@ int json_array_insert_new(json_t *json, size_t index, } array = json_to_array(json); @@ -61,7 +61,7 @@ json_decref(value); return -1; } -@@ -507,21 +507,21 @@ int json_array_insert_new(json_t *json, +@@ -506,21 +506,21 @@ int json_array_insert_new(json_t *json, size_t index, } if(old_table != array->table) { @@ -89,7 +89,7 @@ { json_array_t *array; -@@ -529,14 +529,14 @@ int json_array_remove(json_t *json, size +@@ -528,14 +528,14 @@ int json_array_remove(json_t *json, size_t index) return -1; array = json_to_array(json); |