tap-sctp: remove guint32 unneeded allocations.
authorDario Lombardo <lomato@gmail.com>
Sat, 17 Mar 2018 18:04:05 +0000 (19:04 +0100)
committerAnders Broman <a.broman58@gmail.com>
Sat, 17 Mar 2018 21:23:35 +0000 (21:23 +0000)
They've been replaced by direct cast.

Change-Id: I99fbc0463af724dc2592fbfe24a63c645902c703
Reviewed-on: https://code.wireshark.org/review/26522
Reviewed-by: Anders Broman <a.broman58@gmail.com>
ui/tap-sctp-analysis.c

index 681e3177574dcba0e64d32a9b419adb4d4956bac..c4b22da0520052f9250139b70f8f87b616f4ba05 100644 (file)
@@ -93,7 +93,6 @@ reset(void *arg)
 
         if (info->frame_numbers != NULL)
         {
-            g_list_foreach(info->frame_numbers, free_first, NULL);
             g_list_free(info->frame_numbers);
             info->frame_numbers = NULL;
         }
@@ -666,7 +665,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi
             }
             if (info->verification_tag1 != 0 || info->verification_tag2 != 0)
             {
-                guint32 *number;
+                guint32 number;
                 store = (address *)g_malloc(sizeof (address));
                 copy_address(store, &tmp_info.src);
                 info  = add_address(store, info, info->direction);
@@ -676,9 +675,8 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi
                     info = add_address(store, info, 2);
                 else
                     info = add_address(store, info, 1);
-                number = (guint32 *)g_malloc(sizeof(guint32));
-                *number = pinfo->num;
-                info->frame_numbers=g_list_prepend(info->frame_numbers,number);
+                number = pinfo->num;
+                info->frame_numbers=g_list_prepend(info->frame_numbers, GUINT_TO_POINTER(number));
                 if (datachunk || forwardchunk)
                     info->tsn1 = g_list_prepend(info->tsn1, tsn);
                 if (sackchunk == TRUE)
@@ -716,7 +714,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi
     } /* endif (!info) */
     else
     {
-        guint32 *number;
+        guint32 number;
         info->direction = sctp_info->direction;
 
         if (info->verification_tag1 == 0 && info->verification_tag2 != sctp_info->verification_tag) {
@@ -767,9 +765,8 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi
             }
             sack->frame_number = tsn->frame_number = pinfo->num;
         }
-        number = (guint32 *)g_malloc(sizeof(guint32));
-        *number = pinfo->num;
-        info->frame_numbers=g_list_prepend(info->frame_numbers,number);
+        number = pinfo->num;
+        info->frame_numbers=g_list_prepend(info->frame_numbers, GUINT_TO_POINTER(number));
 
         store = (address *)g_malloc(sizeof (address));
         copy_address(store, &tmp_info.src);