aboutsummaryrefslogtreecommitdiffstats
path: root/filters.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2010-03-27 18:27:17 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2010-03-27 18:27:17 +0000
commitf0eba96a43d48a9350c0db810c62802ff864802e (patch)
treeb4786852647242910c234fc5cd895b577681b568 /filters.c
parent39932d986851d061d6127c9f587e7b1c0c7b5b4e (diff)
Squelch some compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32313 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'filters.c')
-rw-r--r--filters.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/filters.c b/filters.c
index f73b7141f7..6ed7751dea 100644
--- a/filters.c
+++ b/filters.c
@@ -211,9 +211,9 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
/* Allocate the filter name buffer. */
filt_name_len = INIT_BUF_SIZE;
- filt_name = g_malloc(filt_name_len + 1);
+ filt_name = (char *)g_malloc(filt_name_len + 1);
filt_expr_len = INIT_BUF_SIZE;
- filt_expr = g_malloc(filt_expr_len + 1);
+ filt_expr = (char *)g_malloc(filt_expr_len + 1);
for (line = 1; ; line++) {
/* Lines in a filter file are of the form
@@ -257,7 +257,7 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
if (filt_name_index >= filt_name_len) {
/* Filter name buffer isn't long enough; double its length. */
filt_name_len *= 2;
- filt_name = g_realloc(filt_name, filt_name_len + 1);
+ filt_name = (char *)g_realloc(filt_name, filt_name_len + 1);
}
filt_name[filt_name_index] = '\0';
break;
@@ -272,7 +272,7 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
if (filt_name_index >= filt_name_len) {
/* Filter name buffer isn't long enough; double its length. */
filt_name_len *= 2;
- filt_name = g_realloc(filt_name, filt_name_len + 1);
+ filt_name = (char *)g_realloc(filt_name, filt_name_len + 1);
}
filt_name[filt_name_index] = c;
filt_name_index++;
@@ -324,7 +324,7 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
if (filt_expr_index >= filt_expr_len) {
/* Filter expressioin buffer isn't long enough; double its length. */
filt_expr_len *= 2;
- filt_expr = g_realloc(filt_expr, filt_expr_len + 1);
+ filt_expr = (char *)g_realloc(filt_expr, filt_expr_len + 1);
}
filt_expr[filt_expr_index] = c;
filt_expr_index++;
@@ -348,7 +348,7 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
if (filt_expr_index >= filt_expr_len) {
/* Filter expressioin buffer isn't long enough; double its length. */
filt_expr_len *= 2;
- filt_expr = g_realloc(filt_expr, filt_expr_len + 1);
+ filt_expr = (char *)g_realloc(filt_expr, filt_expr_len + 1);
}
filt_expr[filt_expr_index] = '\0';
@@ -592,7 +592,7 @@ void copy_filter_list(filter_list_type_t dest_type, filter_list_type_t src_type)
/* copy the list entries */
while(flp_src) {
- filt = (flp_src)->data;
+ filt = (filter_def *)(flp_src->data);
*flpp_dest = add_filter_entry(*flpp_dest, filt->name, filt->strval);
flp_src = g_list_next(flp_src);