- updated json with vesion 1.7 from https://sourceforge.net/projects/mjson/files/mjson/mjson-1.7.0.tar.gz/download

- merge with json modifications from this repo
- removed unused json_helper.c
- corrected x86 -> win32 in vs solution

Author: chcg

NppJSONViewer/NPPJSONViewer.sln

@@ -8,19 +8,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
+		Debug|Win32 = Debug|Win32
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
+		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x64.ActiveCfg = Debug|x64
 		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x64.Build.0 = Debug|x64
-		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x86.ActiveCfg = Debug|Win32
-		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x86.Build.0 = Debug|Win32
+		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|Win32.Build.0 = Debug|Win32
 		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|x64.ActiveCfg = Release|x64
 		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|x64.Build.0 = Release|x64
-		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|x86.ActiveCfg = Release|Win32
-		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|x86.Build.0 = Release|Win32
+		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|Win32.ActiveCfg = Release|Win32
+		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

NppJSONViewer/json.c

@@ -23,9 +23,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
-#include <memory.h>
-#include <sys/types.h>
 #include <string.h>
+#include <sys/types.h>
 
 
 enum LEX_VALUE
@@ -63,14 +62,14 @@ rcstring *
 rcs_create (size_t length)
 {
 	rcstring *rcs;
-	rcs = malloc (sizeof (rcstring));	/* allocates memory for a struct rcstring */
+	rcs = (rcstring *)malloc (sizeof (rcstring));	/* allocates memory for a struct rcstring */
 	if (rcs == NULL)
 		return NULL;
 
 	rcs->max = length;
 	rcs->length = 0;
 
-	rcs->text = malloc ((rcs->max + 1) * sizeof (char));
+	rcs->text = (char *)malloc ((rcs->max + 1) * sizeof (char));
 	if (rcs->text == NULL)
 	{
 		free (rcs);
@@ -106,7 +105,7 @@ rcs_resize (rcstring * rcs, size_t length)
 	char *temp;
 	assert (rcs != NULL);
 
-	temp = realloc (rcs->text, sizeof (char) * (length + 1));	/* length plus '\0' */
+	temp = (char *)realloc (rcs->text, sizeof (char) * (length + 1));	/* length plus '\0' */
 	if (temp == NULL)
 	{
 		free (rcs);
@@ -164,7 +163,7 @@ rcs_unwrap (rcstring * rcs)
 		out = NULL;
 	else
 	{
-		out = realloc (rcs->text, sizeof (char) * (strlen (rcs->text) + 1));
+		out = (char *)realloc (rcs->text, sizeof (char) * (strlen (rcs->text) + 1));
 	}
 
 	free (rcs);
@@ -189,7 +188,7 @@ enum json_error
 json_stream_parse (FILE * file, json_t ** document)
 {
 	char buffer[1024];	/* hard-coded value */
-	unsigned int error = JSON_INCOMPLETE_DOCUMENT;
+	enum json_error error = JSON_INCOMPLETE_DOCUMENT;
 
 	struct json_parsing_info state;
 
@@ -242,7 +241,7 @@ json_new_value (const enum json_value_type type)
 {
 	json_t *new_object;
 	/* allocate memory to the new object */
-	new_object = malloc (sizeof (json_t));
+	new_object = (json_t *)malloc (sizeof (json_t));
 	if (new_object == NULL)
 		return NULL;
 
@@ -267,13 +266,13 @@ json_new_string (const char *text)
 	assert (text != NULL);
 
 	/* allocate memory for the new object */
-	new_object = malloc (sizeof (json_t));
+	new_object = (json_t *)malloc (sizeof (json_t));
 	if (new_object == NULL)
 		return NULL;
 
 	/* initialize members */
 	length = strlen (text) + 1;
-	new_object->text = malloc (length * sizeof (char));
+	new_object->text = (char *)malloc (length * sizeof (char));
 	if (new_object->text == NULL)
 	{
 		free (new_object);
@@ -299,13 +298,13 @@ json_new_number (const char *text)
 	assert (text != NULL);
 
 	/* allocate memory for the new object */
-	new_object = malloc (sizeof (json_t));
+	new_object = (json_t *)malloc (sizeof (json_t));
 	if (new_object == NULL)
 		return NULL;
 
 	/* initialize members */
 	length = strlen (text) + 1;
-	new_object->text = malloc (length * sizeof (char));
+	new_object->text = (char *)malloc (length * sizeof (char));
 	if (new_object->text == NULL)
 	{
 		free (new_object);
@@ -1136,7 +1135,7 @@ json_format_string (const char *text)
 
 
 char *
-json_escape (char *text)
+json_escape (const char *text)
 {
 	rcstring *output;
 	size_t i, length;
@@ -1189,7 +1188,7 @@ json_escape (char *text)
 		}
 		else if (text[i] < 0x20)
 		{
-			_snprintf (buffer, 7, "\\u%4.4x", text[i]);
+			sprintf (buffer, "\\u%4.4x", text[i]);
 			rcs_catcs (output, buffer, 6);
 		}
 		else
@@ -1202,9 +1201,9 @@ json_escape (char *text)
 
 
 char *
-json_unescape (char *text)
+json_unescape (const char *text)
 {
-	char *result = malloc (strlen (text) + 1);
+	char *result = (char *)malloc (strlen (text) + 1);
 	size_t r;		/* read cursor */
 	size_t w;		/* write cursor */
 
@@ -1298,11 +1297,11 @@ json_unescape (char *text)
 							char three = 0x80;	/* 10 000000 */
 							char four = 0x80;	/* 10 000000 */
 
-							if (!text[++r] == '\\')
+							if ( text[++r] != '\\')
 							{
 								break;
 							}
-							if (!text[++r] == 'u')
+							if ( text[++r] != 'u')
 							{
 								break;
 							}
@@ -1378,8 +1377,8 @@ windows.
 So, added a check for consecutive occurance of CRLF, in this particular
 case line number is incremented only once.
 */
-
-int lexer (char *buffer, char **p, unsigned int *state, rcstring ** text, size_t *line, size_t *char_num)
+int
+lexer (const char *buffer, const char **p, unsigned int *state, rcstring ** text, size_t *line, size_t *char_num)
 {
 	int crOccured=0; //flag to mark occurance of CR, fix for windows style line termination which is "CRLF"
 	assert (buffer != NULL);
@@ -1415,7 +1414,7 @@ int lexer (char *buffer, char **p, unsigned int *state, rcstring ** text, size_t
 						break;
 					}
 				case '\x0D':	/* Carriage return */
-					*line += 1;	// increment line number
+					*line += 1;	/* increment line number */
 					crOccured=1; //sets the flag for CR occurance
 					break;
 
@@ -1529,8 +1528,7 @@ int lexer (char *buffer, char **p, unsigned int *state, rcstring ** text, size_t
 				case 29:
 				case 30:
 				case 31:
-					/* ASCII control characters can only be present in a JSON string if they are escaped. 
-					If not then the document is invalid */
+					/* ASCII control characters can only be present in a JSON string if they are escaped. If not then the document is invalid */
 					return LEX_INVALID_CHARACTER;
 					break;
 
@@ -2155,7 +2153,7 @@ int lexer (char *buffer, char **p, unsigned int *state, rcstring ** text, size_t
 
 
 enum json_error
-json_parse_fragment (struct json_parsing_info *info, char *buffer)
+json_parse_fragment (struct json_parsing_info *info, const char *buffer)
 {
 	json_t *temp = NULL;
 
@@ -2184,7 +2182,7 @@ json_parse_fragment (struct json_parsing_info *info, char *buffer)
 					break;
 
 				default:
-					fprintf (stderr, "JSON: state %d: defaulted at line %zd\n", info->state, info->line);
+					fprintf (stderr, "JSON: state %u: defaulted at line %zu\n", info->state, info->line);
 					return JSON_MALFORMED_DOCUMENT;
 					break;
 				}
@@ -2283,7 +2281,7 @@ json_parse_fragment (struct json_parsing_info *info, char *buffer)
 
 				default:
 					/* this should never run */
-					fprintf (stderr, "JSON: state %d: defaulted at line %zu\n", info->state, info->line);
+					fprintf (stderr, "JSON: state %u: defaulted at line %zu\n", info->state, info->line);
 					return JSON_MALFORMED_DOCUMENT;
 					break;
 				}
@@ -2342,7 +2340,7 @@ json_parse_fragment (struct json_parsing_info *info, char *buffer)
 					break;
 
 				default:
-					fprintf (stderr, "JSON: state %d: defaulted at line %zu\n", info->state, info->line);
+					fprintf (stderr, "JSON: state %u: defaulted at line %zu\n", info->state, info->line);
 					return JSON_MALFORMED_DOCUMENT;
 					break;
 				}
@@ -2378,7 +2376,7 @@ json_parse_fragment (struct json_parsing_info *info, char *buffer)
 					break;
 
 				default:	/* this should never run */
-					fprintf (stderr, "JSON: state %d: defaulted at line %zu\n", info->state, info->line);
+					fprintf (stderr, "JSON: state %u: defaulted at line %zu\n", info->state, info->line);
 					return JSON_MALFORMED_DOCUMENT;
 					break;
 				}
@@ -2402,7 +2400,7 @@ json_parse_fragment (struct json_parsing_info *info, char *buffer)
 					break;
 
 				default:
-					fprintf (stderr, "JSON: state %d: defaulted at line %zu\n", info->state, info->line);
+					fprintf (stderr, "JSON: state %u: defaulted at line %zu\n", info->state, info->line);
 					return JSON_MALFORMED_DOCUMENT;
 					break;
 				}
@@ -2411,12 +2409,11 @@ json_parse_fragment (struct json_parsing_info *info, char *buffer)
 
 		case 6:	/* label, pos name separator */
 			{
-				unsigned int value;	/* to avoid redundant code */
 				/* perform tree sanity checks */
 				assert (info->cursor != NULL);
 				assert (info->cursor->type == JSON_STRING);
 
-				switch (value = lexer (buffer, &info->p, &info->lex_state, &info->lex_text, &info->line,&info->char_num))
+				switch (lexer (buffer, &info->p, &info->lex_state, &info->lex_text, &info->line,&info->char_num))
 				{
 				case LEX_STRING:
 					if ((temp = json_new_value (JSON_STRING)) == NULL)
@@ -2541,7 +2538,7 @@ json_parse_fragment (struct json_parsing_info *info, char *buffer)
 					break;
 
 				default:
-					fprintf (stderr, "JSON: state %d: defaulted at line %zu\n", info->state, info->line);
+					fprintf (stderr, "JSON: state %u: defaulted at line %zu\n", info->state, info->line);
 					return JSON_MALFORMED_DOCUMENT;
 					break;
 				}
@@ -2692,7 +2689,7 @@ json_parse_fragment (struct json_parsing_info *info, char *buffer)
 					break;
 
 				default:
-					fprintf (stderr, "JSON: state %d: defaulted at line %zu\n", info->state, info->line);
+					fprintf (stderr, "JSON: state %u: defaulted at line %zu\n", info->state, info->line);
 					return JSON_MALFORMED_DOCUMENT;
 					break;
 				}
@@ -2753,7 +2750,7 @@ json_parse_fragment (struct json_parsing_info *info, char *buffer)
 					break;
 
 				default:
-					fprintf (stderr, "JSON: state %d: defaulted at line %zu\n", info->state, info->line);
+					fprintf (stderr, "JSON: state %u: defaulted at line %zu\n", info->state, info->line);
 					return JSON_MALFORMED_DOCUMENT;
 					break;
 				}
@@ -2782,7 +2779,7 @@ json_parse_fragment (struct json_parsing_info *info, char *buffer)
 			break;
 
 		default:
-			fprintf (stderr, "JSON: state %d: defaulted at line %zu\n", info->state, info->line);
+			fprintf (stderr, "JSON: state %u: defaulted at line %zu\n", info->state, info->line);
 			return JSON_UNKNOWN_PROBLEM;
 		}
 	}
@@ -2796,7 +2793,7 @@ json_parse_fragment (struct json_parsing_info *info, char *buffer)
 
 
 enum json_error
-json_parse_document (json_t ** root, char *text)
+json_parse_document (json_t ** root, const char *text)
 {
 	enum json_error error;
 	struct json_parsing_info *jpi;
@@ -2806,7 +2803,7 @@ json_parse_document (json_t ** root, char *text)
 	assert (text != NULL);
 
 	/* initialize the parsing structure */
-	jpi = malloc (sizeof (struct json_parsing_info));
+	jpi = (struct json_parsing_info *)malloc (sizeof (struct json_parsing_info));
 	if (jpi == NULL)
 	{
 		return JSON_MEMORY;
@@ -2831,14 +2828,9 @@ json_parse_document (json_t ** root, char *text)
 enum json_error
 json_saxy_parse (struct json_saxy_parser_status *jsps, struct json_saxy_functions *jsf, char c)
 {
-	/*TODO handle a string instead of a single char */
-	/* temp variables */
-	rcstring *temp;
-
 	/* make sure everything is in it's place */
 	assert (jsps != NULL);
 	assert (jsf != NULL);
-	temp = NULL;
 
 	/* goto where we left off */
 	switch (jsps->state)