diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-04-07 13:41:25 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-04-07 13:41:25 +0000 |
| commit | 908d7ba39fb6ccfc67d950e15cfd7102f1e9c482 (patch) | |
| tree | 9f3f3ec01897f41e5df8326525cc3f0aa24f8bc0 /tap-icmpstat.c | |
| parent | 9a66ea33c42566df22f163a9bd5e87370733015e (diff) | |
Until the minimum glib version requirement is changed from 2.4 to at least 2.8,
use g_try_malloc() instead of g_try_malloc0(). This should make the Solaris
buildbot happy again.
svn path=/trunk/; revision=36504
Diffstat (limited to 'tap-icmpstat.c')
| -rw-r--r-- | tap-icmpstat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tap-icmpstat.c b/tap-icmpstat.c index e525f01d52..c4f34746fa 100644 --- a/tap-icmpstat.c +++ b/tap-icmpstat.c @@ -272,12 +272,12 @@ icmpstat_init(const char *optarg, void* userdata _U_) if (strstr(optarg, "icmp,srt,")) filter = optarg + strlen("icmp,srt,"); - icmpstat = g_try_malloc0(sizeof(icmpstat_t)); + icmpstat = g_try_malloc(sizeof(icmpstat_t)); if (icmpstat == NULL) { - fprintf(stderr, "tshark: g_malloc() fatal error.\n"); + fprintf(stderr, "tshark: g_try_malloc() fatal error.\n"); exit(1); } - + memset(icmpstat, 0, sizeof(icmpstat_t)); icmpstat->min_msecs = 1.0 * G_MAXUINT; if (filter) |