ejson 1.1.0: adjust APIs

ziyht · May 6, 2019 · e307c87 · e307c87
1 parent 00e77db
commit e307c87
Show file tree

Hide file tree

Showing 13 changed files with 700 additions and 805 deletions.
diff --git a/src/libs/etools/earg.c b/src/libs/etools/earg.c
@@ -203,7 +203,7 @@ int    earg_parse(earg h, int argc, cstr argv[])
         }
 
         short_arg[0] = (u8)opt;
-        arg = ejsonk_valR(h->args_d, short_arg);
+        arg = ejson_kvalR(h->args_d, short_arg);
         if(!arg)
         {
             fprintf (stderr, "%s    option unknown: %c\n", h->desc, *short_arg);
@@ -246,5 +246,5 @@ arg    earg_find(earg h, char tag)
     char short_arg[4] = {0};
     short_arg[0] = tag;
 
-    return h ? ejsonk_valR(h->args_d, short_arg) : 0;
+    return h ? ejson_kvalR(h->args_d, short_arg) : 0;
 }
diff --git a/src/libs/etools/ejson.c b/src/libs/etools/ejson.c
diff --git a/src/libs/etools/ejson.h b/src/libs/etools/ejson.h
diff --git a/src/libs/etools/enats.c b/src/libs/etools/enats.c
@@ -474,7 +474,7 @@ static inline ejson __enats_makeRoomForSubs(enats e, constr subj, enats_msgHandl
     mutex_ulck(e->sub_mu);
     is0_exeret(subs, errfmt(e, "subs of \"%s\" already exist", subj), 0);
 
-    assert(sroom = ejsonk(e->sub_dic, subj));
+    assert(sroom = ejson_k(e->sub_dic, subj));
 
     subs->e           = e;
     subs->msg_handler = onMsg;
@@ -797,7 +797,7 @@ static inline void __enats_stats(enats trans, constr subj, enats_stats_t* stats,
     s = natsConnection_GetStats(trans->conn.nc, (natsStatistics*)stats);
 
     mutex_lock(trans->sub_mu);
-    ntSub = ejsonk_valR(trans->sub_dic, subj);
+    ntSub = ejson_kvalR(trans->sub_dic, subj);
     mutex_ulck(trans->sub_mu);
     if ((s == NATS_OK) && (ntSub != NULL))
     {
@@ -1371,7 +1371,7 @@ static void __enatp_exeLazyThread(enatp p)
 
 static inline int __enatp_chkName(enatp p, constr name)
 {
-    return !ejsonk(p->name_groups, name);
+    return !ejson_k(p->name_groups, name);
 }
 
 static inline ejson __enatp_getGroup(enatp p, constr name)
@@ -1380,7 +1380,7 @@ static inline ejson __enatp_getGroup(enatp p, constr name)
 
     enatp_lock(p);
 
-    egroup = ejsonk(p->name_groups, name);
+    egroup = ejson_k(p->name_groups, name);
 
     if(!egroup)
     {
@@ -1401,7 +1401,7 @@ static inline int __enatp_getAvailNameIdForGroup(enatp p, ejson egroup, char ena
     do
     {
         snprintf(ename, 64, "%s.%d", eobj_keyS(egroup),++id);
-    }while(ejsonk(egroup, ename));
+    }while(ejson_k(egroup, ename));
 
     enatp_ulck(p);
 
@@ -1532,7 +1532,7 @@ static inline ejson __enatp_getEnatsRooms(enatp p, constr name)
     else if(name == ENATP_ALL_TRANS)  eroom = p->name_groups;
     else {
         enatp_lock(p);
-        eroom = ejsonk(p->name_groups, name);
+        eroom = ejson_k(p->name_groups, name);
         enatp_ulck(p);
     }
 

diff --git a/src/libs/etools/ert.c b/src/libs/etools/ert.c
@@ -519,7 +519,7 @@ int  ert_query(ert tp, constr tag)
     is0_ret(tp->status == _INITED, 0);
 
     tasks_lock();
-    ret = ejsonk(tp->tasks_tags, tag) ? 1 : 0;
+    ret = ejson_k(tp->tasks_tags, tag) ? 1 : 0;
     tasks_ulck();
 
     return ret;