summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-01-29 12:54:25 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2022-08-20 12:58:05 -0700
commit8c0f5228e75aa949963aa8d27dcfa2648db2e197 (patch)
tree99889d7b1a6c9668681142b68b0ca6c0b1dfc58f
parent3309c75906a56de86607f59481304b3a2812162f (diff)
downloadxorg-lib-libxtrans-8c0f5228e75aa949963aa8d27dcfa2648db2e197.tar.gz
move is_numeric to Xtranssock.c and only define for TCPCONN or TRANS_REOPEN
Don't define this function unless it is actually going to be used. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--Xtransint.h5
-rw-r--r--Xtranssock.c14
-rw-r--r--Xtransutil.c14
3 files changed, 14 insertions, 19 deletions
diff --git a/Xtransint.h b/Xtransint.h
index fe1f117..44d8b6d 100644
--- a/Xtransint.h
+++ b/Xtransint.h
@@ -351,11 +351,6 @@ static int TRANS(WriteV)(
#endif /* WIN32 */
-
-static int is_numeric (
- const char * /* str */
-);
-
#ifdef TRANS_SERVER
static int trans_mkdir (
const char *, /* path */
diff --git a/Xtranssock.c b/Xtranssock.c
index 0177186..84159e8 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -196,6 +196,20 @@ static Sockettrans2dev Sockettrans2devtab[] = {
static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
#endif
+#if defined(TCPCONN) || defined(TRANS_REOPEN)
+static int
+is_numeric (const char *str)
+{
+ int i;
+
+ for (i = 0; i < (int) strlen (str); i++)
+ if (!isdigit (str[i]))
+ return (0);
+
+ return (1);
+}
+#endif
+
#ifdef UNIXCONN
diff --git a/Xtransutil.c b/Xtransutil.c
index 1bce2d2..884cfdf 100644
--- a/Xtransutil.c
+++ b/Xtransutil.c
@@ -425,20 +425,6 @@ TRANS(WSAStartup) (void)
}
#endif
-#include <ctype.h>
-
-static int
-is_numeric (const char *str)
-{
- int i;
-
- for (i = 0; i < (int) strlen (str); i++)
- if (!isdigit (str[i]))
- return (0);
-
- return (1);
-}
-
#ifdef TRANS_SERVER
#include <sys/types.h>
#include <sys/stat.h>