Try to squelch warnings
authorAnders Broman <anders.broman@ericsson.com>
Sat, 2 Jun 2012 15:52:42 +0000 (15:52 -0000)
committerAnders Broman <anders.broman@ericsson.com>
Sat, 2 Jun 2012 15:52:42 +0000 (15:52 -0000)
svn path=/trunk/; revision=43002

epan/dfilter/dfilter-macro.c
epan/dfilter/dfunctions.c
epan/dfilter/dfvm.c

index a0933fd6927bfdc2ad97fb06e6e9fb352392dfda..225409a655c57f761d2703c054f04aca739b3582 100644 (file)
@@ -60,7 +60,7 @@ void dump_dfilter_macro_t(const dfilter_macro_t *m, const char *function, const
 #endif
 
 static gboolean free_value(gpointer k _U_, gpointer v, gpointer u _U_) {
-       fvt_cache_entry_t* e = v;
+       fvt_cache_entry_t* e = (fvt_cache_entry_t*)v;
        g_free(e->repr);
        g_free(e);
        return TRUE;
@@ -72,7 +72,7 @@ static gboolean fvt_cache_cb(proto_node * node, gpointer data _U_) {
 
        if (!finfo) return FALSE;
 
-       if ((e = g_hash_table_lookup(fvt_cache,finfo->hfinfo->abbrev))) {
+       if ((e = (fvt_cache_entry_t*)g_hash_table_lookup(fvt_cache,finfo->hfinfo->abbrev))) {
                e->usable = FALSE;
        } else if (finfo->value.ftype->val_to_string_repr) {
                switch (finfo->hfinfo->type) {
@@ -82,7 +82,7 @@ static gboolean fvt_cache_cb(proto_node * node, gpointer data _U_) {
                        default:
                                break;
                }
-               e = g_malloc(sizeof(fvt_cache_entry_t));
+               e = g_new(fvt_cache_entry_t,1);
                e->name = finfo->hfinfo->abbrev,
                e->repr = fvalue_to_string_repr(&(finfo->value), FTREPR_DFILTER, NULL);
                e->usable = TRUE;
@@ -93,7 +93,7 @@ static gboolean fvt_cache_cb(proto_node * node, gpointer data _U_) {
 
 void dfilter_macro_build_ftv_cache(void* tree_root) {
        g_hash_table_foreach_remove(fvt_cache,free_value,NULL);
-       proto_tree_traverse_post_order(tree_root, fvt_cache_cb, NULL);
+       proto_tree_traverse_post_order((proto_tree *)tree_root, fvt_cache_cb, NULL);
 }
 
 void dfilter_macro_foreach(dfilter_macro_cb_t cb, void* data) {
@@ -106,7 +106,7 @@ void dfilter_macro_foreach(dfilter_macro_cb_t cb, void* data) {
 }
 
 static void macro_fprint(dfilter_macro_t* m, void* ud) {
-       FILE* f = ud;
+       FILE* f = (FILE*)ud;
 
        fprintf(f,"%s\t%s\n",m->name,m->text);
 }
@@ -171,7 +171,7 @@ static gchar* dfilter_macro_resolve(gchar* name, gchar** args, const gchar** err
 
        if (!m) {
                if (fvt_cache &&
-                   (e = g_hash_table_lookup(fvt_cache,name)) != NULL) {
+                   (e = (fvt_cache_entry_t  *)g_hash_table_lookup(fvt_cache,name)) != NULL) {
                        if(e->usable) {
                                return e->repr;
                        } else {
@@ -394,7 +394,7 @@ gchar* dfilter_macro_apply(const gchar* text, const gchar** error) {
 }
 
 static void macro_update(void* mp, const gchar** error) {
-       dfilter_macro_t* m = mp;
+       dfilter_macro_t* m = (dfilter_macro_t*)mp;
        GPtrArray* parts;
        GArray* args_pos;
        const gchar* r;
@@ -497,7 +497,7 @@ done:
 }
 
 static void macro_free(void* r) {
-       dfilter_macro_t* m = r;
+       dfilter_macro_t* m = (dfilter_macro_t*)r;
 
        DUMP_MACRO(r);
 
@@ -509,8 +509,8 @@ static void macro_free(void* r) {
 }
 
 static void* macro_copy(void* dest, const void* orig, size_t len _U_) {
-       dfilter_macro_t* d = dest;
-       const dfilter_macro_t* m = orig;
+       dfilter_macro_t* d = (dfilter_macro_t*)dest;
+       const dfilter_macro_t* m = (dfilter_macro_t*)orig;
 
        DUMP_MACRO(m);
 
@@ -536,8 +536,8 @@ static void* macro_copy(void* dest, const void* orig, size_t len _U_) {
                d->priv = g_strdup(m->text);
                {
                        const gchar* oldText = m->text;
-                       const gchar* oldPriv = m->priv;
-                       gchar* newPriv = d->priv;
+                       const gchar* oldPriv = (const gchar*)m->priv;
+                       gchar* newPriv = (gchar*)d->priv;
                        while(oldText && *oldText) {
                                *(newPriv++) = *(oldPriv++);
                                oldText++;
@@ -558,13 +558,13 @@ static void* macro_copy(void* dest, const void* orig, size_t len _U_) {
                  */
 
                do nparts++; while (m->parts[nparts]);
-               d->parts = g_memdup(m->parts,(nparts+1)*(guint)sizeof(void*));
+               d->parts = (gchar **)g_memdup(m->parts,(nparts+1)*(guint)sizeof(void*));
                nparts = 0;
                while(m->parts[nparts]) {
                        if(nparts) {
                                d->parts[nparts] = d->parts[nparts - 1] + (m->parts[nparts] - m->parts[nparts - 1]);
                        } else {
-                               d->parts[nparts] = d->priv;
+                               d->parts[nparts] = (gchar *)d->priv;
                        }
                        nparts++;
                }
@@ -573,7 +573,7 @@ static void* macro_copy(void* dest, const void* orig, size_t len _U_) {
                 * Clone the contents of m->args_pos into d->args_pos.
                 */
 
-               d->args_pos = g_memdup(m->args_pos,(--nparts)*(guint)sizeof(int));
+               d->args_pos = (int *)g_memdup(m->args_pos,(--nparts)*(guint)sizeof(int));
        }
 
        DUMP_MACRO(d);
index 5a44c9d1c800bf464e3a8ea7772f35c4acd48257..37b101eb6d99e44ea388710b4a2a1385063dcd30 100644 (file)
@@ -63,10 +63,10 @@ string_walk(GList* arg1list, GList **retval, gchar(*conv_func)(gchar))
 
     arg1 = arg1list;
     while (arg1) {
-        arg_fvalue = arg1->data; 
+        arg_fvalue = (fvalue_t *)arg1->data; 
         switch (fvalue_ftype(arg_fvalue)->ftype) {
             case FT_STRING:
-                s = ep_strdup(fvalue_get(arg1->data));
+                s = (char *)ep_strdup(fvalue_get(arg1->data));
                 for (c = s; *c; c++) {
                         /**c = string_ascii_to_lower(*c);*/
                         *c = conv_func(*c);
@@ -116,7 +116,7 @@ ul_semcheck_params(int param_num, stnode_t *st_node)
     if (param_num == 0) {
         switch(type) {
             case STTYPE_FIELD:
-                hfinfo = stnode_data(st_node);
+                hfinfo = (header_field_info *)stnode_data(st_node);
                 ftype = hfinfo->type;
                 if (ftype != FT_STRING && ftype != FT_STRINGZ
                         && ftype != FT_UINT_STRING) {
index eaa08bc5b13a9664f98a3ac18aee2746533265ed..893b3cf62d96825291bf8787baff53e88b8ced8c 100644 (file)
@@ -105,7 +105,7 @@ dfvm_dump(FILE *f, dfilter_t *df)
        length = df->consts->len;
        for (id = 0; id < length; id++) {
 
-               insn = g_ptr_array_index(df->consts, id);
+               insn = (dfvm_insn_t     *)g_ptr_array_index(df->consts, id);
                arg1 = insn->arg1;
                arg2 = insn->arg2;
 
@@ -147,7 +147,7 @@ dfvm_dump(FILE *f, dfilter_t *df)
        length = df->insns->len;
        for (id = 0; id < length; id++) {
 
-               insn = g_ptr_array_index(df->insns, id);
+               insn = (dfvm_insn_t     *)g_ptr_array_index(df->insns, id);
                arg1 = insn->arg1;
                arg2 = insn->arg2;
                arg3 = insn->arg3;
@@ -190,7 +190,7 @@ dfvm_dump(FILE *f, dfilter_t *df)
                                for (range_list = arg3->value.drange->range_list;
                                     range_list != NULL;
                                     range_list = range_list->next) {
-                                       range_item = range_list->data;
+                                       range_item = (drange_node *)range_list->data;
                                        switch (range_item->ending) {
 
                                        case DRANGE_NODE_END_T_UNINITIALIZED:
@@ -330,7 +330,7 @@ read_tree(dfilter_t *df, proto_tree *tree, header_field_info *hfinfo, int reg)
 
                len = finfos->len;
                for (i = 0; i < len; i++) {
-                       finfo = g_ptr_array_index(finfos, i);
+                       finfo = (field_info *)g_ptr_array_index(finfos, i);
                        fvalues = g_list_prepend(fvalues, &finfo->value);
                }
 
@@ -405,7 +405,7 @@ mk_range(dfilter_t *df, int from_reg, int to_reg, drange *d_range)
        from_list = df->registers[from_reg];
 
        while (from_list) {
-               old_fv = from_list->data;
+               old_fv = (fvalue_t*)from_list->data;
                new_fv = fvalue_slice(old_fv, d_range);
                /* Assert here because semcheck.c should have
                 * already caught the cases in which a slice
@@ -442,7 +442,7 @@ dfvm_apply(dfilter_t *df, proto_tree *tree)
        for (id = 0; id < length; id++) {
 
          AGAIN:
-               insn = g_ptr_array_index(df->insns, id);
+               insn = (dfvm_insn_t     *)g_ptr_array_index(df->insns, id);
                arg1 = insn->arg1;
                arg2 = insn->arg2;
 
@@ -585,7 +585,7 @@ dfvm_init_const(dfilter_t *df)
 
        for (id = 0; id < length; id++) {
 
-               insn = g_ptr_array_index(df->consts, id);
+               insn = (dfvm_insn_t     *)g_ptr_array_index(df->consts, id);
                arg1 = insn->arg1;
                arg2 = insn->arg2;