diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mate/mate_grammar.lemon | 12 | ||||
-rw-r--r-- | plugins/mate/mate_parser.l | 6 | ||||
-rw-r--r-- | plugins/mate/mate_setup.c | 4 | ||||
-rw-r--r-- | plugins/mate/mate_util.c | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/plugins/mate/mate_grammar.lemon b/plugins/mate/mate_grammar.lemon index 6426bcd518..97c5ba5f6c 100644 --- a/plugins/mate/mate_grammar.lemon +++ b/plugins/mate/mate_grammar.lemon @@ -98,10 +98,10 @@ static void configuration_error(mate_config* mc, const gchar* fmt, ...) { current_frame = g_ptr_array_index(mc->config_stack,(guint)i); - g_string_sprintfa(mc->config_error,"%s%s at line %u",incl, current_frame->filename, current_frame->linenum); + g_string_append_printf(mc->config_error,"%s%s at line %u",incl, current_frame->filename, current_frame->linenum); } - g_string_sprintfa(mc->config_error,": %s\n",error_buffer); + g_string_append_printf(mc->config_error,": %s\n",error_buffer); THROW(MateConfigError); @@ -157,7 +157,7 @@ static gchar* recolonize(mate_config* mc, gchar* s) { configuration_error(mc,"bad token %s",s); } - g_string_sprintfa(str,":%.2X",v); + g_string_append_printf(str,":%.2X",v); } g_strfreev(vec); @@ -425,7 +425,7 @@ pdu_decl ::= cfg->discard = DistcardPduData; cfg->drop_unassigned = DropUnassigned; - g_string_sprintfa(mc->protos_filter,"||%s",Field->abbrev); + g_string_append_printf(mc->protos_filter,"||%s",Field->abbrev); /* flip the transport_stack */ for (i = Stack->len - 1; Stack->len; i--) { @@ -494,7 +494,7 @@ last_extracted_statement(A) ::= . { A = mc->defaults.pdu.last_extracted; } proto_stack(A) ::= proto_stack(B) SLASH field(C). { int* hfidp = g_malloc(sizeof(int)); - g_string_sprintfa(mc->fields_filter,"||%s",C->abbrev); + g_string_append_printf(mc->fields_filter,"||%s",C->abbrev); *hfidp = C->id; g_ptr_array_add(B,hfidp); @@ -505,7 +505,7 @@ proto_stack(A) ::= field(B). { int* hfidp = g_malloc(sizeof(int)); *hfidp = B->id; - g_string_sprintfa(mc->fields_filter,"||%s",B->abbrev); + g_string_append_printf(mc->fields_filter,"||%s",B->abbrev); A = g_ptr_array_new(); g_ptr_array_add(A,hfidp); diff --git a/plugins/mate/mate_parser.l b/plugins/mate/mate_parser.l index 31d2fa4b88..0a284a4a45 100644 --- a/plugins/mate/mate_parser.l +++ b/plugins/mate/mate_parser.l @@ -182,7 +182,7 @@ blk_cmnt_stop "*/" yy_switch_to_buffer(include_stack[--include_stack_ptr] ); if (errno) - g_string_sprintfa(mc->config_error, "Mate parser: Could not open file: '%s': %s", yytext, strerror(errno) ); + g_string_append_printf(mc->config_error, "Mate parser: Could not open file: '%s': %s", yytext, strerror(errno) ); } else { @@ -292,7 +292,7 @@ extern gboolean mate_load_config(const gchar* filename, mate_config* matecfg) { yyin = eth_fopen(filename,"r"); if (!yyin) { - g_string_sprintfa(mc->config_error,"Mate parser: Could not open file: '%s', error: %s", filename, strerror(errno) ); + g_string_append_printf(mc->config_error,"Mate parser: Could not open file: '%s', error: %s", filename, strerror(errno) ); return FALSE; } @@ -327,7 +327,7 @@ extern gboolean mate_load_config(const gchar* filename, mate_config* matecfg) { state = FALSE; } CATCH_ALL { state = FALSE; - g_string_sprintfa(mc->config_error,"An unexpected error occurred"); + g_string_append_printf(mc->config_error,"An unexpected error occurred"); } ENDTRY; diff --git a/plugins/mate/mate_setup.c b/plugins/mate/mate_setup.c index c496aea40d..4d999f8f39 100644 --- a/plugins/mate/mate_setup.c +++ b/plugins/mate/mate_setup.c @@ -203,7 +203,7 @@ extern gchar* add_ranges(gchar* range,GPtrArray* range_ptr_arr) { hfidp = g_malloc(sizeof(int)); *hfidp = hfi->id; g_ptr_array_add(range_ptr_arr,(gpointer)hfidp); - g_string_sprintfa(matecfg->fields_filter, "||%s",ranges[i]); + g_string_append_printf(matecfg->fields_filter, "||%s",ranges[i]); } else { g_strfreev(ranges); return g_strdup_printf("no such proto: '%s'",ranges[i]);; @@ -249,7 +249,7 @@ static void analyze_pdu_hfids(gpointer k, gpointer v, gpointer p) { mate_cfg_pdu* cfg = p; new_attr_hfri(cfg->name,cfg->my_hfids,(gchar*) v); - g_string_sprintfa(matecfg->fields_filter,"||%s",my_protoname(*(int*)k)); + g_string_append_printf(matecfg->fields_filter,"||%s",my_protoname(*(int*)k)); } static void analyze_transform_hfrs(gchar* name, GPtrArray* transforms, GHashTable* hfids) { diff --git a/plugins/mate/mate_util.c b/plugins/mate/mate_util.c index d0b9ae7d22..ac9ccf2569 100644 --- a/plugins/mate/mate_util.c +++ b/plugins/mate/mate_util.c @@ -771,7 +771,7 @@ gchar* avpl_to_str(AVPL* avpl) { for(c=avpl->null.next; c->avp; c = c->next) { avp_s = avp_to_str(c->avp); - g_string_sprintfa(s," %s;",avp_s); + g_string_append_printf(s," %s;",avp_s); g_free(avp_s); } @@ -790,7 +790,7 @@ extern gchar* avpl_to_dotstr(AVPL* avpl) { for(c=avpl->null.next; c->avp; c = c->next) { avp_s = avp_to_str(c->avp); - g_string_sprintfa(s," .%s;",avp_s); + g_string_append_printf(s," .%s;",avp_s); g_free(avp_s); } |