aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2012-06-25 20:38:45 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2012-06-25 20:38:45 +0000
commit8eeebf73e0743192e9c395ea240f41dd08ab0670 (patch)
tree88804283396eea97527dc6e8a89129cbfe238403
parentaeceb172a4dce008b0eeae7ff93158b56be6efdf (diff)
Move get_args_as_string from ui/util.c into wsutil (maybe not to the best
module, but...). This makes dftest no longer dependent on libui, so stop linking against it. svn path=/trunk/; revision=43481
-rw-r--r--Makefile.am1
-rw-r--r--Makefile.nmake2
-rw-r--r--ui/util.c39
-rw-r--r--wsutil/libwsutil.def1
-rw-r--r--wsutil/str_util.c42
5 files changed, 44 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am
index d757c01289..cf0ee0080d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -441,7 +441,6 @@ randpkt_CFLAGS = $(AM_CLEAN_CFLAGS)
# Libraries and plugin flags with which to link dftest.
dftest_LDADD = \
- ui/libui.a \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
epan/libwireshark.la \
diff --git a/Makefile.nmake b/Makefile.nmake
index a6ecdf8897..b773832c0c 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -358,7 +358,7 @@ text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj wsuti
dftest.exe : $(dftest_OBJECTS) epan ui
@echo Linking $@
$(LINK) @<<
- /OUT:dftest.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dftest_LIBS) ui\libui.lib $(dftest_OBJECTS)
+ /OUT:dftest.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dftest_LIBS) $(dftest_OBJECTS)
<<
!IFDEF MANIFEST_INFO_REQUIRED
mt.exe -nologo -manifest "dftest.exe.manifest" -outputresource:dftest.exe;1
diff --git a/ui/util.c b/ui/util.c
index 63863f2097..e2887e1de4 100644
--- a/ui/util.c
+++ b/ui/util.c
@@ -47,45 +47,6 @@
#include "ui/util.h"
-/*
- * Collect command-line arguments as a string consisting of the arguments,
- * separated by spaces.
- */
-char *
-get_args_as_string(int argc, char **argv, int optindex)
-{
- int len;
- int i;
- char *argstring;
-
- /*
- * Find out how long the string will be.
- */
- len = 0;
- for (i = optindex; i < argc; i++) {
- len += (int) strlen(argv[i]);
- len++; /* space, or '\0' if this is the last argument */
- }
-
- /*
- * Allocate the buffer for the string.
- */
- argstring = (char *)g_malloc(len);
-
- /*
- * Now construct the string.
- */
- argstring[0] = '\0';
- i = optindex;
- for (;;) {
- g_strlcat(argstring, argv[i], len);
- i++;
- if (i == argc)
- break;
- g_strlcat(argstring, " ", len);
- }
- return argstring;
-}
/* Compute the difference between two seconds/microseconds time stamps. */
void
diff --git a/wsutil/libwsutil.def b/wsutil/libwsutil.def
index c943375d8e..952af80641 100644
--- a/wsutil/libwsutil.def
+++ b/wsutil/libwsutil.def
@@ -91,6 +91,7 @@ ascii_strdown_inplace
ascii_strup_inplace
isprint_string
isdigit_string
+get_args_as_string
; type_util.c
type_util_gdouble_to_guint64
diff --git a/wsutil/str_util.c b/wsutil/str_util.c
index 717fcb516d..3bbe09a883 100644
--- a/wsutil/str_util.c
+++ b/wsutil/str_util.c
@@ -27,6 +27,7 @@
#endif
#include <glib.h>
+#include <string.h>
#include "str_util.h"
#include <ctype.h>
@@ -90,3 +91,44 @@ isdigit_string(guchar *str)
/* The string contains only digits */
return TRUE;
}
+
+/*
+ * Collect command-line arguments as a string consisting of the arguments,
+ * separated by spaces.
+ */
+char *
+get_args_as_string(int argc, char **argv, int optindex)
+{
+ int len;
+ int i;
+ char *argstring;
+
+ /*
+ * Find out how long the string will be.
+ */
+ len = 0;
+ for (i = optindex; i < argc; i++) {
+ len += (int) strlen(argv[i]);
+ len++; /* space, or '\0' if this is the last argument */
+ }
+
+ /*
+ * Allocate the buffer for the string.
+ */
+ argstring = (char *)g_malloc(len);
+
+ /*
+ * Now construct the string.
+ */
+ argstring[0] = '\0';
+ i = optindex;
+ for (;;) {
+ g_strlcat(argstring, argv[i], len);
+ i++;
+ if (i == argc)
+ break;
+ g_strlcat(argstring, " ", len);
+ }
+ return argstring;
+}
+