diff options
author | Eugene Tarassov | 2013-09-24 21:45:09 +0000 |
---|---|---|
committer | Eugene Tarassov | 2013-09-24 21:45:09 +0000 |
commit | 8a59c7acfe4d966035e9924bae85847a01b9113d (patch) | |
tree | 224665f5a2cda0af7b13496c0122650546de8ce4 /server | |
parent | 57adad84b78d3c8466d3c48b48652b304de3f919 (diff) | |
download | org.eclipse.tcf.agent-8a59c7acfe4d966035e9924bae85847a01b9113d.tar.gz org.eclipse.tcf.agent-8a59c7acfe4d966035e9924bae85847a01b9113d.tar.xz org.eclipse.tcf.agent-8a59c7acfe4d966035e9924bae85847a01b9113d.zip |
TCF Agent: code cleanup
Diffstat (limited to 'server')
-rw-r--r-- | server/tcf/services/context-proxy.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/server/tcf/services/context-proxy.c b/server/tcf/services/context-proxy.c index 1a14ae93..8819f08c 100644 --- a/server/tcf/services/context-proxy.c +++ b/server/tcf/services/context-proxy.c @@ -109,7 +109,7 @@ struct ContextCache { #if ENABLE_ContextISA /* Default Isa cache */ - DefIsaCache * def_isa_cache; + DefIsaCache * def_isa_cache; #endif }; @@ -186,7 +186,7 @@ struct DefIsaCache { ReplyHandlerInfo * pending; int disposed; }; -#endif +#endif typedef struct MMListener { MemoryMapEventListener * listener; @@ -1834,10 +1834,10 @@ static void read_isa_attr(InputStream * inp, const char * nm, void * args) { DefIsaCache * i = (DefIsaCache *)args; if (strcmp(nm, "DefISA") == 0) { - i->def_isa = json_read_alloc_string(inp); + i->def_isa = json_read_alloc_string(inp); } else { - json_skip_object(inp); + json_skip_object(inp); } } @@ -1850,10 +1850,10 @@ static void validate_cache_isa(Channel * c, void * args, int error) { assert(i->error == NULL); if (set_trap(&trap)) { - i->pending = NULL; + i->pending = NULL; if (!error) { - error = read_errno(&c->inp); - json_read_struct(&c->inp, read_isa_attr, i); + error = read_errno(&c->inp); + json_read_struct(&c->inp, read_isa_attr, i); json_test_char(&c->inp, MARKER_EOA); json_test_char(&c->inp, MARKER_EOM); @@ -1888,8 +1888,8 @@ static int get_context_defisa_from_rc (Context * ctx, ContextISA * isa) { if (i->pending != NULL) cache_wait(&i->cache); if (i->isa_valid) { - if (i->def_isa != NULL) isa->def = loc_strdup(i->def_isa); - set_error_report_errno(i->error); + if (i->def_isa != NULL) isa->def = loc_strdup(i->def_isa); + set_error_report_errno(i->error); clear_trap(&trap); return !errno ? 0 : -1; } @@ -1910,7 +1910,7 @@ int context_get_isa(Context * ctx, ContextAddress addr, ContextISA * isa) { memset(isa, 0, sizeof(ContextISA)); if (get_context_isa(ctx, addr, &isa->isa, &isa->addr, &isa->size) < 0) return -1; else if (isa->isa == NULL) { - if (get_context_defisa_from_rc(ctx, isa) < 0) return -1; + if (get_context_defisa_from_rc(ctx, isa) < 0) return -1; } return 0; } |