Rename splash_register_freq to info_update_freq. Use it to throttle name

[obnox/wireshark/wip.git] / util.c

diff --git a/util.c b/util.c
index c614e4b5e49d46f2a319e8cf89ef8788f225e737..a86b48afd34a7c09c9e971927294b062c37ab812 100644 (file)
--- a/util.c
+++ b/util.c
@@ -48,7 +48,7 @@
  * separated by spaces.
  */
 char *
-get_args_as_string(int argc, char **argv, int optind)
+get_args_as_string(int argc, char **argv, int optindex)
 {
        int len;
        int i;
@@ -58,8 +58,8 @@ get_args_as_string(int argc, char **argv, int optind)
         * Find out how long the string will be.
         */
        len = 0;
-       for (i = optind; i < argc; i++) {
-               len += strlen(argv[i]);
+       for (i = optindex; i < argc; i++) {
+               len += (int) strlen(argv[i]);
                len++;  /* space, or '\0' if this is the last argument */
        }
 
@@ -72,7 +72,7 @@ get_args_as_string(int argc, char **argv, int optind)
         * Now construct the string.
         */
        argstring[0] = '\0';
-       i = optind;
+       i = optindex;
        for (;;) {
                g_strlcat(argstring, argv[i], len);
                i++;
@@ -152,14 +152,14 @@ const gchar *get_conn_cfilter(void) {
        if ((env = getenv("SSH_CONNECTION")) != NULL) {
                tokens = g_strsplit(env, " ", 4);
                if (tokens[3]) {
-                       g_string_sprintf(filter_str, "not (tcp port %s and %s host %s "
+                       g_string_printf(filter_str, "not (tcp port %s and %s host %s "
                                                         "and tcp port %s and %s host %s)", tokens[1], host_ip_af(tokens[0]), tokens[0],
                                tokens[3], host_ip_af(tokens[2]), tokens[2]);
                        return filter_str->str;
                }
        } else if ((env = getenv("SSH_CLIENT")) != NULL) {
                tokens = g_strsplit(env, " ", 3);
-               g_string_sprintf(filter_str, "not (tcp port %s and %s host %s "
+               g_string_printf(filter_str, "not (tcp port %s and %s host %s "
                        "and tcp port %s)", tokens[1], host_ip_af(tokens[0]), tokens[0], tokens[2]);
                return filter_str->str;
        } else if ((env = getenv("REMOTEHOST")) != NULL) {
@@ -169,13 +169,13 @@ const gchar *get_conn_cfilter(void) {
                    strcmp(env, "") == 0) {
                        return "";
                }
-               g_string_sprintf(filter_str, "not %s host %s", host_ip_af(env), env);
+               g_string_printf(filter_str, "not %s host %s", host_ip_af(env), env);
                return filter_str->str;
        } else if ((env = getenv("DISPLAY")) != NULL) {
                /*
                 * This mirrors what _X11TransConnectDisplay() does.
                 * Note that, on some systems, the hostname can
-                * being with "/", which means that it's a pathname
+                * begin with "/", which means that it's a pathname
                 * of a UNIX domain socket to connect to.
                 *
                 * The comments mirror those in _X11TransConnectDisplay(),
@@ -298,7 +298,7 @@ const gchar *get_conn_cfilter(void) {
                        }
                }
 
-               g_string_sprintf(filter_str, "not %s host %s",
+               g_string_printf(filter_str, "not %s host %s",
                        host_ip_af(phostname), phostname);
                g_free(phostname);
                return filter_str->str;
@@ -314,7 +314,7 @@ const gchar *get_conn_cfilter(void) {
                 * http://www.microsoft.com/technet/archive/termsrv/maintain/featusability/tsrvapi.mspx?mfr=true
                 */
                if (g_ascii_strncasecmp(env, "rdp", 3) == 0) {
-                       g_string_sprintf(filter_str, "not tcp port 3389");
+                       g_string_printf(filter_str, "not tcp port 3389");
                        return filter_str->str;
                }
        }