diff options
author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-06-25 22:21:58 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-06-25 22:21:58 +0000 |
commit | 9e1359e2fab24df5d56c3e85dfe5ba926faf2eef (patch) | |
tree | 3ccaa6090eed579517072a1dc6fcbea16450721c /wsutil | |
parent | efbde1c75a5ac52cf228a35d2f91ff61f35659a0 (diff) |
Revert 43481: linking dftest against libui was not the problem.
svn path=/trunk/; revision=43488
Diffstat (limited to 'wsutil')
-rw-r--r-- | wsutil/libwsutil.def | 1 | ||||
-rw-r--r-- | wsutil/str_util.c | 42 |
2 files changed, 0 insertions, 43 deletions
diff --git a/wsutil/libwsutil.def b/wsutil/libwsutil.def index 952af80641..c943375d8e 100644 --- a/wsutil/libwsutil.def +++ b/wsutil/libwsutil.def @@ -91,7 +91,6 @@ 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 3bbe09a883..717fcb516d 100644 --- a/wsutil/str_util.c +++ b/wsutil/str_util.c @@ -27,7 +27,6 @@ #endif #include <glib.h> -#include <string.h> #include "str_util.h" #include <ctype.h> @@ -91,44 +90,3 @@ 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; -} - |