[FIX] func count of args + args -> args (string)

Proto change from 2013/07/02

diff --git a/daemon/da_protocol.c b/daemon/da_protocol.c
index f5b9105..81893c5 100644 (file)
--- a/daemon/da_protocol.c
+++ b/daemon/da_protocol.c
@@ -415,19 +415,13 @@ static char *parse_us_inst_func( char * buf, struct us_func_inst_t * dest)
 {
        char *p = buf;
 
-       p = parse_int64( p, &(dest->func_addr));
+       p = parse_int64(p, &(dest->func_addr));
        if (!p) {
                LOGE("func addr parsing error\n");
                return 0;
        }
 
-       p = parse_int32( p, &(dest->args_num));
-       if (!p) {
-               LOGE("args num parsing error\n");
-               return 0;
-       }
-
-       p = parse_chars( p, dest->args_num, &(dest->args));
+       p = parse_string(p, &dest->args);
        if (!p) {
                LOGE("args format parsing error\n");
                return 0;
@@ -1169,11 +1163,9 @@ static void print_us_func_inst(struct us_func_inst_t * func_inst, int count,char
 {
        LOGI("%s#%02d "
                "func_addr = <%Lu>/<0x%08LX>\t"
-               "args_num = %d\t"
                "args = <%s>\n",
                tab,count,
                func_inst->func_addr,func_inst->func_addr,
-               func_inst->args_num,
                func_inst->args
                );
 }

diff --git a/daemon/da_protocol.h b/daemon/da_protocol.h
index 62dc8ca..749460f 100644 (file)
--- a/daemon/da_protocol.h
+++ b/daemon/da_protocol.h
@@ -163,8 +163,7 @@ struct us_inst_t {
 
 struct us_func_inst_t {
        uint64_t func_addr;
-       uint32_t args_num;
-       char * args;
+       char *args;
 };
 
 struct us_lib_inst_t {