From 0ebc01dc03e38726e3d6fdffb30171eda3f8f80e Mon Sep 17 00:00:00 2001
From: Stephen Fisher <steve@stephen-fisher.com>
Date: Tue, 13 Feb 2007 20:57:22 +0000
Subject: From Sebastien Tandel:

Create two new files (ws_strsplit.[ch]) that use GTK2 code to override
the buggy g_strsplit() function when compiling for GTK1.  Include this
work-around function (ws_strsplit) in libwireshark.def.  Add notes on usage
to README.developer.  Include epan/ws_strsplit.h in all files that use
g_strsplit().


svn path=/trunk/; revision=20804
---
 epan/stats_tree.c | 71 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 33 insertions(+), 38 deletions(-)

(limited to 'epan/stats_tree.c')

diff --git a/epan/stats_tree.c b/epan/stats_tree.c
index dd4e8f0161..02ca8a90bd 100644
--- a/epan/stats_tree.c
+++ b/epan/stats_tree.c
@@ -29,6 +29,7 @@
 
 #include <glib.h>
 #include <epan/stats_tree_priv.h>
+#include <epan/ws_strsplit.h>
 #include <string.h>
 
 #include "stats_tree.h"
@@ -541,48 +542,42 @@ extern guint8* stats_tree_get_abbr(const guint8* optarg) {
  *
  */
 static range_pair_t* get_range(guint8* rngstr) {
-	gchar** split;
-	range_pair_t* rng;
-	
-	split = g_strsplit((gchar*)rngstr,"-",2);
+        gchar** split;
+        range_pair_t* rng;
 
-	/* empty string */
-	if (split[0] == NULL) {
-	  g_strfreev(split);
-	  return NULL;
-	}
+        split = g_strsplit((gchar*)rngstr,"-",2);
 
-#if GLIB_MAJOR_VERSION >= 2
-	/* means we have a non empty string 
-	 * which does not contain a delimiter */
-	if (split[1] == NULL) {
-	  g_strfreev(split);
-	  return NULL;
-	}
-#endif
+        /* empty string */
+        if (split[0] == NULL) {
+          g_strfreev(split);
+          return NULL;
+        }
 
-	rng = g_malloc(sizeof(range_pair_t));
+        /* means we have a non empty string 
+         * which does not contain a delimiter */
+        if (split[1] == NULL) {
+          g_strfreev(split);
+          return NULL;
+        }
 
-	/* string == "X-?" */
-	if (*(split[0]) != '\0') {
-	    rng->floor = strtol(split[0],NULL,10);
-	} else
-	  /* string == "-?" */
-	  rng->floor = G_MININT;
+        rng = g_malloc(sizeof(range_pair_t));
+
+        /* string == "X-?" */
+        if (*(split[0]) != '\0') {
+            rng->floor = strtol(split[0],NULL,10);
+        } else
+          /* string == "-?" */
+          rng->floor = G_MININT;
+
+        /* string != "?-" */
+        if (*(split[1]) != '\0') {
+          rng->ceil  = strtol(split[1],NULL,10);
+        } else
+          /* string == "?-" */
+          rng->ceil = G_MAXINT;
+
+        g_strfreev(split);
 
-	/* string != "?-" */
-#if GLIB_MAJOR_VERSION >= 2
-	if (*(split[1]) != '\0') {
-#else
-	if (split[1] != NULL) {
-#endif
-	  rng->ceil  = strtol(split[1],NULL,10);
-	} else
-	  /* string == "?-" */
-	  rng->ceil = G_MAXINT;
-	
-	g_strfreev(split);
-	
 	return rng;
 }
 
@@ -595,7 +590,7 @@ extern int stats_tree_create_range_node(stats_tree* st,
 	guint8* curr_range;
 	stat_node* rng_root = new_stat_node(st, name, parent_id, FALSE, TRUE);
 	stat_node* range_node = NULL;
-	
+
 	va_start( list, parent_id );
 	while (( curr_range = va_arg(list, guint8*) )) {
 		range_node = new_stat_node(st, curr_range, rng_root->id, FALSE, FALSE);
-- 
cgit v1.2.1