Merge 5065515925 into f74e8f8f9b

ChangeLog

@@ -2,33 +2,33 @@
 NEXT.VERSION
 
   * IMPORTANT: the name of the library has changed to libjson-c.so and
-     the header files are now in include/json-c.
-     The pkgconfig name has also changed from json to json-c.
-     You should change your build to use appropriate -I and -l options.
-     A compatibility shim is in place so builds using the old name will
-     continue to work, but that will be removed in the next release.
+    the header files are now in include/json-c.
+    The pkgconfig name has also changed from json to json-c.
+    You should change your build to use appropriate -I and -l options.
+    A compatibility shim is in place so builds using the old name will
+    continue to work, but that will be removed in the next release.
 
 0.10
 
   * Add a json_object_to_json_string_ext() function to allow output to be
-     formatted in a more human readable form.
+    formatted in a more human readable form.
   * Add json_object_object_get_ex(), a NULL-safe get object method, to be able
-     to distinguish between a key not present and the value being NULL.
+    to distinguish between a key not present and the value being NULL.
   * Add an alternative iterator implementation, see json_object_iterator.h
   * Make json_object_iter public to enable external use of the
-     json_object_object_foreachC macro.
-  * Add a printbuf_memset() function to provide an effecient way to set and
-     append things like whitespace indentation.
+    json_object_object_foreachC macro.
+  * Add a printbuf_memset() function to provide an efficient way to set and
+    append things like whitespace indentation.
   * Adjust json_object_is_type and json_object_get_type so they return
-      json_type_null for NULL objects and handle NULL passed to
-      json_objct_object_get().
+    json_type_null for NULL objects and handle NULL passed to
+    json_object_object_get().
   * Rename boolean type to json_bool.
   * Fix various compile issues for Visual Studio and MinGW.
   * Allow json_tokener_parse_ex() to be re-used to parse multiple object.
-     Also, fix some parsing issues with capitalized hexadecimal numbers and
-     number in E notation.
-  * Add json_tokener_get_error() and json_tokener_error_desc() to better 
-     encapsulate the process of retrieving errors while parsing.
+    Also, fix some parsing issues with capitalized hexadecimal numbers and
+    number in E notation.
+  * Add json_tokener_get_error() and json_tokener_error_desc() to better
+    encapsulate the process of retrieving errors while parsing.
   * Various improvements to the documentation of many functions.
   * Add new json_object_array_sort() function.
   * Fix a bug in json_object_get_int(), which would incorrectly return 0
@@ -42,7 +42,7 @@ NEXT.VERSION
     Jehiah Czebotar
   * Fix file descriptor leak if memory allocation fails in json_util
     Zachary Blair, zack_blair at hotmail dot com
-  * Add int64 support. Two new functions json_object_net_int64 and
+  * Add int64 support. Two new functions json_object_new_int64 and
     json_object_get_int64. Binary compatibility preserved.
     Eric Haszlakiewicz, EHASZLA at transunion com
     Rui Miguel Silva Seabra, rms at 1407 dot org
@@ -73,7 +73,7 @@ NEXT.VERSION
     Brent Miller, bdmiller at yahoo dash inc dot com
   * Disable REFCOUNT_DEBUG by default in json_object.c
   * Don't use this as a variable, so we can compile with a C++ compiler
-  * Add casts from void* to type of assignment when using malloc 
+  * Add casts from void* to type of assignment when using malloc
   * Add #ifdef __cplusplus guards to all of the headers
   * Add typedefs for json_object, json_tokener, array_list, printbuf, lh_table
     Michael Clark, <michael@metaparadigm.com>
@@ -81,7 +81,7 @@ NEXT.VERSION
     to not return TRUE for zero length string. Remove redundant includes.
     Erik Hovland, erik at hovland dot org
   * Fixed warning reported by adding -Wstrict-prototypes
-    -Wold-style-definition to the compilatin flags.
+    -Wold-style-definition to the compilation flags.
     Dotan Barak, dotanba at gmail dot com
   * Add const correctness to public interfaces
     Gerard Krol, g dot c dot krol at student dot tudelft dot nl
@@ -100,7 +100,7 @@ NEXT.VERSION
 
 0.7
   * Add escaping of backslash to json output
-  * Add escaping of foward slash on tokenizing and output
+  * Add escaping of forward slash on tokenizing and output
   * Changes to internal tokenizer from using recursion to
     using a depth state structure to allow incremental parsing
 
@@ -150,12 +150,12 @@ NEXT.VERSION
     Added a Win32/Win64 compliant implementation of strndup
   * json_util.c - C. Watford (christopher.watford@gmail.com)
     Added cast and mask to suffice size_t v. unsigned int conversion
-    correctness 
+    correctness
   * json_tokener.c - sign reversal issue on error info for nested object parse
     spotted by Johan Björklund (johbjo09 at kth.se)
   * json_object.c - escape " in json_escape_str
   * Change to automake and libtool to build shared and static library
     Michael Clark <michael@metaparadigm.com>
-	
+
 0.1
   * initial release

README-WIN32.html

@@ -7,44 +7,48 @@
 	<body>
 		<h2>Windows specific notes for JSON-C</h2>
 		<p>Please send Win32 bug reports to <a href="mailto:christopher.watford@gmail.com">christopher.watford@gmail.com</a></p>
-		<p><b>Win32 Specific Changes:</b></p>
+
+		<h3>Win32 Specific Changes</h3>
 		<ul>
 			<li>
-				Various functions have been redefined to their Win32 version (i.e. <tt>open</tt>
-				on win32 is <tt>_open</tt>)</li>
+				Various functions have been redefined to their Win32 version (i.e. <code>open</code>
+				on win32 is <code>_open</code>)</li>
 			<li>
-				Implemented missing functions from MS's libc (i.e. <tt>vasprintf</tt> and <tt>strndup</tt>)</li>
+				Implemented missing functions from MS's libc (i.e. <code>vasprintf</code> and <code>strndup</code>)</li>
 			<li>
 				Added code to allow Win64 support without integer resizing issues, this 
-				probably makes it much nicer on 64bit machines everywhere (i.e. using <tt>ptrdiff_t</tt>
+				probably makes it much nicer on 64bit machines everywhere (i.e. using <code>ptrdiff_t</code>
 				for pointer math)</li>
 		</ul>
-		<p><b>Porting Changelog:</b></p>
+
+		<h3>Porting Changelog</h3>
 		<dl>
-			<dt><tt>printbuf.c</tt> - C. Watford (christopher.watford@gmail.com)</dt>
+			<dt><code>printbuf.c</code> - C. Watford (christopher.watford@gmail.com)</dt>
 			<dd>
-				Added a Win32/Win64 compliant implementation of <tt>vasprintf</tt></dd>
-			<dt><tt>debug.c</tt> - C. Watford (christopher.watford@gmail.com)</dt>
+				Added a Win32/Win64 compliant implementation of <code>vasprintf</code></dd>
+			<dt><code>debug.c</code> - C. Watford (christopher.watford@gmail.com)</dt>
 			<dd>
-				Removed usage of <tt>vsyslog</tt> on Win32/Win64 systems, needs to be handled 
+				Removed usage of <code>vsyslog</code> on Win32/Win64 systems, needs to be handled 
 				by a configure script</dd>
-			<dt><tt>json_object.c</tt> - C. Watford (christopher.watford@gmail.com)</dt>
+			<dt><code>json_object.c</code> - C. Watford (christopher.watford@gmail.com)</dt>
 			<dd>
-				Added scope operator to wrap usage of <tt>json_object_object_foreach</tt>, this needs to be
+				Added scope operator to wrap usage of <code>json_object_object_foreach</code>, this needs to be
 				rethought to be more ANSI C friendly</dd>
-			<dt><tt>json_object.h</tt> - C. Watford (christopher.watford@gmail.com)</dt>
+			<dt><code>json_object.h</code> - C. Watford (christopher.watford@gmail.com)</dt>
 			<dd>
-				Added Microsoft C friendly version of <tt>json_object_object_foreach</tt></dd>
-			<dt><tt>json_tokener.c</tt> - C. Watford (christopher.watford@gmail.com)</dt>
+				Added Microsoft C friendly version of <code>json_object_object_foreach</code></dd>
+			<dt><code>json_tokener.c</code> - C. Watford (christopher.watford@gmail.com)</dt>
 			<dd>
-				Added a Win32/Win64 compliant implementation of <tt>strndup</tt></dd>
-			<dt><tt>json_util.c</tt> - C. Watford (christopher.watford@gmail.com)</dt>
+				Added a Win32/Win64 compliant implementation of <code>strndup</code></dd>
+			<dt><code>json_util.c</code> - C. Watford (christopher.watford@gmail.com)</dt>
 			<dd>
-				Added cast and mask to suffice <tt>size_t</tt> v. <tt>unsigned int</tt>
+				Added cast and mask to suffice <code>size_t</code> v. <code>unsigned int</code>
 				conversion correctness</dd>
 		</dl>
-		<p>This program is free software; you can redistribute it and/or modify it under 
-			the terms of the MIT License. See COPYING for details.</p>
+
+		<h3><a href="COPYING">License</a></h3>
+		<p>This program is free software; you can redistribute it and/or modify it under the terms of the MIT License.</p>
+
 		<hr />
 	</body>
 </html>

README.html

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 	<head>
 		<title>JSON-C - A JSON implementation in C</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 	</head>
 	<body>
 		<h2>JSON-C - A JSON implementation in C</h2>
@@ -13,22 +13,23 @@
 		JSON formatted strings back into the C representation of JSON objects.</p>
 
 		<h3>Building</h3>
-		<p>To setup JSON-C to build on your system please run <tt>configure</tt> and <tt>make</tt>.</p>
+		<p>To setup JSON-C to build on your system please run <code>configure</code> and <code>make</code>.</p>
 		<p>If you are on Win32 and are not using the VS project file, be sure 
-		to rename <tt>config.h.win32</tt> to <tt>config.h</tt> before building.</p>
+		to rename <code>config.h.win32</code> to <code>config.h</code> before building.</p>
 
 		<h3>Documentation</h3>
-		<P>Doxygen generated documentation exists <a href="doc/html/json__object_8h.html">here</a>
-		and Win32 specific notes can be found <a href="README-WIN32.html">here</a>.</P>
+		<p>Doxygen generated documentation exists <a href="doc/html/json__object_8h.html">here</a>
+		and Win32 specific notes can be found <a href="README-WIN32.html">here</a>.</p>
 
-		<h3><a href="https://github.com/json-c/json-c">GIT Reposository</a></h3>
+		<h3><a href="https://github.com/json-c/json-c">GIT Repository</a></h3>
 		<p><strong><code>git clone https://github.com/json-c/json-c.git</code></strong></p>
 
 		<h3><a href="http://groups.google.com/group/json-c">Mailing List</a></h3>
-                <pi>Send email to <strong><code>json-c <i>&lt;at&gt;</i> googlegroups <i>&lt;dot&gt;</i> com</code></strong></p>
+		<p>Send email to <strong><code>json-c <i>&lt;at&gt;</i> googlegroups <i>&lt;dot&gt;</i> com</code></strong></p>
 
 		<h3><a href="COPYING">License</a></h3>
-		<p>This program is free software; you can redistribute it and/or modify it under the terms of the MIT License..</p>
-		<hr/>
+		<p>This program is free software; you can redistribute it and/or modify it under the terms of the MIT License.</p>
+
+		<hr />
 	</body>
 </html>