From 448af057e4eb658120efc1ad61ac10074775a130 Mon Sep 17 00:00:00 2001 From: Ralph Corderoy Date: Sat, 11 Nov 2017 17:15:05 +0000 Subject: [PATCH] trimcpy.c: Move interface to own file. --- Makefile.am | 1 + h/prototypes.h | 3 --- sbr/oauth.c | 1 + sbr/readconfig.c | 1 + sbr/seq_read.c | 1 + sbr/trimcpy.c | 1 + sbr/trimcpy.h | 11 +++++++++++ uip/anno.c | 1 + uip/mhbuildsbr.c | 1 + uip/mhcachesbr.c | 1 + uip/mhfixmsg.c | 1 + uip/mhlistsbr.c | 1 + uip/mhlsbr.c | 1 + uip/mhoutsbr.c | 1 + uip/mhshowsbr.c | 1 + uip/new.c | 1 + uip/sendsbr.c | 1 + uip/slocal.c | 1 + 18 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 sbr/trimcpy.h diff --git a/Makefile.am b/Makefile.am index 91fe095a..cdad315b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -416,6 +416,7 @@ noinst_HEADERS = \ sbr/seq_nameok.h \ sbr/seq_print.h \ sbr/terminal.h \ + sbr/trimcpy.h \ sbr/unquote.h \ sbr/uprf.h \ sbr/vector.h \ diff --git a/h/prototypes.h b/h/prototypes.h index 08c88a5b..cebd1b6a 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -21,8 +21,6 @@ char *concat (const char *, ...) ENDNULL; char **copyip (char **, char **, int); void cpydata (int, int, const char *, const char *); void cpydgst (int, int, char *, char *); -char *cpytrim (const char *); -char *rtrim (char *); int decode_rfc2047 (char *, char *, size_t); void discard (FILE *); @@ -188,7 +186,6 @@ int smatch(const char *, const struct swit *) PURE; char *snprintb (char *buffer, size_t size, unsigned flags, char *bitfield); int ssequal (const char *, const char *) PURE; int stringdex (char *, char *) PURE; -char *trimcpy (char *); /* * prototypes for some routines in uip diff --git a/sbr/oauth.c b/sbr/oauth.c index 8061c287..195b9b8f 100755 --- a/sbr/oauth.c +++ b/sbr/oauth.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "trimcpy.h" #include "getcpy.h" #include "error.h" diff --git a/sbr/readconfig.c b/sbr/readconfig.c index 2df4c8e1..0df1b573 100644 --- a/sbr/readconfig.c +++ b/sbr/readconfig.c @@ -7,6 +7,7 @@ */ #include "h/mh.h" +#include "trimcpy.h" #include "getcpy.h" #include "readconfig.h" #include "error.h" diff --git a/sbr/seq_read.c b/sbr/seq_read.c index 1670aacc..c0043350 100644 --- a/sbr/seq_read.c +++ b/sbr/seq_read.c @@ -7,6 +7,7 @@ */ #include "h/mh.h" +#include "trimcpy.h" #include "getcpy.h" #include "m_atoi.h" #include "brkstring.h" diff --git a/sbr/trimcpy.c b/sbr/trimcpy.c index 6ed00b99..09b6ec34 100644 --- a/sbr/trimcpy.c +++ b/sbr/trimcpy.c @@ -8,6 +8,7 @@ */ #include "h/mh.h" +#include "trimcpy.h" #include "h/utils.h" diff --git a/sbr/trimcpy.h b/sbr/trimcpy.h new file mode 100644 index 00000000..ae92368f --- /dev/null +++ b/sbr/trimcpy.h @@ -0,0 +1,11 @@ +/* trimcpy.h -- strip leading and trailing whitespace, + * -- replace internal whitespace with spaces, + * -- then return a copy. + * + * This code is Copyright (c) 2017, by the authors of nmh. See the + * COPYRIGHT file in the root directory of the nmh distribution for + * complete copyright information. */ + +char *trimcpy(char *); +char *cpytrim(const char *); +char *rtrim(char *); diff --git a/uip/anno.c b/uip/anno.c index 59a5b99d..7ce3dbc3 100644 --- a/uip/anno.c +++ b/uip/anno.c @@ -42,6 +42,7 @@ */ #include "h/mh.h" +#include "sbr/trimcpy.h" #include "sbr/m_draft.h" #include "sbr/m_convert.h" #include "sbr/getfolder.h" diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index 0a5ba670..f77eeb1e 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -14,6 +14,7 @@ */ #include "h/mh.h" +#include "sbr/trimcpy.h" #include "sbr/uprf.h" #include "sbr/check_charset.h" #include "sbr/getcpy.h" diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c index 453c356f..9fedd161 100644 --- a/uip/mhcachesbr.c +++ b/uip/mhcachesbr.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/trimcpy.h" #include "sbr/error.h" #include #include "h/md5.h" diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c index 2193a709..f0956120 100644 --- a/uip/mhfixmsg.c +++ b/uip/mhfixmsg.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/trimcpy.h" #include "sbr/m_convert.h" #include "sbr/m_backup.h" #include "sbr/getfolder.h" diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c index 4b66a84b..e1c3beff 100644 --- a/uip/mhlistsbr.c +++ b/uip/mhlistsbr.c @@ -7,6 +7,7 @@ */ #include "h/mh.h" +#include "sbr/trimcpy.h" #include #include "h/mts.h" #include "h/tws.h" diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 56875e31..013b27a0 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/trimcpy.h" #include "sbr/vfgets.h" #include "sbr/check_charset.h" #include "sbr/getcpy.h" diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c index 0f2b9eb3..a69dadee 100644 --- a/uip/mhoutsbr.c +++ b/uip/mhoutsbr.c @@ -7,6 +7,7 @@ */ #include "h/mh.h" +#include "sbr/trimcpy.h" #include "sbr/error.h" #include #include "h/utils.h" diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 59f6f437..2bac9d00 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/trimcpy.h" #include "sbr/check_charset.h" #include "sbr/getcpy.h" #include "sbr/context_find.h" diff --git a/uip/new.c b/uip/new.c index 4fdbeeaa..18e60ff6 100644 --- a/uip/new.c +++ b/uip/new.c @@ -12,6 +12,7 @@ #include #include "h/mh.h" +#include "sbr/trimcpy.h" #include "sbr/vfgets.h" #include "sbr/getcpy.h" #include "sbr/m_atoi.h" diff --git a/uip/sendsbr.c b/uip/sendsbr.c index fa70c34a..0e773e7a 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/trimcpy.h" #include "sbr/uprf.h" #include "sbr/getcpy.h" #include "sbr/m_convert.h" diff --git a/uip/slocal.c b/uip/slocal.c index 6cace00f..52fae743 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -20,6 +20,7 @@ */ #include "h/mh.h" +#include "sbr/trimcpy.h" #include "sbr/getcpy.h" #include "sbr/ambigsw.h" #include "sbr/pidstatus.h" -- 2.56.0