Replace utf8proc with simpler string handling

Author: James McLaughlin

CMakeLists.txt

@@ -4,7 +4,7 @@ project (json-builder)
 
 set (CMAKE_C_FLAGS "-std=c89 -ansi -pedantic -Wall -I../json-parser ${CMAKE_C_FLAGS}")
 
-set (SOURCES ${SOURCES} json-builder.c utf8proc.c)
+set (SOURCES ${SOURCES} json-builder.c)
 
 add_library (jsonbuilder ${SOURCES})
 

LICENSE

@@ -1,7 +1,4 @@
 
-All files with the exception of utf8proc.c, utf8proc.h and utf8proc_data.h
-----
-
   Copyright (C) 2014 James McLaughlin.  All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -27,71 +24,3 @@ All files with the exception of utf8proc.c, utf8proc.h and utf8proc_data.h
   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGE.
 
-
-utf8proc.c, utf8proc.h and utf8proc_data.h
-----
-
-  Copyright (c) 2009, 2013 Public Software Group e. V., Berlin, Germany
-
-  Permission is hereby granted, free of charge, to any person obtaining a
-  copy of this software and associated documentation files (the "Software"),
-  to deal in the Software without restriction, including without limitation
-  the rights to use, copy, modify, merge, publish, distribute, sublicense,
-  and/or sell copies of the Software, and to permit persons to whom the
-  Software is furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-  DEALINGS IN THE SOFTWARE.
-
-
-  This software distribution contains derived data from a modified version of
-  the Unicode data files. The following license applies to that data:
-
-  COPYRIGHT AND PERMISSION NOTICE
-
-  Copyright (c) 1991-2007 Unicode, Inc. All rights reserved. Distributed
-  under the Terms of Use in http://www.unicode.org/copyright.html.
-
-  Permission is hereby granted, free of charge, to any person obtaining a
-  copy of the Unicode data files and any associated documentation (the "Data
-  Files") or Unicode software and any associated documentation (the
-  "Software") to deal in the Data Files or Software without restriction,
-  including without limitation the rights to use, copy, modify, merge,
-  publish, distribute, and/or sell copies of the Data Files or Software, and
-  to permit persons to whom the Data Files or Software are furnished to do
-  so, provided that (a) the above copyright notice(s) and this permission
-  notice appear with all copies of the Data Files or Software, (b) both the
-  above copyright notice(s) and this permission notice appear in associated
-  documentation, and (c) there is clear notice in each modified Data File or
-  in the Software as well as in the documentation associated with the Data
-  File(s) or Software that the data or software has been modified.
-
-  THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-  KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-  THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-  INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-  CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-  USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-  Except as contained in this notice, the name of a copyright holder shall
-  not be used in advertising or otherwise to promote the sale, use or other
-  dealings in these Data Files or Software without prior written
-  authorization of the copyright holder.
-
-
-  Unicode and the Unicode logo are trademarks of Unicode, Inc., and may be
-  registered in some jurisdictions. All other trademarks and registered
-  trademarks mentioned herein are the property of their respective owners.
-
-

json-builder.c

@@ -39,8 +39,6 @@
     #define snprintf _snprintf
 #endif
 
-#include "utf8proc.h"
-
 const static json_serialize_opts default_opts =
 {
    json_serialize_mode_single_line,
@@ -460,16 +458,12 @@ json_value * json_object_merge (json_value * objectA, json_value * objectB)
 static size_t measure_string (unsigned int length,
                               const json_char * str)
 {
-   ssize_t i = 0;
-   int32_t c = -1;
+   unsigned int i;
    size_t measured_length = 0;
 
-   for(;;)
+   for(i = 0; i < length; ++ i)
    {
-      i += utf8proc_iterate ((const uint8_t *) str + i, length - i, &c);
-
-      if(c == -1)
-         break;
+      json_char c = str [i];
 
       switch (c)
       {
@@ -485,14 +479,9 @@ static size_t measure_string (unsigned int length,
          measured_length += 2;
          break;
 
-      case 0:
-
-         measured_length += 6;
-         break;
-
       default:
 
-         measured_length += utf8proc_measure_char (c);
+         ++ measured_length;
          break;
       };
    };
@@ -509,18 +498,12 @@ static size_t serialize_string (json_char * buf,
                                 unsigned int length,
                                 const json_char * str)
 {
-   ssize_t i = 0;
-   int32_t c = -1;
-   json_char * orig_buf;
-
-   orig_buf = buf;
+   json_char * orig_buf = buf;
+   unsigned int i;
 
-   for(;;)
+   for(i = 0; i < length; ++ i)
    {
-      i += utf8proc_iterate ((const uint8_t *) str + i, length - i, &c);
-
-      if(c == -1)
-         break;
+      json_char c = str [i];
 
       switch (c)
       {
@@ -533,17 +516,9 @@ static size_t serialize_string (json_char * buf,
       case '\r':  PRINT_ESCAPED ('r');   continue;
       case '\t':  PRINT_ESCAPED ('t');   continue;
 
-      case 0:
-
-         PRINT_ESCAPED ('u');
-         sprintf (buf, "%04x", c);
-         buf += 4;
-
-         break;
-
       default:
 
-         buf += utf8proc_encode_char (c, (uint8_t *) buf);
+         *buf ++ = c;
          break;
       };
    };