diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-05 22:15:20 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-05 22:15:20 +0000 |
| commit | b204e38aef8bf9905e8d3d1e44361ae77a8f0c3f (patch) | |
| tree | b191b3f59b27d26b9f9fc82f64c8b4f8d756467c /mergecap.c | |
| parent | faa06129a916b6021faa22cc3eb0d6312e9e22a2 (diff) | |
Use explicit casts.
svn path=/trunk/; revision=48108
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c index d42b858cde..4bb8299bdc 100644 --- a/mergecap.c +++ b/mergecap.c @@ -159,7 +159,7 @@ list_capture_types(void) { struct string_elem *captypes; GSList *list = NULL; - captypes = g_malloc(sizeof(struct string_elem) * WTAP_NUM_FILE_TYPES); + captypes = g_new(struct string_elem,WTAP_NUM_FILE_TYPES); fprintf(stderr, "mergecap: The available capture file types for the \"-F\" flag are:\n"); for (i = 0; i < WTAP_NUM_FILE_TYPES; i++) { @@ -180,7 +180,7 @@ list_encap_types(void) { struct string_elem *encaps; GSList *list = NULL; - encaps = g_malloc(sizeof(struct string_elem) * WTAP_NUM_ENCAP_TYPES); + encaps = g_new(struct string_elem,WTAP_NUM_ENCAP_TYPES); fprintf(stderr, "mergecap: The available encapsulation types for the \"-T\" flag are:\n"); for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) { encaps[i].sstr = wtap_encap_short_string(i); |