From beroset:

remove C++ incompatibilities from frame_data_sequence.c

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=47999

1 files changed, 31 insertions, 31 deletions

diff --git a/frame_data_sequence.c b/frame_data_sequence.c
index a14f1ad0ac..a323832f84 100644
--- a/frame_data_sequence.c
+++ b/frame_data_sequence.c
@@ -66,7 +66,7 @@ new_frame_data_sequence(void)
 {
 	frame_data_sequence *fds;
 
-	fds = g_malloc(sizeof *fds);
+	fds = (frame_data_sequence *)g_malloc(sizeof *fds);
 	fds->count = 0;
 	fds->ptree_root = NULL;
 	return fds;
@@ -94,63 +94,63 @@ frame_data_sequence_add(frame_data_sequence *fds, frame_data *fdata)
   if (fds->count == 0) {
     /* The tree is empty; allocate the first leaf node, which will be
        the root node. */
-    leaf = g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
+    leaf = (frame_data *)g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
     node = &leaf[0];
     fds->ptree_root = leaf;
   } else if (fds->count < NODES_PER_LEVEL) {
     /* It's a 1-level tree, and is going to stay that way for now. */
-    leaf = fds->ptree_root;
+    leaf = (frame_data *)fds->ptree_root;
     node = &leaf[fds->count];
   } else if (fds->count == NODES_PER_LEVEL) {
     /* It's a 1-level tree that will turn into a 2-level tree. */
-    level1 = g_malloc0((sizeof *level1)*NODES_PER_LEVEL);
-    level1[0] = fds->ptree_root;
-    leaf = g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
+    level1 = (frame_data **)g_malloc0((sizeof *level1)*NODES_PER_LEVEL);
+    level1[0] = (frame_data *)fds->ptree_root;
+    leaf = (frame_data *)g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
     level1[1] = leaf;
     node = &leaf[0];
     fds->ptree_root = level1;
   } else if (fds->count < NODES_PER_LEVEL*NODES_PER_LEVEL) {
     /* It's a 2-level tree, and is going to stay that way for now. */
-    level1 = fds->ptree_root;
+    level1 = (frame_data **)fds->ptree_root;
     leaf = level1[fds->count >> LOG2_NODES_PER_LEVEL];
     if (leaf == NULL) {
-      leaf = g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
+      leaf = (frame_data *)g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
       level1[fds->count >> LOG2_NODES_PER_LEVEL] = leaf;
     }
     node = &leaf[LEAF_INDEX(fds->count)];
   } else if (fds->count == NODES_PER_LEVEL*NODES_PER_LEVEL) {
     /* It's a 2-level tree that will turn into a 3-level tree */
-    level2 = g_malloc0((sizeof *level2)*NODES_PER_LEVEL);
-    level2[0] = fds->ptree_root;
-    level1 = g_malloc0((sizeof *level1)*NODES_PER_LEVEL);
+    level2 = (frame_data ***)g_malloc0((sizeof *level2)*NODES_PER_LEVEL);
+    level2[0] = (frame_data **)fds->ptree_root;
+    level1 = (frame_data **)g_malloc0((sizeof *level1)*NODES_PER_LEVEL);
     level2[1] = level1;
-    leaf = g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
+    leaf = (frame_data *)g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
     level1[0] = leaf;
     node = &leaf[0];
     fds->ptree_root = level2;
   } else if (fds->count < NODES_PER_LEVEL*NODES_PER_LEVEL*NODES_PER_LEVEL) {
     /* It's a 3-level tree, and is going to stay that way for now. */
-    level2 = fds->ptree_root;
+    level2 = (frame_data ***)fds->ptree_root;
     level1 = level2[fds->count >> (LOG2_NODES_PER_LEVEL+LOG2_NODES_PER_LEVEL)];
     if (level1 == NULL) {
-      level1 = g_malloc0((sizeof *level1)*NODES_PER_LEVEL);
+      level1 = (frame_data **)g_malloc0((sizeof *level1)*NODES_PER_LEVEL);
       level2[fds->count >> (LOG2_NODES_PER_LEVEL+LOG2_NODES_PER_LEVEL)] = level1;
     }
     leaf = level1[LEVEL_1_INDEX(fds->count)];
     if (leaf == NULL) {
-      leaf = g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
+      leaf = (frame_data *)g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
       level1[LEVEL_1_INDEX(fds->count)] = leaf;
     }
     node = &leaf[LEAF_INDEX(fds->count)];
   } else if (fds->count == NODES_PER_LEVEL*NODES_PER_LEVEL*NODES_PER_LEVEL) {
     /* It's a 3-level tree that will turn into a 4-level tree */
-    level3 = g_malloc0((sizeof *level3)*NODES_PER_LEVEL);
-    level3[0] = fds->ptree_root;
-    level2 = g_malloc0((sizeof *level2)*NODES_PER_LEVEL);
+    level3 = (frame_data ****)g_malloc0((sizeof *level3)*NODES_PER_LEVEL);
+    level3[0] = (frame_data ***)fds->ptree_root;
+    level2 = (frame_data ***)g_malloc0((sizeof *level2)*NODES_PER_LEVEL);
     level3[1] = level2;
-    level1 = g_malloc0((sizeof *level1)*NODES_PER_LEVEL);
+    level1 = (frame_data **)g_malloc0((sizeof *level1)*NODES_PER_LEVEL);
     level2[0] = level1;
-    leaf = g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
+    leaf = (frame_data *)g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
     level1[0] = leaf;
     node = &leaf[0];
     fds->ptree_root = level3;
@@ -163,20 +163,20 @@ frame_data_sequence_add(frame_data_sequence *fds, frame_data *fdata)
        make the frame numbers 64-bit and just let users run
        themselves out of address space or swap space. :-) */
     /* It's a 4-level tree, and is going to stay that way forever. */
-    level3 = fds->ptree_root;
+    level3 = (frame_data ****)fds->ptree_root;
     level2 = level3[LEVEL_3_INDEX(fds->count)];
     if (level2 == NULL) {
-      level2 = g_malloc0((sizeof *level2)*NODES_PER_LEVEL);
+      level2 = (frame_data ***)g_malloc0((sizeof *level2)*NODES_PER_LEVEL);
       level3[LEVEL_3_INDEX(fds->count)] = level2;
     }
     level1 = level2[LEVEL_2_INDEX(fds->count)];
     if (level1 == NULL) {
-      level1 = g_malloc0((sizeof *level1)*NODES_PER_LEVEL);
+      level1 = (frame_data **)g_malloc0((sizeof *level1)*NODES_PER_LEVEL);
       level2[LEVEL_2_INDEX(fds->count)] = level1;
     }
     leaf = level1[LEVEL_1_INDEX(fds->count)];
     if (leaf == NULL) {
-      leaf = g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
+      leaf = (frame_data *)g_malloc((sizeof *leaf)*NODES_PER_LEVEL);
       level1[LEVEL_1_INDEX(fds->count)] = leaf;
     }
     node = &leaf[LEAF_INDEX(fds->count)];
@@ -211,18 +211,18 @@ frame_data_sequence_find(frame_data_sequence *fds, guint32 num)
 
   if (fds->count <= NODES_PER_LEVEL) {
     /* It's a 1-level tree. */
-    leaf = fds->ptree_root;
+    leaf = (frame_data *)fds->ptree_root;
     return &leaf[num];
   }
   if (fds->count <= NODES_PER_LEVEL*NODES_PER_LEVEL) {
     /* It's a 2-level tree. */
-    level1 = fds->ptree_root;
+    level1 = (frame_data **)fds->ptree_root;
     leaf = level1[num >> LOG2_NODES_PER_LEVEL];
     return &leaf[LEAF_INDEX(num)];
   }
   if (fds->count <= NODES_PER_LEVEL*NODES_PER_LEVEL*NODES_PER_LEVEL) {
     /* It's a 3-level tree. */
-    level2 = fds->ptree_root;
+    level2 = (frame_data ***)fds->ptree_root;
     level1 = level2[num >> (LOG2_NODES_PER_LEVEL+LOG2_NODES_PER_LEVEL)];
     leaf = level1[(num >> LOG2_NODES_PER_LEVEL) & (NODES_PER_LEVEL - 1)];
     return &leaf[LEAF_INDEX(num)];
@@ -231,7 +231,7 @@ frame_data_sequence_find(frame_data_sequence *fds, guint32 num)
      2^(LOG2_NODES_PER_LEVEL*4), and LOG2_NODES_PER_LEVEL is 10,
      so fds->count is always less < NODES_PER_LEVEL^4. */
   /* It's a 4-level tree, and is going to stay that way forever. */
-  level3 = fds->ptree_root;
+  level3 = (frame_data ****)fds->ptree_root;
   level2 = level3[num >> (LOG2_NODES_PER_LEVEL+LOG2_NODES_PER_LEVEL+LOG2_NODES_PER_LEVEL)];
   level1 = level2[(num >> (LOG2_NODES_PER_LEVEL+LOG2_NODES_PER_LEVEL)) & (NODES_PER_LEVEL - 1)];
   leaf = level1[(num >> LOG2_NODES_PER_LEVEL) & (NODES_PER_LEVEL - 1)];
@@ -256,7 +256,7 @@ free_frame_data_sequence(frame_data_sequence *fds)
     g_free(fds->ptree_root);
   } else if (fds->count <= NODES_PER_LEVEL*NODES_PER_LEVEL) {
     /* It's a 2-level tree. */
-    level1 = fds->ptree_root;
+    level1 = (frame_data **)fds->ptree_root;
     for (i = 0; i < NODES_PER_LEVEL && level1[i] != NULL; i++) {
       frame_data_cleanup(level1[i]);
       g_free(level1[i]);
@@ -264,7 +264,7 @@ free_frame_data_sequence(frame_data_sequence *fds)
     g_free(level1);
   } else if (fds->count <= NODES_PER_LEVEL*NODES_PER_LEVEL*NODES_PER_LEVEL) {
     /* It's a 3-level tree. */
-    level2 = fds->ptree_root;
+    level2 = (frame_data ***)fds->ptree_root;
     for (i = 0; i < NODES_PER_LEVEL && level2[i] != NULL; i++) {
       level1 = level2[i];
       for (j = 0; j < NODES_PER_LEVEL && level1[j] != NULL; j++) {
@@ -279,7 +279,7 @@ free_frame_data_sequence(frame_data_sequence *fds)
        2^(LOG2_NODES_PER_LEVEL*4), and LOG2_NODES_PER_LEVEL is 10,
        so fds->count is always less < NODES_PER_LEVEL^4. */
     /* It's a 4-level tree, and is going to stay that way forever. */
-    level3 = fds->ptree_root;
+    level3 = (frame_data ****)fds->ptree_root;
     for (i = 0; i < NODES_PER_LEVEL && level3[i] != NULL; i++) {
       level2 = level3[i];
       for (j = 0; j < NODES_PER_LEVEL && level2[j] != NULL; j++) {