Add 'hf 15 csetuid' command to set UID on ISO15693 Magic tags (#842)

[proxmark3-svn] / client / jansson / jansson.h

diff --git a/client/jansson/jansson.h b/client/jansson/jansson.h
index 4333289542eeef534970d081337cc281a62d0086..12f638bc357069818e61a3109db596f9eadb74d5 100644 (file)
--- a/client/jansson/jansson.h
+++ b/client/jansson/jansson.h
@@ -9,7 +9,6 @@
 #define JANSSON_H
 
 #include <stdio.h>
 #define JANSSON_H
 
 #include <stdio.h>

-#include <stdint.h>

 #include <stdlib.h>  /* for size_t */
 #include <stdarg.h>
 
 #include <stdlib.h>  /* for size_t */
 #include <stdarg.h>
 


@@ -22,11 +21,11 @@ extern "C" {
 /* version */
 
 #define JANSSON_MAJOR_VERSION  2
 /* version */
 
 #define JANSSON_MAJOR_VERSION  2

-#define JANSSON_MINOR_VERSION  11
+#define JANSSON_MINOR_VERSION  12

 #define JANSSON_MICRO_VERSION  0
 
 /* Micro version is omitted if it's 0 */
 #define JANSSON_MICRO_VERSION  0
 
 /* Micro version is omitted if it's 0 */

-#define JANSSON_VERSION  "2.11"
+#define JANSSON_VERSION  "2.12"

 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */
 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */


@@ -40,6 +39,12 @@ extern "C" {
 #define JANSSON_THREAD_SAFE_REFCOUNT 1
 #endif
 
 #define JANSSON_THREAD_SAFE_REFCOUNT 1
 #endif
 

+#if defined(__GNUC__) || defined(__clang__)
+#define JANSSON_ATTRS(...) __attribute__((__VA_ARGS__))
+#else
+#define JANSSON_ATTRS(...)
+#endif
+

 /* types */
 
 typedef enum {
 /* types */
 
 typedef enum {


@@ -186,7 +191,7 @@ static JSON_INLINE enum json_error_code json_error_code(const json_error_t *e) {
 
 void json_object_seed(size_t seed);
 size_t json_object_size(const json_t *object);
 
 void json_object_seed(size_t seed);
 size_t json_object_size(const json_t *object);

-json_t *json_object_get(const json_t *object, const char *key);
+json_t *json_object_get(const json_t *object, const char *key) JANSSON_ATTRS(warn_unused_result);

 int json_object_set_new(json_t *object, const char *key, json_t *value);
 int json_object_set_new_nocheck(json_t *object, const char *key, json_t *value);
 int json_object_del(json_t *object, const char *key);
 int json_object_set_new(json_t *object, const char *key, json_t *value);
 int json_object_set_new_nocheck(json_t *object, const char *key, json_t *value);
 int json_object_del(json_t *object, const char *key);


@@ -238,7 +243,7 @@ int json_object_iter_set(json_t *object, void *iter, json_t *value)
 }
 
 size_t json_array_size(const json_t *array);
 }
 
 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);
 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);
 int json_array_set_new(json_t *array, size_t index, 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);


@@ -279,9 +284,9 @@ int json_real_set(json_t *real, double value);
 
 /* pack, unpack */
 
 
 /* pack, unpack */
 

-json_t *json_pack(const char *fmt, ...);
-json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...);
-json_t *json_vpack_ex(json_error_t *error, size_t flags, const char *fmt, va_list ap);
+json_t *json_pack(const char *fmt, ...) JANSSON_ATTRS(warn_unused_result);
+json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...) JANSSON_ATTRS(warn_unused_result);
+json_t *json_vpack_ex(json_error_t *error, size_t flags, const char *fmt, va_list ap) JANSSON_ATTRS(warn_unused_result);

 
 #define JSON_VALIDATE_ONLY  0x1
 #define JSON_STRICT         0x2
 
 #define JSON_VALIDATE_ONLY  0x1
 #define JSON_STRICT         0x2


@@ -292,8 +297,8 @@ int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags, const char
 
 /* sprintf */
 
 
 /* sprintf */
 

-json_t *json_sprintf(const char *fmt, ...);
-json_t *json_vsprintf(const char *fmt, va_list ap);
+json_t *json_sprintf(const char *fmt, ...) JANSSON_ATTRS(warn_unused_result, format(printf, 1, 2));
+json_t *json_vsprintf(const char *fmt, va_list ap) JANSSON_ATTRS(warn_unused_result, format(printf, 1, 0));

 
 
 /* equality */
 
 
 /* equality */


@@ -303,9 +308,17 @@ int json_equal(const json_t *value1, const json_t *value2);
 
 /* copying */
 
 
 /* copying */
 

-json_t *json_copy(json_t *value);
-json_t *json_deep_copy(const json_t *value);
+json_t *json_copy(json_t *value) JANSSON_ATTRS(warn_unused_result);
+json_t *json_deep_copy(const json_t *value) JANSSON_ATTRS(warn_unused_result);

 
 

+json_t *json_path_get(const json_t *json, const char *path);
+int json_path_set_new(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error);
+
+static JSON_INLINE
+int json_path_set(json_t *json, const char *path, json_t *value, size_t flags, json_error_t *error)
+{
+    return json_path_set_new(json, path, json_incref(value), flags, error);
+}

 
 /* decoding */
 
 
 /* decoding */
 


@@ -317,12 +330,12 @@ json_t *json_deep_copy(const json_t *value);
 
 typedef size_t (*json_load_callback_t)(void *buffer, size_t buflen, void *data);
 
 
 typedef size_t (*json_load_callback_t)(void *buffer, size_t buflen, void *data);
 

-json_t *json_loads(const char *input, size_t flags, json_error_t *error);
-json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error);
-json_t *json_loadf(FILE *input, size_t flags, json_error_t *error);
-json_t *json_loadfd(int input, size_t flags, json_error_t *error);
-json_t *json_load_file(const char *path, size_t flags, json_error_t *error);
-json_t *json_load_callback(json_load_callback_t callback, void *data, size_t flags, json_error_t *error);
+json_t *json_loads(const char *input, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
+json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
+json_t *json_loadf(FILE *input, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
+json_t *json_loadfd(int input, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
+json_t *json_load_file(const char *path, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);
+json_t *json_load_callback(json_load_callback_t callback, void *data, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result);

 
 
 /* encoding */
 
 
 /* encoding */


@@ -340,7 +353,7 @@ json_t *json_load_callback(json_load_callback_t callback, void *data, size_t fla
 
 typedef int (*json_dump_callback_t)(const char *buffer, size_t size, void *data);
 
 
 typedef int (*json_dump_callback_t)(const char *buffer, size_t size, void *data);
 

-char *json_dumps(const json_t *json, size_t flags);
+char *json_dumps(const json_t *json, size_t flags) JANSSON_ATTRS(warn_unused_result);

 size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags);
 int json_dumpf(const json_t *json, FILE *output, size_t flags);
 int json_dumpfd(const json_t *json, int output, size_t flags);
 size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags);
 int json_dumpf(const json_t *json, FILE *output, size_t flags);
 int json_dumpfd(const json_t *json, int output, size_t flags);