aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2010-02-23 01:16:48 +0000
committerGuy Harris <guy@alum.mit.edu>2010-02-23 01:16:48 +0000
commitef418305f00a41e6497033666fed94c26a2678de (patch)
treedc2aa8958365c894350606182295079f2800850c /wiretap
parent32f439b8a58aadc4d13007f06c7b5a4c91f6fde7 (diff)
Attempt to squelch some compiler warnings.
svn path=/trunk/; revision=31953
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/airopeek9.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/airopeek9.c b/wiretap/airopeek9.c
index 61be3b84d8..a5cbf0544d 100644
--- a/wiretap/airopeek9.c
+++ b/wiretap/airopeek9.c
@@ -146,7 +146,7 @@ static int wtap_file_read_till_separator (wtap *wth, char *buffer, int buflen,
return -1; /* error */
}
}
- if (strchr (separators, c))
+ if (strchr (separators, c) != NULL)
{
*cp = '\0';
break;
@@ -310,7 +310,7 @@ int airopeek9_open(wtap *wth, int *err, gchar **err_info)
wth->subtype_close = airopeekv9_close;
wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
- wth->capture.airopeek9 = g_malloc(sizeof(airopeek9_t));
+ wth->capture.airopeek9 = (airopeek9_t)g_malloc(sizeof(airopeek9_t));
switch (mediaSubType) {
case AIROPEEK_V9_NST_ETHERNET: