Merge pull request #8 from estenberg/master

Revert json-change, add helper that can be used instead

Author: dottedmag

src/json.c

@@ -173,11 +173,7 @@ void JsonObjectAppendString(JsonElement *object, const char *key, const char *va
     assert(object->type == JSON_ELEMENT_TYPE_CONTAINER);
     assert(object->container.type == JSON_CONTAINER_TYPE_OBJECT);
     assert(key);
-    
-    if(!value)
-    {
-	value = "";
-    }
+    assert(value);
 
     JsonElement *child = JsonElementCreatePrimitive(JSON_PRIMITIVE_TYPE_STRING, key, EscapeJsonString(value));
 

src/string_lib.c

@@ -309,3 +309,15 @@ long StringToLong(const char *str)
 
     return result;
 }
+
+/*********************************************************************/
+
+char *NULLStringToEmpty(char *str)
+{
+    if(!str)
+    {
+	return "";
+    }
+    
+    return str;
+}

src/string_lib.h

@@ -33,6 +33,7 @@ char *ToLowerStr(const char *str);
 void ToLowerStrInplace(char *str);
 
 long StringToLong(const char *str);
+char *NULLStringToEmpty(char *str);
 
 bool IsNumber(const char *name);