diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 04:54:30 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 04:54:30 +0000 |
| commit | a10b98284c44bcafc86ee440ce936cfe305fe01b (patch) | |
| tree | ff1ad5ac23bc527b2cccdff6e73ba401bd04d5f5 /epan/ex-opt.c | |
| parent | bab72ca73439280d7b83d40495d8a39d46267ddc (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48412
Diffstat (limited to 'epan/ex-opt.c')
| -rw-r--r-- | epan/ex-opt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/ex-opt.c b/epan/ex-opt.c index 6a1a85cd60..9922078432 100644 --- a/epan/ex-opt.c +++ b/epan/ex-opt.c @@ -42,7 +42,7 @@ gboolean ex_opt_add(const gchar* optarg) { splitted = g_strsplit(optarg,":",2); if (splitted[0] && splitted[1]) { - GPtrArray* this_opts = g_hash_table_lookup(ex_opts,splitted[0]); + GPtrArray* this_opts = (GPtrArray *)g_hash_table_lookup(ex_opts,splitted[0]); if (this_opts) { g_ptr_array_add(this_opts,splitted[1]); @@ -68,7 +68,7 @@ gint ex_opt_count(const gchar* key) { if (! ex_opts) return 0; - this_opts = g_hash_table_lookup(ex_opts,key); + this_opts = (GPtrArray *)g_hash_table_lookup(ex_opts,key); if (this_opts) { return this_opts->len; @@ -83,11 +83,11 @@ const gchar* ex_opt_get_nth(const gchar* key, guint index) { if (! ex_opts) return 0; - this_opts = g_hash_table_lookup(ex_opts,key); + this_opts = (GPtrArray *)g_hash_table_lookup(ex_opts,key); if (this_opts) { if (this_opts->len > index) { - return g_ptr_array_index(this_opts,index); + return (const gchar *)g_ptr_array_index(this_opts,index); } else { /* XXX: assert? */ return NULL; @@ -104,11 +104,11 @@ extern const gchar* ex_opt_get_next(const gchar* key) { if (! ex_opts) return 0; - this_opts = g_hash_table_lookup(ex_opts,key); + this_opts = (GPtrArray *)g_hash_table_lookup(ex_opts,key); if (this_opts) { if (this_opts->len) - return g_ptr_array_remove_index(this_opts,0); + return (const gchar *)g_ptr_array_remove_index(this_opts,0); else return NULL; } else { |