diff options
-rw-r--r-- | epan/Makefile.am | 3 | ||||
-rw-r--r-- | epan/addr_resolv.c | 18 | ||||
-rw-r--r-- | epan/filesystem.c | 2 | ||||
-rw-r--r-- | epan/follow.c | 2 | ||||
-rw-r--r-- | epan/proto.c | 28 | ||||
-rw-r--r-- | epan/reassemble.c | 2 | ||||
-rw-r--r-- | epan/req_resp_hdrs.c | 8 | ||||
-rw-r--r-- | epan/sigcomp-udvm.c | 4 | ||||
-rw-r--r-- | epan/sigcomp_state_hdlr.c | 4 | ||||
-rw-r--r-- | epan/stats_tree.c | 44 | ||||
-rw-r--r-- | epan/tvbparse.c | 2 | ||||
-rw-r--r-- | plugins/mate/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/mate/mate_setup.c | 295 | ||||
-rw-r--r-- | plugins/mate/mate_util.c | 39 | ||||
-rw-r--r-- | tools/lemon/Makefile.am | 4 |
15 files changed, 71 insertions, 388 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index 9851b3e859..1d3436f31d 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -22,6 +22,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +if HAVE_WARNINGS_AS_ERRORS +AM_CFLAGS = -Werror +endif if HAVE_LIBLUA wslua_lib = wslua/libwslua.la diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index f12eda1080..8c1544aced 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -63,6 +63,14 @@ * sites still using NIS rather than DNS for that....) */ +#ifdef HAVE_GNU_ADNS +# include <errno.h> +# include <adns.h> +# ifdef inet_aton +# undef inet_aton +# endif +#endif + #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -101,14 +109,6 @@ # include "inet_v6defs.h" #endif -#ifdef HAVE_GNU_ADNS -# include <errno.h> -# include <adns.h> -# ifdef inet_aton -# undef inet_aton -# endif -#endif - #if defined(_WIN32) && defined(INET6) # include <ws2tcpip.h> #endif @@ -553,7 +553,7 @@ static const gchar *solve_address_to_name(address *addr) return get_hostname6(&ipv6_addr); case AT_STRINGZ: - return addr->data; + return (gchar*)addr->data; default: return NULL; diff --git a/epan/filesystem.c b/epan/filesystem.c index 7f9f87eea0..e63b4dc333 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -1082,7 +1082,7 @@ get_persconffile_path(const char *filename, gboolean for_writing * (move this e.g. to main.c and have set_persconffile_dir() instead in this file?) */ int -filesystem_opt(int opt, const char *optarg) +filesystem_opt(int opt _U_, const char *optarg) { gchar *p, *colonp; diff --git a/epan/follow.c b/epan/follow.c index a98b7fc214..5e35045d46 100644 --- a/epan/follow.c +++ b/epan/follow.c @@ -257,7 +257,7 @@ reassemble_tcp( gulong sequence, gulong length, const char* data, /* out of order packet */ if(data_length > 0 && sequence > seq[src_index] ) { tmp_frag = (tcp_frag *)g_malloc( sizeof( tcp_frag ) ); - tmp_frag->data = (guchar *)g_malloc( data_length ); + tmp_frag->data = (gchar *)g_malloc( data_length ); tmp_frag->seq = sequence; tmp_frag->len = length; tmp_frag->data_len = data_length; diff --git a/epan/proto.c b/epan/proto.c index 9659b9718b..f90fa183c6 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -943,7 +943,7 @@ proto_tree_new_item(field_info *new_fi, proto_tree *tree, int hfindex, string = ep_alloc(length); - tvb_memcpy(tvb, string, start, length); + tvb_memcpy(tvb, (guint8*)string, start, length); } else if (length == 0) { string = "[Empty]"; } else { @@ -978,8 +978,9 @@ proto_tree_new_item(field_info *new_fi, proto_tree *tree, int hfindex, * we made string values counted * rather than null-terminated.) */ - string = tvb_get_ephemeral_string(tvb, start, - length); + string = (gchar*)tvb_get_ephemeral_string(tvb, + start, + length); } new_fi->length = length; proto_tree_set_string(new_fi, string); @@ -1964,7 +1965,7 @@ proto_tree_set_string_tvb(field_info *fi, tvbuff_t *tvb, gint start, gint length length = tvb_ensure_length_remaining(tvb, start); } - string = tvb_get_ephemeral_string(tvb, start, length); + string = (gchar*)tvb_get_ephemeral_string(tvb, start, length); proto_tree_set_string(fi, string); } @@ -3871,14 +3872,14 @@ proto_item_fill_label(field_info *fi, gchar *label_str) case FT_STRINGZ: case FT_UINT_STRING: bytes = fvalue_get(&fi->value); - if(strlen(bytes) > ITEM_LABEL_LENGTH) { + if(strlen((char*)bytes) > ITEM_LABEL_LENGTH) { ret = g_snprintf(label_str, ITEM_LABEL_LENGTH, "%s [truncated]: %s", hfinfo->name, - format_text(bytes, strlen(bytes))); + format_text(bytes, strlen((char*)bytes))); } else { ret = g_snprintf(label_str, ITEM_LABEL_LENGTH, "%s: %s", hfinfo->name, - format_text(bytes, strlen(bytes))); + format_text(bytes, strlen((char*)bytes))); } if ((ret == -1) || (ret >= ITEM_LABEL_LENGTH)) label_str[ITEM_LABEL_LENGTH - 1] = '\0'; @@ -5150,10 +5151,15 @@ construct_match_selected_string(field_info *finfo, epan_dissect_t *edt, dfilter_len = abbrev_len + 4 + 11 + 1; *filter = ep_alloc0(dfilter_len); format = hfinfo_numeric_format(hfinfo); - g_snprintf(*filter, dfilter_len, format, - hfinfo->abbrev, - is_signed_num ? fvalue_get_sinteger(&finfo->value) - : fvalue_get_uinteger(&finfo->value)); + if(is_signed_num) { + g_snprintf(*filter, dfilter_len, format, + hfinfo->abbrev, + fvalue_get_sinteger(&finfo->value)); + } else { + g_snprintf(*filter, dfilter_len, format, + hfinfo->abbrev, + fvalue_get_uinteger(&finfo->value)); + } } break; diff --git a/epan/reassemble.c b/epan/reassemble.c index 9a19f8566d..1dc635cfa5 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -1096,7 +1096,7 @@ static gboolean fragment_add_seq_work(fragment_data *fd_head, tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 frag_number, guint32 frag_data_len, gboolean more_frags, - guint32 flags) + guint32 flags _U_) { fragment_data *fd; fragment_data *fd_i; diff --git a/epan/req_resp_hdrs.c b/epan/req_resp_hdrs.c index 6947c47052..078b2bab3f 100644 --- a/epan/req_resp_hdrs.c +++ b/epan/req_resp_hdrs.c @@ -148,7 +148,7 @@ req_resp_hdrs_do_reassembly(tvbuff_t *tvb, int offset, packet_info *pinfo, */ if (tvb_strncaseeql(tvb, next_offset_sav, "Content-Length:", 15) == 0) { - header_val = tvb_get_ephemeral_string(tvb, + header_val = (gchar*)tvb_get_ephemeral_string(tvb, next_offset_sav + 15, linelen - 15); if (sscanf(header_val, @@ -161,7 +161,7 @@ req_resp_hdrs_do_reassembly(tvbuff_t *tvb, int offset, packet_info *pinfo, } else if (tvb_strncaseeql(tvb, next_offset_sav, "Connection:", 11) == 0) { /* Check for keep-alive */ - header_val = tvb_get_ephemeral_string(tvb, + header_val = (gchar*)tvb_get_ephemeral_string(tvb, next_offset_sav + 11, linelen - 11); if(header_val){ @@ -184,7 +184,7 @@ req_resp_hdrs_do_reassembly(tvbuff_t *tvb, int offset, packet_info *pinfo, gchar *p; gint len; - header_val = tvb_get_ephemeral_string(tvb, + header_val = (gchar*)tvb_get_ephemeral_string(tvb, next_offset_sav + 18, linelen - 18); p = header_val; len = strlen(header_val); @@ -282,7 +282,7 @@ req_resp_hdrs_do_reassembly(tvbuff_t *tvb, int offset, packet_info *pinfo, } /* We have a line with the chunk size in it.*/ - chunk_string = tvb_get_ephemeral_string(tvb, next_offset, + chunk_string = (gchar*)tvb_get_ephemeral_string(tvb, next_offset, linelen); c = chunk_string; diff --git a/epan/sigcomp-udvm.c b/epan/sigcomp-udvm.c index d1d0259e59..910529d565 100644 --- a/epan/sigcomp-udvm.c +++ b/epan/sigcomp-udvm.c @@ -2463,7 +2463,7 @@ execute_next_instruction: if (print_level_3 ){ proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1, " Addr: %5u State value: %u (0x%x) ASCII(%s)", - k,buff[k],buff[k],format_text(string, 1)); + k,buff[k],buff[k],format_text((guchar*)string, 1)); } k = ( k + 1 ) & 0xffff; n++; @@ -2584,7 +2584,7 @@ execute_next_instruction: if (print_level_3 ){ proto_tree_add_text(udvm_tree, bytecode_tvb, 0, -1, " Output value: %u (0x%x) ASCII(%s) from Addr: %u ,output to dispatcher position %u", - buff[k],buff[k],format_text(string,1), k,output_address); + buff[k],buff[k],format_text((guchar*)string,1), k,output_address); } k = ( k + 1 ) & 0xffff; output_address ++; diff --git a/epan/sigcomp_state_hdlr.c b/epan/sigcomp_state_hdlr.c index 26e01f4e10..623b5859bd 100644 --- a/epan/sigcomp_state_hdlr.c +++ b/epan/sigcomp_state_hdlr.c @@ -467,7 +467,7 @@ int udvm_state_access(tvbuff_t *tvb, proto_tree *tree,guint8 *buff,guint16 p_id_ partial_state[n] = buff[p_id_start + n]; n++; } - partial_state_str = bytes_to_str(partial_state, p_id_length); + partial_state_str = bytes_to_str((guint8*)partial_state, p_id_length); proto_tree_add_text(tree,tvb, 0, -1,"### Accessing state ###"); proto_tree_add_string(tree,hf_id, tvb, 0, 0, partial_state_str); @@ -581,7 +581,7 @@ void udvm_state_create(guint8 *state_buff,guint8 *state_identifier,guint16 p_id_ partial_state[i] = state_identifier[i]; i++; } - partial_state_str = bytes_to_str(partial_state, p_id_length); + partial_state_str = bytes_to_str((guint8*)partial_state, p_id_length); dummy_buff = g_hash_table_lookup(state_buffer_table, partial_state_str); if ( dummy_buff == NULL ){ diff --git a/epan/stats_tree.c b/epan/stats_tree.c index 02ca8a90bd..d63cb0f970 100644 --- a/epan/stats_tree.c +++ b/epan/stats_tree.c @@ -48,13 +48,13 @@ static GHashTable* registry = NULL; extern void stats_tree_get_strs_from_node(const stat_node* node, guint8* value, guint8* rate, guint8* percent) { float f; - if (value) g_snprintf(value,NUM_BUF_SIZE,"%u",node->counter); + if (value) g_snprintf((char*)value,NUM_BUF_SIZE,"%u",node->counter); if (rate) { *rate = '\0'; if (node->st->elapsed > 0.0) { f = ((float)node->counter) / (float)node->st->elapsed; - g_snprintf(rate,NUM_BUF_SIZE,"%f",f); + g_snprintf((gchar*)rate,NUM_BUF_SIZE,"%f",f); } } @@ -62,7 +62,7 @@ extern void stats_tree_get_strs_from_node(const stat_node* node, guint8* value, *percent = '\0'; if (node->parent->counter > 0) { f = (float)(((float)node->counter * 100.0) / node->parent->counter); - g_snprintf(percent,NUM_BUF_SIZE,"%.2f%%",f); + g_snprintf((gchar*)percent,NUM_BUF_SIZE,"%.2f%%",f); } } } @@ -73,10 +73,10 @@ if buffer is NULL returns a newly allocated string */ extern guint8* stats_tree_node_to_str(const stat_node* node, guint8* buffer, guint len) { if (buffer) { - g_snprintf(buffer,len,"%s: %i",node->name, node->counter); + g_snprintf((gchar*)buffer,len,"%s: %i",node->name, node->counter); return buffer; } else { - return g_strdup_printf("%s: %i",node->name, node->counter); + return (guint8*)g_strdup_printf("%s: %i",node->name, node->counter); } } @@ -117,7 +117,7 @@ extern void stats_tree_branch_to_str(const stat_node* node, GString* s, guint in format = g_strdup_printf(" %%s%%-%us%%12s %%12s %%12s\n",stats_tree_branch_max_namelen(node,0)); } - stats_tree_get_strs_from_node(node, value, rate, percent); + stats_tree_get_strs_from_node(node, (guint8*)value, (guint8*)rate, (guint8*)percent); indent = indent > INDENT_MAX ? INDENT_MAX : indent; @@ -256,9 +256,9 @@ extern void stats_tree_register(const guint8* tapname, /* at the very least the abbrev and the packet function should be given */ g_assert( tapname && abbr && packet ); - cfg->tapname = g_strdup(tapname); - cfg->abbr = g_strdup(abbr); - cfg->name = name ? g_strdup(name) : g_strdup(abbr); + cfg->tapname = (guint8*)g_strdup((gchar*)tapname); + cfg->abbr = (guint8*)g_strdup((gchar*)abbr); + cfg->name = name ? (guint8*)g_strdup((gchar*)name) : (guint8*)g_strdup((gchar*)abbr); cfg->packet = packet; cfg->init = init; @@ -294,7 +294,7 @@ extern stats_tree* stats_tree_new(stats_tree_cfg* cfg, tree_pres* pr,char* filte st->elapsed = 0.0; st->root.counter = 0; - st->root.name = g_strdup(cfg->name); + st->root.name = g_strdup((gchar*)cfg->name); st->root.st = st; st->root.parent = NULL; st->root.children = NULL; @@ -390,11 +390,11 @@ extern void stats_tree_presentation(void (*registry_iterator)(gpointer,gpointer, * as_named_node: whether or not it has to be registered in the root namespace */ static stat_node* new_stat_node(stats_tree* st, - const gchar* name, - int parent_id, - gboolean with_hash, - gboolean as_parent_node) { - + const gchar* name, + int parent_id, + gboolean with_hash, + gboolean as_parent_node) { + stat_node *node = g_malloc (sizeof(stat_node)); stat_node* last_chld = NULL; @@ -494,7 +494,7 @@ extern int stats_tree_manip_node(manip_node_mode mode, stats_tree* st, const gui } if ( node == NULL ) - node = new_stat_node(st,name,parent_id,with_hash,with_hash); + node = new_stat_node(st,(gchar*)name,parent_id,with_hash,with_hash); switch (mode) { case MN_INCREASE: node->counter += value; break; @@ -518,7 +518,7 @@ extern guint8* stats_tree_get_abbr(const guint8* optarg) { for (i=0; optarg[i] && optarg[i] != ','; i++); if (optarg[i] == ',') { - return g_strndup(optarg,i); + return (guint8*)g_strndup((gchar*)optarg,i); } else { return NULL; } @@ -593,7 +593,7 @@ extern int stats_tree_create_range_node(stats_tree* st, va_start( list, parent_id ); while (( curr_range = va_arg(list, guint8*) )) { - range_node = new_stat_node(st, curr_range, rng_root->id, FALSE, FALSE); + range_node = new_stat_node(st, (gchar*)curr_range, rng_root->id, FALSE, FALSE); range_node->rng = get_range(curr_range); } va_end( list ); @@ -624,7 +624,7 @@ extern int stats_tree_range_node_with_pname(stats_tree* st, va_start( list, parent_name ); while (( curr_range = va_arg(list, guint8*) )) { - range_node = new_stat_node(st, curr_range, rng_root->id, FALSE, FALSE); + range_node = new_stat_node(st, (gchar*)curr_range, rng_root->id, FALSE, FALSE); range_node->rng = get_range(curr_range); } va_end( list ); @@ -697,13 +697,13 @@ extern int stats_tree_create_pivot_by_pname(stats_tree* st, } extern int stats_tree_tick_pivot(stats_tree* st, - int pivot_id, - const gchar* pivot_value) { + int pivot_id, + const gchar* pivot_value) { stat_node* parent = g_ptr_array_index(st->parents,pivot_id); parent->counter++; - stats_tree_manip_node( MN_INCREASE, st, pivot_value, pivot_id, FALSE, 1); + stats_tree_manip_node( MN_INCREASE, st, (guint8*)pivot_value, pivot_id, FALSE, 1); return pivot_id; } diff --git a/epan/tvbparse.c b/epan/tvbparse.c index 7b0114ddba..f37f103cc6 100644 --- a/epan/tvbparse.c +++ b/epan/tvbparse.c @@ -512,7 +512,7 @@ static int cond_hash(tvbparse_t* tt, int offset, const tvbparse_wanted_t* wanted if (key_len < 0) return -1; - key = tvb_get_ephemeral_string(key_elem->tvb,key_elem->offset,key_elem->len); + key = (gchar*)tvb_get_ephemeral_string(key_elem->tvb,key_elem->offset,key_elem->len); #ifdef TVBPARSE_DEBUG if (TVBPARSE_DEBUG & TVBPARSE_DEBUG_HASH) g_warning("cond_hash: got key='%s'",key); #endif diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index 24673037db..270705bdda 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -26,6 +26,10 @@ INCLUDES = -I$(top_srcdir) include Makefile.common +if HAVE_WARNINGS_AS_ERRORS +AM_CFLAGS = -Werror +endif + plugindir = @plugindir@ plugin_LTLIBRARIES = mate.la diff --git a/plugins/mate/mate_setup.c b/plugins/mate/mate_setup.c index 06c35d0ce1..8073e9b602 100644 --- a/plugins/mate/mate_setup.c +++ b/plugins/mate/mate_setup.c @@ -569,301 +569,6 @@ extern mate_config* mate_cfg() { return matecfg; } -static void append_avpl(GString* str, AVPL* avpl) { - void* cookie = NULL; - AVP* avp; - gchar** vec; - guint i; - - g_string_sprintfa(str,"( "); - - while(( avp = get_next_avp(avpl,&cookie) )) { - switch (avp->o) { - case '|' : - g_string_sprintfa(str," %s {",avp->n); - - vec = g_strsplit(avp->v,"|",0); - - for (i = 0; vec[i]; i++) { - g_string_sprintfa(str," \"%s\" |",vec[i]); - } - - g_strfreev(vec); - - g_string_erase(str,str->len-1,1); - g_string_sprintfa(str,"}, "); - break; - case '?': - g_string_sprintfa(str,"%s, ",avp->n); - break; - default: - g_string_sprintfa(str,"%s %c \"%s\", ",avp->n,avp->o,avp->v); - break; - } - } - - if (str->len > 2) g_string_erase(str,str->len-2,1); - g_string_sprintfa(str,")"); -} - -#if 0 /* XXX - Not used anywhere, for testing only? */ -static void print_transforms(gpointer k, gpointer v, gpointer p) { - AVPL_Transf* t; - GString* str = p; - - g_string_sprintfa(str,"Transform %s {\n",(gchar*)k); - - for (t = v; t; t = t->next) { - - if (t->match->len) { - g_string_sprintfa(str,"\tMatch "); - - switch (t->match_mode) { - case AVPL_STRICT: - g_string_sprintfa(str,"Strict "); - break; - case AVPL_LOOSE: - g_string_sprintfa(str,"Loose "); - break; - case AVPL_EVERY: - g_string_sprintfa(str,"Every "); - break; - default: - g_string_sprintfa(str,"None "); - break; - } - - append_avpl(str,t->match); - } - - if (t->replace->len) { - switch (t->replace_mode) { - case AVPL_INSERT: - g_string_sprintfa(str," Insert "); - break; - case AVPL_REPLACE: - g_string_sprintfa(str," Replace "); - break; - default: - g_string_sprintfa(str," None "); - break; - } - - append_avpl(str,t->replace); - } - - g_string_sprintfa(str,";\n"); - } - - g_string_sprintfa(str,"};\n\n"); -} -#endif /* 0 */ - -static void append_transforms(GString* s, GPtrArray* ts) { - guint i; - - if ( !ts || !ts->len ) return; - - g_string_sprintfa(s,"\tTransform "); - - for (i=0; i < ts->len; i++) { - g_string_sprintfa(s,"%s, ",((AVPL_Transf*) g_ptr_array_index(ts,i))->name); - } - - if (i>0) g_string_erase(s, s->len-2, 2); - g_string_sprintfa(s,";\n"); - -} - -static void print_hfid_hash(gpointer k, gpointer v, gpointer p _U_) { - g_string_sprintfa((GString*)p,"\tExtract %s From %s;\n",(guint8*)v,my_protoname(*(int*)k)); -} - -/* XXX - Not used anywhere, for testing only? */ -#if 0 -static void print_pdu_config(mate_cfg_pdu* cfg, GString* s) { - guint i; - int hfid; - const gchar* discard; - const gchar* stop; - - discard = cfg->discard ? "TRUE": "FALSE"; - stop = cfg->last_extracted ? "TRUE" : "FALSE"; - - g_string_sprintfa(s, "Pdu %s Proto %s Transport ", - cfg->name,my_protoname(cfg->hfid_proto)); - - for (i = 0; i < cfg->transport_ranges->len; i++) { - hfid = *((int*) g_ptr_array_index(cfg->transport_ranges,i)); - g_string_sprintfa(s,"%s/",my_protoname(hfid)); - } - - g_string_erase(s, s->len-1, 1); - g_string_sprintfa(s," {\n"); - - if (cfg->payload_ranges) { - g_string_sprintfa(s, "\tPayload "); - - for (i = 0; i < cfg->payload_ranges->len; i++) { - hfid = *((int*) g_ptr_array_index(cfg->payload_ranges,i)); - g_string_sprintfa(s,"%s/",my_protoname(hfid)); - } - - if (i > 0) g_string_erase(s, s->len-1, 1); - - g_string_sprintfa(s,";\n"); - - } - - g_hash_table_foreach(cfg->hfids_attr,print_hfid_hash,s); - - if (cfg->criterium) { - - g_string_sprintfa(s,"Criteria "); - - switch (cfg->criterium_accept_mode) { - case ACCEPT_MODE: - g_string_sprintfa(s,"Accept "); - break; - case REJECT_MODE: - g_string_sprintfa(s,"Reject "); - break; - } - - switch(cfg->criterium_match_mode) { - case AVPL_NO_MATCH: - g_string_sprintfa(s,"None "); - break; - case AVPL_STRICT: - g_string_sprintfa(s,"Strict "); - break; - case AVPL_LOOSE: - g_string_sprintfa(s,"Loose "); - break; - case AVPL_EVERY: - g_string_sprintfa(s,"Every "); - break; - } - - append_avpl(s, cfg->criterium); - } - - append_transforms(s,cfg->transforms); - - g_string_sprintfa(s,"};\n\n"); -} - -static void print_gop_config(gchar* name _U_,mate_cfg_gop* cfg, GString* s) { - - g_string_sprintfa(s, "Gop %s On %s Match ", - cfg->name,cfg->on_pdu); - - append_avpl(s, cfg->key); - - g_string_sprintfa(s," {\n"); - - if (cfg->start) { - g_string_sprintfa(s,"\tStart "); - append_avpl(s, cfg->start); - g_string_sprintfa(s,";\n"); - } - - if (cfg->stop) { - g_string_sprintfa(s,"\tStop "); - append_avpl(s, cfg->stop); - g_string_sprintfa(s,";\n"); - } - - if (cfg->extra) { - g_string_sprintfa(s,"\tExtra "); - append_avpl(s, cfg->extra); - g_string_sprintfa(s,";\n"); - } - - g_string_sprintfa(s,"\tDropUnassigned %s;\n",cfg->drop_unassigned ? "TRUE" : "FALSE"); - g_string_sprintfa(s,"\tShowTimes %s;\n",cfg->show_times ? "TRUE" : "FALSE"); - - switch (cfg->pdu_tree_mode) { - case GOP_NO_TREE: - g_string_sprintfa(s,"\tShowTree NoTree;\n"); - break; - case GOP_PDU_TREE: - g_string_sprintfa(s,"\tShowTree PduTree;\n"); - break; - case GOP_FRAME_TREE: - g_string_sprintfa(s,"\tShowTree FrameTree;\n"); - break; - case GOP_BASIC_PDU_TREE: - break; - } - - if (cfg->lifetime > 0) g_string_sprintfa(s,"\tLifetime %f;\n",cfg->lifetime); - if (cfg->idle_timeout > 0) g_string_sprintfa(s,"\tIdleTimeout %f;\n",cfg->idle_timeout); - if (cfg->expiration > 0) g_string_sprintfa(s,"\tExpiration %f;\n",cfg->expiration); - - append_transforms(s,cfg->transforms); - - g_string_sprintfa(s,"};\n\n"); -} - -static void print_gog_config(gchar* name _U_,mate_cfg_gog* cfg, GString* s) { - void* cookie = NULL; - AVPL* avpl; - - g_string_sprintfa(s, "Gog %s {\n",cfg->name); - - g_string_sprintfa(s,"\tShowTimes %s;\n",cfg->show_times ? "TRUE" : "FALSE"); - - while (( avpl = get_next_avpl(cfg->keys,&cookie) )) { - g_string_sprintfa(s,"\tMember %s ",avpl->name); - append_avpl(s, avpl); - g_string_sprintfa(s,";\n"); - } - - switch (cfg->gop_tree_mode) { - case GOP_NULL_TREE: - g_string_sprintfa(s,"\tGopTree NullTree;\n"); - break; - case GOP_BASIC_TREE: - break; - case GOP_FULL_TREE: - g_string_sprintfa(s,"\tGopTree FullTree;\n"); - break; - } - - if (cfg->expiration > 0) g_string_sprintfa(s,"\tExpiration %f;\n",cfg->expiration); - - append_transforms(s,cfg->transforms); - - if (cfg->extra && cfg->extra->len) { - g_string_sprintfa(s,"\tExtra "); - append_avpl(s, cfg->extra); - g_string_sprintfa(s,";\n"); - } - - - g_string_sprintfa(s,"};\n\n"); -} - -static void print_config(void) { - GString* config_text = g_string_new("\n"); - guint i; - - g_hash_table_foreach(matecfg->transfs,print_transforms,config_text); - - for (i=0; i < matecfg->pducfglist->len; i++) { - print_pdu_config((mate_cfg_pdu*) g_ptr_array_index(matecfg->pducfglist,i),config_text); - } - - g_hash_table_foreach(matecfg->gopcfgs,(GHFunc)print_gop_config,config_text); - g_hash_table_foreach(matecfg->gogcfgs,(GHFunc)print_gog_config,config_text); - - g_message("Current configuration:\n%s\nDone;\n",config_text->str); - - g_string_free(config_text,TRUE); -} -#endif /* 0 */ - extern mate_config* mate_make_config(const gchar* filename, int mate_hfid) { gint* ett; avp_init(); diff --git a/plugins/mate/mate_util.c b/plugins/mate/mate_util.c index c93512dd31..1c66cea3df 100644 --- a/plugins/mate/mate_util.c +++ b/plugins/mate/mate_util.c @@ -429,13 +429,6 @@ extern AVP* avp_copy(AVP* from) { return new; } - -static void rename_avp(AVP* avp, gchar* name) { - gchar* s = avp->n; - avp->n = scs_subscribe(avp_strings,name); - scs_unsubscribe(avp_strings,s); -} - /** * new_avpl: * @name: the name the avpl will have. @@ -1283,38 +1276,6 @@ extern AVPL* new_avpl_from_match(avpl_match_mode mode, const gchar* name,AVPL* s } /** - * new_avpl_transform: - * - * creates an empty avpl transformation - * - * Return value: a pointer to the newly created avpl transformation - **/ -static AVPL_Transf* new_avpl_transform(gchar* name, AVPL* mixed, avpl_match_mode match_mode, avpl_replace_mode replace_mode) { - AVPL_Transf* t = g_malloc(sizeof(AVPL_Transf)); - AVP* avp; - - t->name = g_strdup(name); - t->match = new_avpl("match"); - t->replace = new_avpl("replace"); - t->match_mode = match_mode; - t->replace_mode = replace_mode; - t->next = NULL; - t->map = NULL; - - while (( avp = extract_first_avp(mixed) )) { - if (*(avp->n) == '.') { - rename_avp(avp,((avp->n)+1)); - insert_avp(t->replace, avp); - } else { - insert_avp(t->match, avp); - } - } - - return t; -} - - -/** * delete_avpl_transform: * @it: a pointer to the avpl transformation object * diff --git a/tools/lemon/Makefile.am b/tools/lemon/Makefile.am index e9179ec19b..2bfe3cf0ac 100644 --- a/tools/lemon/Makefile.am +++ b/tools/lemon/Makefile.am @@ -25,6 +25,10 @@ # is an archive library, any executable linking against libwireshark will # also need to link against libftypes. +if HAVE_WARNINGS_AS_ERRORS +AM_CFLAGS = -Werror +endif + noinst_PROGRAMS = lemon CLEANFILES = \ |