jshn: shorten JSON_VAR to J_V

[project/libubox.git] / jshn.c

diff --git a/jshn.c b/jshn.c
index cec48a0..431e1b3 100644 (file)
--- a/jshn.c
+++ b/jshn.c
@@ -164,7 +164,7 @@ static int jshn_parse(const char *str)
        json_object *obj;
 
        obj = json_tokener_parse(str);
-       if (is_error(obj) || json_object_get_type(obj) != json_type_object) {
+       if (!obj || json_object_get_type(obj) != json_type_object) {
                fprintf(stderr, "Failed to parse message data\n");
                return 1;
        }
@@ -179,8 +179,8 @@ static char *get_keys(const char *prefix)
 {
        char *keys;
 
-       keys = alloca(var_prefix_len + strlen(prefix) + sizeof("KEYS_") + 1);
-       sprintf(keys, "%sKEYS_%s", var_prefix, prefix);
+       keys = alloca(var_prefix_len + strlen(prefix) + sizeof("K_") + 1);
+       sprintf(keys, "%sK_%s", var_prefix, prefix);
        return getenv(keys);
 }
 
@@ -188,15 +188,15 @@ static void get_var(const char *prefix, const char **name, char **var, char **ty
 {
        char *tmpname, *varname;
 
-       tmpname = alloca(var_prefix_len + strlen(prefix) + 1 + strlen(*name) + 1 + sizeof("TYPE_"));
+       tmpname = alloca(var_prefix_len + strlen(prefix) + 1 + strlen(*name) + 1 + sizeof("T_"));
 
        sprintf(tmpname, "%s%s_%s", var_prefix, prefix, *name);
        *var = getenv(tmpname);
 
-       sprintf(tmpname, "%sTYPE_%s_%s", var_prefix, prefix, *name);
+       sprintf(tmpname, "%sT_%s_%s", var_prefix, prefix, *name);
        *type = getenv(tmpname);
 
-       sprintf(tmpname, "%sNAME_%s_%s", var_prefix, prefix, *name);
+       sprintf(tmpname, "%sN_%s_%s", var_prefix, prefix, *name);
        varname = getenv(tmpname);
        if (varname)
                *name = varname;
@@ -260,7 +260,7 @@ static int jshn_format(bool no_newline, bool indent)
        const char *output;
 
        obj = json_object_new_object();
-       jshn_add_objects(obj, "JSON_VAR", false);
+       jshn_add_objects(obj, "J_V", false);
        output = json_object_to_json_string(obj);
        if (indent) {
                blob_buf_init(&b, 0);