]> git.kaiwu.me - klib.git/commitdiff
rename a member var for clarity
authorHeng Li <lh3@me.com>
Sun, 30 Nov 2014 05:47:00 +0000 (00:47 -0500)
committerHeng Li <lh3@me.com>
Sun, 30 Nov 2014 05:47:00 +0000 (00:47 -0500)
kson.c
kson.h

diff --git a/kson.c b/kson.c
index d86b8a27107bbb927e8b2a70d3056927e27c4961..ad0a27584dcd17d6e7aaee132185593e9558ec9d 100644 (file)
--- a/kson.c
+++ b/kson.c
@@ -113,9 +113,9 @@ void kson_destroy(kson_t *kson)
        long i;
        if (kson == 0) return;
        for (i = 0; i < kson->n_nodes; ++i) {
-               free(kson->nodes[i].key); free(kson->nodes[i].v.str);
+               free(kson->root[i].key); free(kson->root[i].v.str);
        }
-       free(kson->nodes); free(kson);
+       free(kson->root); free(kson);
 }
 
 kson_t *kson_parse(const char *json)
@@ -123,7 +123,7 @@ kson_t *kson_parse(const char *json)
        kson_t *kson;
        int error;
        kson = (kson_t*)calloc(1, sizeof(kson_t));
-       kson->nodes = kson_parse_core(json, &kson->n_nodes, &error, 0);
+       kson->root = kson_parse_core(json, &kson->n_nodes, &error, 0);
        if (error) {
                kson_destroy(kson);
                return 0;
@@ -221,10 +221,10 @@ int main(int argc, char *argv[])
                        kson = kson_parse(json);
                        free(json);
                        if (kson) {
-                               kson_format(kson->nodes);
+                               kson_format(kson->root);
                                if (argc > 2) {
                                        // path finding
-                                       const kson_node_t *p = kson->nodes;
+                                       const kson_node_t *p = kson->root;
                                        for (i = 2; i < argc && p; ++i) {
                                                if (p->type == KSON_TYPE_BRACKET)
                                                        p = kson_by_index(p, atoi(argv[i]));
@@ -242,10 +242,10 @@ int main(int argc, char *argv[])
        } else {
                kson = kson_parse("{'a' : 1,'b':[0,'isn\\'t',true],'d':[{\n\n\n}]}");
                if (kson) {
-                       const kson_node_t *p = kson_query(kson->nodes, 2, "b", 1);
+                       const kson_node_t *p = kson_query(kson->root, 2, "b", 1);
                        if (p) printf("*** %s\n", p->v.str);
                        else printf("!!! not found\n");
-                       kson_format(kson->nodes);
+                       kson_format(kson->root);
                } else {
                        printf("Failed to parse\n");
                }
diff --git a/kson.h b/kson.h
index d81988707fcb98f0c3f9ce5508c6213ddfe01005..9c0eafcedb38f9ccd62a2dfe6d2ec29f8f6a4102 100644 (file)
--- a/kson.h
+++ b/kson.h
@@ -25,7 +25,7 @@ typedef struct kson_node_s {
 
 typedef struct {
        long n_nodes;
-       kson_node_t *nodes; // nodes[0] is the root
+       kson_node_t *root;
 } kson_t;
 
 #ifdef __cplusplus