osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Chris Maynard 2011-04-07 13:41:25 +00:00
parent 9a66ea33c4
commit 908d7ba39f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tap-icmpstat.c
View File

@ -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)