aboutsummaryrefslogtreecommitdiff
path: root/format.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-05-31 15:56:13 +0100
committerThomas Adam <thomas@xteddy.org>2017-05-31 15:56:13 +0100
commitf17ecaa49544509e93716a84b6510990ed90ceca (patch)
tree6b89857ce59fc9330c136961defdcc0923cbff40 /format.c
parent9c4d0d454aa81b9587ed724e0f87395b1791ce2f (diff)
parentd60663ea8664d1c71def883bd64d97af3f791f89 (diff)
downloadrtmux-f17ecaa49544509e93716a84b6510990ed90ceca.tar.gz
rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.tar.bz2
rtmux-f17ecaa49544509e93716a84b6510990ed90ceca.zip
Merge branch 'obsd-master'
Conflicts: Makefile.am cfg.c server-client.c
Diffstat (limited to 'format.c')
-rw-r--r--format.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/format.c b/format.c
index 84f2f9e9..0fbeb5f7 100644
--- a/format.c
+++ b/format.c
@@ -20,11 +20,9 @@
#include <sys/param.h>
#include <sys/wait.h>
-#include <ctype.h>
#include <errno.h>
#include <fnmatch.h>
#include <libgen.h>
-#include <netdb.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
@@ -857,7 +855,7 @@ format_choose(char *s, char **left, char **right)
}
/* Is this true? */
-static int
+int
format_true(const char *s)
{
if (s != NULL && *s != '\0' && (s[0] != '0' || s[1] != '\0'))