diff options
author | Anders Broman <anders.broman@ericsson.com> | 2012-06-03 09:26:15 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2012-06-03 09:26:15 +0000 |
commit | 345b48d1ea8c1d0c1af955226086e377959f3d1f (patch) | |
tree | 9de27373bc19ec4b5e41cf03d042399e047d9dc9 /epan | |
parent | 7221f9e8704802a0f61a512a7a5fd9f1d927c704 (diff) |
Try to squelch warnings
svn path=/trunk/; revision=43019
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dfilter/dfilter-macro.c | 2 | ||||
-rw-r--r-- | epan/dfilter/dfilter.c | 10 | ||||
-rw-r--r-- | epan/dfilter/dfunctions.c | 2 | ||||
-rw-r--r-- | epan/dfilter/drange.c | 8 | ||||
-rw-r--r-- | epan/dfilter/gencode.c | 20 | ||||
-rw-r--r-- | epan/dfilter/semcheck.c | 50 | ||||
-rw-r--r-- | epan/dfilter/sttype-function.c | 12 | ||||
-rw-r--r-- | epan/dfilter/sttype-range.c | 8 |
8 files changed, 56 insertions, 56 deletions
diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c index 225409a655..a9a02f5462 100644 --- a/epan/dfilter/dfilter-macro.c +++ b/epan/dfilter/dfilter-macro.c @@ -510,7 +510,7 @@ static void macro_free(void* r) { static void* macro_copy(void* dest, const void* orig, size_t len _U_) { dfilter_macro_t* d = (dfilter_macro_t*)dest; - const dfilter_macro_t* m = (dfilter_macro_t*)orig; + const dfilter_macro_t* m = (const dfilter_macro_t*)orig; DUMP_MACRO(m); diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c index 132d74f1aa..38d54d5b74 100644 --- a/epan/dfilter/dfilter.c +++ b/epan/dfilter/dfilter.c @@ -129,7 +129,7 @@ free_insns(GPtrArray *insns) dfvm_insn_t *insn; for (i = 0; i < insns->len; i++) { - insn = g_ptr_array_index(insns, i); + insn = (dfvm_insn_t *)g_ptr_array_index(insns, i); dfvm_insn_free(insn); } g_ptr_array_free(insns, TRUE); @@ -161,7 +161,7 @@ dfilter_free(dfilter_t *df) if (df->deprecated) { for (i = 0; i < df->deprecated->len; ++i) { - gchar *depr = g_ptr_array_index(df->deprecated, i); + gchar *depr = (gchar *)g_ptr_array_index(df->deprecated, i); g_free(depr); } g_ptr_array_free(df->deprecated, TRUE); @@ -260,7 +260,7 @@ dfilter_compile(const gchar *text, dfilter_t **dfp) if (depr_test) { for (i = 0; i < deprecated->len; i++) { - if (g_ascii_strcasecmp(depr_test, g_ptr_array_index(deprecated, i)) == 0) { + if (g_ascii_strcasecmp(depr_test, (const gchar *)g_ptr_array_index(deprecated, i)) == 0) { /* It's already in our list */ depr_test = NULL; } @@ -313,7 +313,7 @@ dfilter_compile(const gchar *text, dfilter_t **dfp) if (dfw->st_root == NULL) { *dfp = NULL; for (i = 0; i < deprecated->len; ++i) { - gchar* depr = g_ptr_array_index(deprecated,i); + gchar* depr = (gchar*)g_ptr_array_index(deprecated,i); g_free(depr); } g_ptr_array_free(deprecated, TRUE); @@ -361,7 +361,7 @@ FAILURE: dfwork_free(dfw); } for (i = 0; i < deprecated->len; ++i) { - gchar* depr = g_ptr_array_index(deprecated,i); + gchar* depr = (gchar*)g_ptr_array_index(deprecated,i); g_free(depr); } g_ptr_array_free(deprecated, TRUE); diff --git a/epan/dfilter/dfunctions.c b/epan/dfilter/dfunctions.c index 37b101eb6d..16d6ec1a8c 100644 --- a/epan/dfilter/dfunctions.c +++ b/epan/dfilter/dfunctions.c @@ -66,7 +66,7 @@ string_walk(GList* arg1list, GList **retval, gchar(*conv_func)(gchar)) arg_fvalue = (fvalue_t *)arg1->data; switch (fvalue_ftype(arg_fvalue)->ftype) { case FT_STRING: - s = (char *)ep_strdup(fvalue_get(arg1->data)); + s = (char *)ep_strdup(fvalue_get((fvalue_t *)arg1->data)); for (c = s; *c; c++) { /**c = string_ascii_to_lower(*c);*/ *c = conv_func(*c); diff --git a/epan/dfilter/drange.c b/epan/dfilter/drange.c index 800386680f..531f4cb825 100644 --- a/epan/dfilter/drange.c +++ b/epan/dfilter/drange.c @@ -35,7 +35,7 @@ drange_node_new(void) { drange_node* new_range_node; - new_range_node = g_malloc(sizeof(drange_node)); + new_range_node = g_new(drange_node,1); new_range_node->start_offset = 0; new_range_node->length = 0; new_range_node->end_offset = 0; @@ -112,7 +112,7 @@ drange* drange_new(void) { drange* new_drange; - new_drange = g_malloc(sizeof(drange)); + new_drange = g_new(drange,1); new_drange->range_list = NULL; new_drange->has_total_length = TRUE; new_drange->total_length = 0; @@ -124,8 +124,8 @@ drange_new(void) static void drange_append_wrapper(gpointer data, gpointer user_data) { - drange_node *drnode = data; - drange *dr = user_data; + drange_node *drnode = (drange_node *)data; + drange *dr = (drange *)user_data; drange_append_drange_node(dr, drnode); } diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c index 0b6a5ad4cd..c5d658f097 100644 --- a/epan/dfilter/gencode.c +++ b/epan/dfilter/gencode.c @@ -182,7 +182,7 @@ dfw_append_function(dfwork_t *dfw, stnode_t *node, dfvm_value_t **p_jmp) /* Array to hold the instructions that need to jump to * an instruction if they fail. */ - jmps = g_malloc(num_params * sizeof(dfvm_value_t*)); + jmps = (dfvm_value_t **)g_malloc(num_params * sizeof(dfvm_value_t*)); /* Create the new DFVM instruction */ insn = dfvm_insn_new(CALL_FUNCTION); @@ -199,7 +199,7 @@ dfw_append_function(dfwork_t *dfw, stnode_t *node, dfvm_value_t **p_jmp) i = 0; while (params) { jmps[i] = NULL; - reg = gen_entity(dfw, params->data, &jmps[i]); + reg = gen_entity(dfw, (stnode_t *)params->data, &jmps[i]); val = dfvm_value_new(REGISTER); val->value.numeric = reg; @@ -293,7 +293,7 @@ gen_entity(dfwork_t *dfw, stnode_t *st_arg, dfvm_value_t **p_jmp) e_type = stnode_type_id(st_arg); if (e_type == STTYPE_FIELD) { - hfinfo = stnode_data(st_arg); + hfinfo = (header_field_info*)stnode_data(st_arg); reg = dfw_append_read_tree(dfw, hfinfo); insn = dfvm_insn_new(IF_FALSE_GOTO); @@ -303,7 +303,7 @@ gen_entity(dfwork_t *dfw, stnode_t *st_arg, dfvm_value_t **p_jmp) dfw_append_insn(dfw, insn); } else if (e_type == STTYPE_FVALUE) { - reg = dfw_append_put_fvalue(dfw, stnode_data(st_arg)); + reg = dfw_append_put_fvalue(dfw, (fvalue_t *)stnode_data(st_arg)); } else if (e_type == STTYPE_RANGE) { reg = dfw_append_mk_range(dfw, st_arg); @@ -338,7 +338,7 @@ gen_test(dfwork_t *dfw, stnode_t *st_node) case TEST_OP_EXISTS: val1 = dfvm_value_new(HFINFO); - hfinfo = stnode_data(st_arg1); + hfinfo = (header_field_info*)stnode_data(st_arg1); /* Rewind to find the first field of this name. */ while (hfinfo->same_name_prev) { @@ -462,13 +462,13 @@ dfw_gencode(dfwork_t *dfw) length = dfw->insns->len; for (id = 0, prev = NULL; id < length; prev = insn, id++) { - insn = g_ptr_array_index(dfw->insns, id); + insn = (dfvm_insn_t *)g_ptr_array_index(dfw->insns, id); arg1 = insn->arg1; if (insn->op == IF_TRUE_GOTO || insn->op == IF_FALSE_GOTO) { dfvm_opcode_t revert = (insn->op == IF_FALSE_GOTO)?IF_TRUE_GOTO:IF_FALSE_GOTO; id1 = arg1->value.numeric; do { - insn1 = g_ptr_array_index(dfw->insns, id1); + insn1 = (dfvm_insn_t*)g_ptr_array_index(dfw->insns, id1); if (insn1->op == revert) { /* this one is always false and the branch is not taken*/ id1 = id1 +1; @@ -507,14 +507,14 @@ dfw_gencode(dfwork_t *dfw) length = dfw->consts->len; for (id = 0; id < length; id++) { - insn = g_ptr_array_index(dfw->consts, id); + insn = (dfvm_insn_t *)g_ptr_array_index(dfw->consts, id); if (insn->arg2 && insn->arg2->type == REGISTER && (int)insn->arg2->value.numeric < 0 ) insn->arg2->value.numeric = dfw->first_constant - insn->arg2->value.numeric -1; } length = dfw->insns->len; for (id = 0; id < length; id++) { - insn = g_ptr_array_index(dfw->insns, id); + insn = (dfvm_insn_t *)g_ptr_array_index(dfw->insns, id); if (insn->arg1 && insn->arg1->type == REGISTER && (int)insn->arg1->value.numeric < 0 ) insn->arg1->value.numeric = dfw->first_constant - insn->arg1->value.numeric -1; @@ -542,7 +542,7 @@ static void get_hash_key(gpointer key, gpointer value _U_, gpointer user_data) { int field_id = GPOINTER_TO_INT(key); - hash_key_iterator *hki = user_data; + hash_key_iterator *hki = (hash_key_iterator *)user_data; hki->fields[hki->i] = field_id; hki->i++; diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c index 54349a4df0..f524ab3d90 100644 --- a/epan/dfilter/semcheck.c +++ b/epan/dfilter/semcheck.c @@ -198,7 +198,7 @@ mk_fvalue_from_val_string(header_field_info *hfinfo, char *s) /* TRUE/FALSE *always* exist for FT_BOOLEAN. */ if (hfinfo->type == FT_BOOLEAN) { if (hfinfo->strings) { - tf = hfinfo->strings; + tf = (true_false_string *)hfinfo->strings; } if (g_ascii_strcasecmp(s, tf->true_string) == 0) { @@ -242,7 +242,7 @@ mk_fvalue_from_val_string(header_field_info *hfinfo, char *s) hfinfo->abbrev); } else { - const value_string *vals = hfinfo->strings; + const value_string *vals = (const value_string *)hfinfo->strings; if (hfinfo->display & BASE_EXT_STRING) vals = VALUE_STRING_EXT_VS_P((const value_string_ext *) vals); @@ -370,8 +370,8 @@ struct check_drange_sanity_args { static void check_drange_node_sanity(gpointer data, gpointer user_data) { - drange_node* drnode = data; - struct check_drange_sanity_args *args = user_data; + drange_node* drnode = (drange_node*)data; + struct check_drange_sanity_args *args = (struct check_drange_sanity_args*)user_data; gint start_offset, end_offset, length; header_field_info *hfinfo; @@ -468,8 +468,8 @@ check_function(stnode_t *st_node) iparam = 0; while (params) { - params->data = check_param_entity(params->data); - funcdef->semcheck_param_function(iparam, params->data); + params->data = check_param_entity((stnode_t *)params->data); + funcdef->semcheck_param_function(iparam, (stnode_t *)params->data); params = params->next; iparam++; } @@ -493,7 +493,7 @@ check_relation_LHS_FIELD(const char *relation_string, FtypeCanFunc can_func, type2 = stnode_type_id(st_arg2); - hfinfo1 = stnode_data(st_arg1); + hfinfo1 = (header_field_info*)stnode_data(st_arg1); ftype1 = hfinfo1->type; DebugLog((" 5 check_relation_LHS_FIELD(%s)\n", relation_string)); @@ -506,7 +506,7 @@ check_relation_LHS_FIELD(const char *relation_string, FtypeCanFunc can_func, } if (type2 == STTYPE_FIELD) { - hfinfo2 = stnode_data(st_arg2); + hfinfo2 = (header_field_info*)stnode_data(st_arg2); ftype2 = hfinfo2->type; if (!compatible_ftypes(ftype1, ftype2)) { @@ -523,7 +523,7 @@ check_relation_LHS_FIELD(const char *relation_string, FtypeCanFunc can_func, } } else if (type2 == STTYPE_STRING) { - s = stnode_data(st_arg2); + s = (char *)stnode_data(st_arg2); if (strcmp(relation_string, "matches") == 0) { /* Convert to a FT_PCRE */ fvalue = fvalue_from_string(FT_PCRE, s, dfilter_fail); @@ -543,7 +543,7 @@ check_relation_LHS_FIELD(const char *relation_string, FtypeCanFunc can_func, stnode_free(st_arg2); } else if (type2 == STTYPE_UNPARSED) { - s = stnode_data(st_arg2); + s = (char *)stnode_data(st_arg2); if (strcmp(relation_string, "matches") == 0) { /* Convert to a FT_PCRE */ fvalue = fvalue_from_unparsed(FT_PCRE, s, FALSE, dfilter_fail); @@ -638,7 +638,7 @@ check_relation_LHS_STRING(const char* relation_string, DebugLog((" 5 check_relation_LHS_STRING()\n")); if (type2 == STTYPE_FIELD) { - hfinfo2 = stnode_data(st_arg2); + hfinfo2 = (header_field_info*)stnode_data(st_arg2); ftype2 = hfinfo2->type; if (!can_func(ftype2)) { @@ -648,7 +648,7 @@ check_relation_LHS_STRING(const char* relation_string, THROW(TypeError); } - s = stnode_data(st_arg1); + s = (char*)stnode_data(st_arg1); fvalue = fvalue_from_string(ftype2, s, dfilter_fail); if (!fvalue) { /* check value_string */ @@ -671,7 +671,7 @@ check_relation_LHS_STRING(const char* relation_string, } else if (type2 == STTYPE_RANGE) { check_drange_sanity(st_arg2); - s = stnode_data(st_arg1); + s = (char*)stnode_data(st_arg1); fvalue = fvalue_from_string(FT_BYTES, s, dfilter_fail); if (!fvalue) { THROW(TypeError); @@ -727,7 +727,7 @@ check_relation_LHS_UNPARSED(const char* relation_string, DebugLog((" 5 check_relation_LHS_UNPARSED()\n")); if (type2 == STTYPE_FIELD) { - hfinfo2 = stnode_data(st_arg2); + hfinfo2 = (header_field_info*)stnode_data(st_arg2); ftype2 = hfinfo2->type; if (!can_func(ftype2)) { @@ -737,7 +737,7 @@ check_relation_LHS_UNPARSED(const char* relation_string, THROW(TypeError); } - s = stnode_data(st_arg1); + s = (char*)stnode_data(st_arg1); fvalue = fvalue_from_unparsed(ftype2, s, allow_partial_value, dfilter_fail); if (!fvalue) { /* check value_string */ @@ -760,7 +760,7 @@ check_relation_LHS_UNPARSED(const char* relation_string, } else if (type2 == STTYPE_RANGE) { check_drange_sanity(st_arg2); - s = stnode_data(st_arg1); + s = (char*)stnode_data(st_arg1); fvalue = fvalue_from_unparsed(FT_BYTES, s, allow_partial_value, dfilter_fail); if (!fvalue) { THROW(TypeError); @@ -779,7 +779,7 @@ check_relation_LHS_UNPARSED(const char* relation_string, THROW(TypeError); } - s = stnode_data(st_arg1); + s = (char*)stnode_data(st_arg1); fvalue = fvalue_from_unparsed(ftype2, s, allow_partial_value, dfilter_fail); if (!fvalue) { @@ -829,7 +829,7 @@ check_relation_LHS_RANGE(const char *relation_string, FtypeCanFunc can_func _U_, if (type2 == STTYPE_FIELD) { DebugLog((" 5 check_relation_LHS_RANGE(type2 = STTYPE_FIELD)\n")); - hfinfo2 = stnode_data(st_arg2); + hfinfo2 = (header_field_info*)stnode_data(st_arg2); ftype2 = hfinfo2->type; if (!is_bytes_type(ftype2)) { @@ -854,7 +854,7 @@ check_relation_LHS_RANGE(const char *relation_string, FtypeCanFunc can_func _U_, } else if (type2 == STTYPE_STRING) { DebugLog((" 5 check_relation_LHS_RANGE(type2 = STTYPE_STRING)\n")); - s = stnode_data(st_arg2); + s = (char*)stnode_data(st_arg2); if (strcmp(relation_string, "matches") == 0) { /* Convert to a FT_PCRE */ fvalue = fvalue_from_string(FT_PCRE, s, dfilter_fail); @@ -871,7 +871,7 @@ check_relation_LHS_RANGE(const char *relation_string, FtypeCanFunc can_func _U_, } else if (type2 == STTYPE_UNPARSED) { DebugLog((" 5 check_relation_LHS_RANGE(type2 = STTYPE_UNPARSED)\n")); - s = stnode_data(st_arg2); + s = (char*)stnode_data(st_arg2); len_range = drange_get_total_length(sttype_range_drange(st_arg1)); if (strcmp(relation_string, "matches") == 0) { /* Convert to a FT_PCRE */ @@ -944,7 +944,7 @@ check_param_entity(stnode_t *st_node) e_type = stnode_type_id(st_node); /* If there's an unparsed string, change it to an FT_STRING */ if (e_type == STTYPE_UNPARSED) { - s = stnode_data(st_node); + s = (char*)stnode_data(st_node); fvalue = fvalue_from_unparsed(FT_STRING, s, FALSE, dfilter_fail); if (!fvalue) { THROW(TypeError); @@ -994,7 +994,7 @@ check_relation_LHS_FUNCTION(const char *relation_string, FtypeCanFunc can_func, } if (type2 == STTYPE_FIELD) { - hfinfo2 = stnode_data(st_arg2); + hfinfo2 = (header_field_info*)stnode_data(st_arg2); ftype2 = hfinfo2->type; if (!compatible_ftypes(ftype1, ftype2)) { @@ -1011,7 +1011,7 @@ check_relation_LHS_FUNCTION(const char *relation_string, FtypeCanFunc can_func, } } else if (type2 == STTYPE_STRING) { - s = stnode_data(st_arg2); + s = (char*)stnode_data(st_arg2); if (strcmp(relation_string, "matches") == 0) { /* Convert to a FT_PCRE */ fvalue = fvalue_from_string(FT_PCRE, s, dfilter_fail); @@ -1027,7 +1027,7 @@ check_relation_LHS_FUNCTION(const char *relation_string, FtypeCanFunc can_func, stnode_free(st_arg2); } else if (type2 == STTYPE_UNPARSED) { - s = stnode_data(st_arg2); + s = (char*)stnode_data(st_arg2); if (strcmp(relation_string, "matches") == 0) { /* Convert to a FT_PCRE */ fvalue = fvalue_from_unparsed(FT_PCRE, s, FALSE, dfilter_fail); @@ -1110,7 +1110,7 @@ header_field_info *hfinfo; */ if (stnode_type_id(st_arg2) == STTYPE_FIELD) { - hfinfo = stnode_data(st_arg2); + hfinfo = (header_field_info*)stnode_data(st_arg2); if (hfinfo->type == FT_PROTOCOL) dfilter_fail("Protocol (\"%s\") cannot appear on right-hand side of comparison.", hfinfo->abbrev); THROW(TypeError); diff --git a/epan/dfilter/sttype-function.c b/epan/dfilter/sttype-function.c index 0cbdb3fd70..94dd383912 100644 --- a/epan/dfilter/sttype-function.c +++ b/epan/dfilter/sttype-function.c @@ -45,7 +45,7 @@ function_new(gpointer funcdef) stfuncrec = g_new(function_t, 1); stfuncrec->magic = FUNCTION_MAGIC; - stfuncrec->funcdef = funcdef; + stfuncrec->funcdef = (df_func_def_t *)funcdef; stfuncrec->params = NULL; return (gpointer) stfuncrec; @@ -54,7 +54,7 @@ function_new(gpointer funcdef) static void slist_stnode_free(gpointer data, gpointer user_data _U_) { - stnode_free(data); + stnode_free((stnode_t *)data); } void @@ -67,7 +67,7 @@ st_funcparams_free(GSList *params) static void function_free(gpointer value) { - function_t *stfuncrec = value; + function_t *stfuncrec = (function_t*)value; assert_magic(stfuncrec, FUNCTION_MAGIC); st_funcparams_free(stfuncrec->params); g_free(stfuncrec); @@ -81,7 +81,7 @@ sttype_function_set_params(stnode_t *node, GSList *params) function_t *stfuncrec; - stfuncrec = stnode_data(node); + stfuncrec = (function_t*)stnode_data(node); assert_magic(stfuncrec, FUNCTION_MAGIC); stfuncrec->params = params; @@ -93,7 +93,7 @@ sttype_function_funcdef(stnode_t *node) { function_t *stfuncrec; - stfuncrec = stnode_data(node); + stfuncrec = (function_t*)stnode_data(node); assert_magic(stfuncrec, FUNCTION_MAGIC); return stfuncrec->funcdef; } @@ -104,7 +104,7 @@ sttype_function_params(stnode_t *node) { function_t *stfuncrec; - stfuncrec = stnode_data(node); + stfuncrec = (function_t*)stnode_data(node); assert_magic(stfuncrec, FUNCTION_MAGIC); return stfuncrec->params; } diff --git a/epan/dfilter/sttype-range.c b/epan/dfilter/sttype-range.c index 775ec51412..98d1930cb9 100644 --- a/epan/dfilter/sttype-range.c +++ b/epan/dfilter/sttype-range.c @@ -62,7 +62,7 @@ range_new(gpointer junk) static void range_free(gpointer value) { - range_t *range = value; + range_t *range = (range_t*)value; assert_magic(range, RANGE_MAGIC); if (range->drange) @@ -76,7 +76,7 @@ sttype_range_remove_drange(stnode_t *node) { range_t *range; - range = stnode_data(node); + range = (range_t*)stnode_data(node); assert_magic(range, RANGE_MAGIC); range->drange = NULL; @@ -89,10 +89,10 @@ sttype_range_set(stnode_t *node, stnode_t *field, GSList* drange_list) { range_t *range; - range = stnode_data(node); + range = (range_t*)stnode_data(node); assert_magic(range, RANGE_MAGIC); - range->hfinfo = stnode_data(field); + range->hfinfo = (header_field_info *)stnode_data(field); stnode_free(field); range->drange = drange_new_from_list(drange_list); |