add the disabling formatting coments and adjust the partial code manuly

json_object.c

@@ -896,9 +896,10 @@ static int json_object_double_to_json_string_format(struct json_object* jso,
 	char buf[128], *p, *q;
 	int size;
 	/* Although JSON RFC does not support
-	NaN or Infinity as numeric values
+	 * NaN or Infinity as numeric values
-	ECMA 262 section 9.8.1 defines
+	 * ECMA 262 section 9.8.1 defines
-	how to handle these cases as strings */
+	 * how to handle these cases as strings
+	 */
 	if (isnan(jso->o.c_double))
 	{
 		size = snprintf(buf, sizeof(buf), "NaN");

json_object_private.h

@@ -20,7 +20,8 @@
 extern "C" {
 #endif
 
-#define LEN_DIRECT_STRING_DATA 32 /**< how many bytes are directly stored in json_object for strings? */
+/**< how many bytes are directly stored in json_object for strings? */
+#define LEN_DIRECT_STRING_DATA 32
 
 typedef void (json_object_private_delete_fn)(struct json_object *o);
 

json_pointer.c

@@ -41,8 +41,9 @@ static void string_replace_all_occurrences_with_char(char *s, const char *occur,
 static int is_valid_index(struct json_object *jo, const char *path, int32_t *idx)
 {
 	int i, len = strlen(path);
-	/* this code-path optimizes a bit, for when we reference the 0-9 index range in a JSON array
+	/* this code-path optimizes a bit, for when we reference the 0-9 index range
-	   and because leading zeros not allowed */
+	 * in a JSON array and because leading zeros not allowed
+	 */
 	if (len == 1) {
 		if (isdigit((unsigned char)path[0])) {
 			*idx = (path[0] - '0');
@@ -124,12 +125,14 @@ static int json_pointer_set_single_path(
 	}
 
 	/* path replacements should have been done in json_pointer_get_single_path(),
-	   and we should still be good here */
+	 * and we should still be good here
+	 */
 	if (json_object_is_type(parent, json_type_object))
 		return json_object_object_add(parent, path, value);
 
-	/* Getting here means that we tried to "dereference" a primitive JSON type (like string, int, bool).
+	/* Getting here means that we tried to "dereference" a primitive JSON type
-	   i.e. add a sub-object to it */
+	 * (like string, int, bool).i.e. add a sub-object to it
+	 */
 	errno = ENOENT;
 	return -1;
 }
@@ -158,7 +161,8 @@ static int json_pointer_get_recursive(
 		return rc;
 
 	if (endp) {
-		*endp = '/'; /* Put the slash back, so that the sanity check passes on next recursion level */
+		/* Put the slash back, so that the sanity check passes on next recursion level */
+		*endp = '/';
 		return json_pointer_get_recursive(obj, endp, value);
 	}
 

json_tokener.c

@@ -68,7 +68,8 @@ static const int json_true_str_len = sizeof(json_true_str) - 1;
 static const char json_false_str[] = "false";
 static const int json_false_str_len = sizeof(json_false_str) - 1;
 
-static const char* json_tokener_errors[] = {
+/* clang-format off */
+static const char *json_tokener_errors[] = {
 	"success",
 	"continue",
 	"nesting too deep",
@@ -86,6 +87,7 @@ static const char* json_tokener_errors[] = {
 	"invalid utf-8 string",
 	"buffer size overflow"
 };
+/* clang-format on */
 
 const char *json_tokener_error_desc(enum json_tokener_error jerr)
 {
@@ -261,10 +263,11 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
   tok->err = json_tokener_success;
 
   /* this interface is presently not 64-bit clean due to the int len argument
-     and the internal printbuf interface that takes 32-bit int len arguments
+	 * and the internal printbuf interface that takes 32-bit int len arguments
-     so the function limits the maximum string size to INT32_MAX (2GB).
+	 * so the function limits the maximum string size to INT32_MAX (2GB).
-     If the function is called with len == -1 then strlen is called to check
+	 * If the function is called with len == -1 then strlen is called to check
-     the string length is less than INT32_MAX (2GB) */
+	 * the string length is less than INT32_MAX (2GB)
+	 */
   if ((len < -1) || (len == -1 && strlen(str) > INT32_MAX)) {
     tok->err = json_tokener_error_size;
     return NULL;
@@ -620,9 +623,9 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 		  unescaped_utf[1] = 0x80 | (tok->ucs_char & 0x3f);
 		  printbuf_memappend_fast(tok->pb, (char*)unescaped_utf, 2);
 		} else if (IS_HIGH_SURROGATE(tok->ucs_char)) {
-                  /* Got a high surrogate.  Remember it and look for the
+							 /* Got a high surrogate.  Remember it and look for
-                   * the beginning of another sequence, which should be the
+							 * the beginning of another sequence, which
-                   * low surrogate.
+							 * should be the low surrogate.
 							 */
                   got_hi_surrogate = tok->ucs_char;
                   /* Not at end, and the next two chars should be "\u" */
@@ -631,9 +634,9 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
                       (str[1] == '\\') &&
                       (str[2] == 'u'))
                   {
-                /* Advance through the 16 bit surrogate, and move on to the
+								/* Advance through the 16 bit surrogate, and move
-                 * next sequence. The next step is to process the following
+								 * on to the next sequence. The next step is to
-                 * characters.
+								 * process the following characters.
 								 */
 	            if( !ADVANCE_CHAR(str, tok) || !ADVANCE_CHAR(str, tok) ) {
                     printbuf_memappend_fast(tok->pb,
@@ -649,7 +652,8 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
                     }
 	            tok->ucs_char = 0;
                     tok->st_pos = 0;
-                    continue; /* other json_tokener_state_escape_unicode */
+                    /* other json_tokener_state_escape_unicode */
+                    continue;
                   } else {
 								/* Got a high surrogate without another sequence following
 								 * it.  Put a replacement char in for the hi surrogate
@@ -684,7 +688,8 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 	      goto out;
 	    }
 	  if (!ADVANCE_CHAR(str, tok) || !PEEK_CHAR(c, tok)) {
-            if (got_hi_surrogate) /* Clean up any pending chars */
+            /* Clean up any pending chars */
+            if (got_hi_surrogate)
 	      printbuf_memappend_fast(tok->pb, (char*)utf8_replacement_char, 3);
 	    goto out;
 	  }
@@ -741,14 +746,16 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 
 	  /* non-digit characters checks */
 	  /* note: since the main loop condition to get here was
-	           an input starting with 0-9 or '-', we are
+				 * an input starting with 0-9 or '-', we are
-	           protected from input starting with '.' or
+				 * protected from input starting with '.' or
-	           e/E. */
+				 * e/E.
+				 */
 	  if (c == '.') {
 	    if (tok->is_double != 0) {
 	      /* '.' can only be found once, and out of the exponent part.
-	         Thus, if the input is already flagged as double, it
+						 * Thus, if the input is already flagged as double, it
-	         is invalid. */
+						 * is invalid.
+						 */
 	      tok->err = json_tokener_error_parse_number;
 	      goto out;
 	    }
@@ -767,8 +774,9 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
 	  }
 	  if (c == '-' && case_len != negativesign_next_possible_location) {
 	    /* If the negative sign is not where expected (ie
-	       start of input or start of exponent part), the
+					 * start of input or start of exponent part), the
-	       input is invalid. */
+					 * input is invalid.
+					 */
 	    tok->err = json_tokener_error_parse_number;
 	    goto out;
 	  }
@@ -979,7 +987,8 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
       /* unexpected char after JSON data */
       tok->err = json_tokener_error_parse_unexpected;
   }
-  if (!c) { /* We hit an eof char (0) */
+  if (!c) {
+	/* We hit an eof char (0) */
     if(state != json_tokener_state_finish &&
        saved_state != json_tokener_state_finish)
       tok->err = json_tokener_error_parse_eof;

json_util.c

@@ -189,7 +189,8 @@ static int _json_object_to_fd(int fd, struct json_object *obj, int flags, const
 		return -1;
 	}
 
-	wsize = (unsigned int)(strlen(json_str) & UINT_MAX); /* CAW: probably unnecessary, but the most 64bit safe */
+	/* CAW: probably unnecessary, but the most 64bit safe */
+	wsize = (unsigned int)(strlen(json_str) & UINT_MAX);
 	wpos = 0;
 	while(wpos < wsize) {
 		if((ret = write(fd, json_str + wpos, wsize-wpos)) < 0) {
@@ -260,7 +261,8 @@ void* rpl_realloc(void* p, size_t n)
 #endif
 
 #define NELEM(a)        (sizeof(a) / sizeof(a[0]))
-static const char* json_type_name[] = {
+/* clang-format off */
+static const char *json_type_name[] = {
 	/* If you change this, be sure to update the enum json_type definition too */
 	"null",
 	"boolean",
@@ -270,6 +272,7 @@ static const char* json_type_name[] = {
 	"array",
 	"string",
 };
+/* clang-format on */
 
 const char *json_type_to_name(enum json_type o_type)
 {

linkhash.c

@@ -178,6 +178,7 @@ on, and rotates are much kinder to the top and bottom bits, so I used
 rotates.
 -------------------------------------------------------------------------------
 */
+/* clang-format off */
 #define mix(a,b,c) \
 { \
 	a -= c;  a ^= rot(c, 4);  c += b; \
@@ -187,6 +188,7 @@ rotates.
 	b -= a;  b ^= rot(a,19);  a += c; \
 	c -= b;  c ^= rot(b, 4);  b += a; \
 }
+/* clang-format on */
 
 /*
 -------------------------------------------------------------------------------
@@ -213,6 +215,7 @@ and these came close:
  11  8 15 26 3 22 24
 -------------------------------------------------------------------------------
 */
+/* clang-format off */
 #define final(a,b,c) \
 { \
 	c ^= b; c -= rot(b,14); \
@@ -223,6 +226,7 @@ and these came close:
 	b ^= a; b -= rot(a,14); \
 	c ^= b; c -= rot(b,24); \
 }
+/* clang-format on */
 
 
 /*
@@ -252,10 +256,15 @@ acceptable.  Do NOT use for cryptographic purposes.
 -------------------------------------------------------------------------------
 */
 
-static uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
+/* clang-format off */
+static uint32_t hashlittle(const void *key, size_t length, uint32_t initval)
 {
 	uint32_t a,b,c; /* internal state */
-  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
+	union
+	{
+		const void *ptr;
+		size_t i;
+	} u; /* needed for Mac Powerbook G4 */
 
 	/* Set up the internal state */
 	a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
@@ -288,13 +297,13 @@ static uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
 		 * the buffer. (http://clang.llvm.org/docs/AddressSanitizer.html
 		 */
 #ifdef VALGRIND
-#    define PRECISE_MEMORY_ACCESS 1
+#define PRECISE_MEMORY_ACCESS 1
 #elif defined(__SANITIZE_ADDRESS__) /* GCC's ASAN */
-#    define PRECISE_MEMORY_ACCESS 1
+#define PRECISE_MEMORY_ACCESS 1
 #elif defined(__has_feature)
-#  if __has_feature(address_sanitizer) /* Clang's ASAN */
+#if __has_feature(address_sanitizer) /* Clang's ASAN */
-#    define PRECISE_MEMORY_ACCESS 1
+#define PRECISE_MEMORY_ACCESS 1
-#  endif
+#endif
 #endif
 #ifndef PRECISE_MEMORY_ACCESS
 
@@ -337,7 +346,9 @@ static uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
 
 #endif /* !valgrind */
 
-  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
+	}
+	else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0))
+	{
 		const uint16_t *k = (const uint16_t *)key; /* read 16-bit chunks */
 		const uint8_t  *k8;
 
@@ -384,7 +395,10 @@ static uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
 		case 0 : return c;                     /* zero length requires no mixing */
 		}
 
-  } else {                        /* need to read the key one byte at a time */
+	}
+	else
+	{
+		/* need to read the key one byte at a time */
 		const uint8_t *k = (const uint8_t *)key;
 
 		/*--------------- all but the last block: affect some 32 bits of (a,b,c) */
@@ -430,6 +444,7 @@ static uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
 	final(a,b,c);
 	return c;
 }
+/* clang-format on */
 
 /* a simple hash function similiar to what perl does for strings.
  * for good results, the string should not be excessivly large.
@@ -457,7 +472,7 @@ static unsigned long lh_char_hash(const void *k)
 	if (random_seed == -1) {
 		RANDOM_SEED_TYPE seed;
 		/* we can't use -1 as it is the unitialized sentinel */
-		while ((seed = json_c_get_random_seed()) == -1);
+		while ((seed = json_c_get_random_seed()) == -1) {}
 #if SIZEOF_INT == 8 && defined __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
 #define USE_SYNC_COMPARE_AND_SWAP 1
 #endif
@@ -638,7 +653,8 @@ json_bool lh_table_lookup_ex(struct lh_table* t, const void* k, void **v)
 
 int lh_table_delete_entry(struct lh_table *t, struct lh_entry *e)
 {
-	ptrdiff_t n = (ptrdiff_t)(e - t->table); /* CAW: fixed to be 64bit nice, still need the crazy negative case... */
+	/* CAW: fixed to be 64bit nice, still need the crazy negative case... */
+	ptrdiff_t n = (ptrdiff_t)(e - t->table);
 
 	/* CAW: this is bad, really bad, maybe stack goes other direction on this machine... */
 	if(n < 0) { return -2; }

printbuf.c

@@ -124,9 +124,10 @@ int sprintbuf(struct printbuf *p, const char *msg, ...)
   size = vsnprintf(buf, 128, msg, ap);
   va_end(ap);
   /* if string is greater than stack buffer, then use dynamic string
-     with vasprintf.  Note: some implementation of vsnprintf return -1
+	 * with vasprintf.  Note: some implementation of vsnprintf return -1
-     if output is truncated whereas some return the number of bytes that
+	 * if output is truncated whereas some return the number of bytes that
-     would have been written - this code handles both cases. */
+	 * would have been written - this code handles both cases.
+	 */
   if(size == -1 || size > 127) {
     va_start(ap, msg);
     if((size = vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; }

strerror_override.c

@@ -9,6 +9,7 @@ static struct {
 	int errno_value;
 	const char *errno_str;
 } errno_list[] = {
+/* clang-format off */
 #define STRINGIFY(x) #x
 #define ENTRY(x) {x, &STRINGIFY(undef_ ## x)[6]}
 	ENTRY(EPERM),
@@ -52,6 +53,7 @@ static struct {
 	ENTRY(EAGAIN),
 	{ 0, (char *)0 }
 };
+/* clang-format on */
 
 // Enabled during tests
 int _json_c_strerror_enable = 0;

tests/test_json_pointer.c

@@ -32,8 +32,9 @@ static const char *input_json_str = "{ "
 	"'m~n': 8 "
 "}";
 
-
+/* clang-format off */
-static const char *rec_input_json_str = "{"
+static const char *rec_input_json_str =
+    "{"
 	    "'arr' : ["
 		    "{"
 			    "'obj': ["
@@ -55,7 +56,8 @@ static const char *rec_input_json_str = "{"
 			    "]"
 		    "}"
 	    "}"
-"}";
+    "}";
+/* clang-format on */
 
 /* Example from RFC */
 static void test_example_get()
@@ -67,6 +69,7 @@ static void test_example_get()
 		int i;
 	};
 	/* Create a map to iterate over for the ints */
+	/* clang-format off */
 	struct json_pointer_map_s_i json_pointers[] = {
 		{ "/", 0 },
 		{ "/a~1b", 1 },
@@ -79,6 +82,7 @@ static void test_example_get()
 		{ "/m~0n", 8 },
 		{ NULL, 0}
 	};
+	/* clang-format on */
 
 	jo1 = json_tokener_parse(input_json_str);
 	assert(NULL != jo1);

tests/test_parse.c

@@ -310,8 +310,9 @@ struct incremental_step {
 	{ "fail",              5, 2, json_tokener_error_parse_boolean, 1 },
 
 	/* Although they may initially look like they should fail,
-	   the next few tests check that parsing multiple sequential
+	 * the next few tests check that parsing multiple sequential
-       json objects in the input works as expected */
+	 * json objects in the input works as expected
+	 */
 	{ "null123",           9, 4, json_tokener_success, 0 },
 	{ &"null123"[4],       4, 3, json_tokener_success, 1 },
 	{ "nullx",             5, 4, json_tokener_success, 0 },
@@ -357,8 +358,9 @@ struct incremental_step {
 	{ "[,1]",             -1, 1, json_tokener_error_parse_unexpected, 1 },
 
 	/* This behaviour doesn't entirely follow the json spec, but until we have
-	   a way to specify how strict to be we follow Postel's Law and be liberal
+	 * a way to specify how strict to be we follow Postel's Law and be liberal
-	   in what we accept (up to a point). */
+	 * in what we accept (up to a point).
+	 */
 	{ "[1,2,3,]",         -1, -1, json_tokener_success, 0 },
 	{ "[1,2,,3,]",        -1, 5, json_tokener_error_parse_unexpected, 0 },
 

vasprintf_compat.h

@@ -24,7 +24,8 @@ static int vasprintf(char **buf, const char *fmt, va_list ap)
 	chars = _vscprintf(fmt, ap)+1;
 #else /* !defined(WIN32) */
 	/* CAW: RAWR! We have to hope to god here that vsnprintf doesn't overwrite
-	   our buffer like on some 64bit sun systems.... but hey, its time to move on */
+	 * our buffer like on some 64bit sun systems.... but hey, its time to move on
+	 */
 	chars = vsnprintf(&_T_emptybuffer, 0, fmt, ap)+1;
 	if(chars < 0) { chars *= -1; } /* CAW: old glibc versions have this problem */
 #endif /* defined(WIN32) */