snprintb.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 8b6064ec6d78b256b1e352fb39e063d9ae469ff8..7cebda70d8f9e58d5edb5cc72b1875a386680423 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -424,6 +424,7 @@ noinst_HEADERS = \
     sbr/seq_list.h \
     sbr/seq_nameok.h \
     sbr/seq_print.h \
+    sbr/snprintb.h \
     sbr/ssequal.h \
     sbr/strindex.h \
     sbr/terminal.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 529842c07cfa6996659299488c9d795f09650574..ee96d5bc7d396a5d04d1345793c7ded3e0c4acc3 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -112,40 +112,6 @@ void seq_setunseen (struct msgs *, int);
 int showfile (char **, char *);
 int smatch(const char *, const struct swit *) PURE;
 
-/*
- * Convert a set of bit flags to printable format.
- *
- * Arguments:
- *
- * buffer      - Buffer to output string to.
- * size                - Size of buffer in bytes.  Buffer is always NUL terminated.
- * flags       - Binary flags to output
- * bitfield    - Textual representation of bits to output.  This string
- *               is in the following format:
- *
- *     Option byte 0x01 STRING1 0x02 STRING2 ....
- *
- * The first byte is an option byte to snprintb().  Currently the only option
- * supported is 0x08, which indicates that the flags should be output in
- * octal format; if the option byte is any other value, the flags will be
- * output in hexadecimal.
- *
- * After the option bytes are series of text strings, prefixed by the number
- * of the bit they correspond to.  For example, the bitfield string:
- *
- *     "\020\01FLAG1\02FLAG2\03FLAG3\04FLAG4"
- *
- * will output the following string if "flags" is set to 0x09:
- *
- *     0x2<FLAG1,FLAG4>
- *
- * You don't have to use octal in the bitfield string, that's just the
- * convention currently used by the nmh code.  The order of flags in the
- * bitfield string is not significant, but again, general convention is
- * from least significant bit to most significant.
- */
-char *snprintb (char *buffer, size_t size, unsigned flags, char *bitfield);
-
 /*
  * prototypes for some routines in uip
  */

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 876ecc1236f636862e3b205c1ec66a9b859df047..9b2973a369fc8c77d4a9671213495096d91eb025 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "snprintb.h"
 #include "strindex.h"
 #include "uprf.h"
 #include "getcpy.h"

diff --git a/sbr/snprintb.c b/sbr/snprintb.c
index bf99c9ba596a62f9a3a543929697edd5e1587499..e221b4e5c2eec5426dd738add030cedd67511359 100644 (file)
--- a/sbr/snprintb.c
+++ b/sbr/snprintb.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "snprintb.h"
 
 
 char *

diff --git a/sbr/snprintb.h b/sbr/snprintb.h
new file mode 100644 (file)
index 0000000..db8f6fd
--- /dev/null
+++ b/sbr/snprintb.h
@@ -0,0 +1,39 @@
+/* snprintb.h -- snprintf a %b string
+ *
+ * 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. */
+
+/*
+ * Convert a set of bit flags to printable format.
+ *
+ * Arguments:
+ *
+ * buffer      - Buffer to output string to.
+ * size                - Size of buffer in bytes.  Buffer is always NUL terminated.
+ * flags       - Binary flags to output
+ * bitfield    - Textual representation of bits to output.  This string
+ *               is in the following format:
+ *
+ *     Option byte 0x01 STRING1 0x02 STRING2 ....
+ *
+ * The first byte is an option byte to snprintb().  Currently the only option
+ * supported is 0x08, which indicates that the flags should be output in
+ * octal format; if the option byte is any other value, the flags will be
+ * output in hexadecimal.
+ *
+ * After the option bytes are series of text strings, prefixed by the number
+ * of the bit they correspond to.  For example, the bitfield string:
+ *
+ *     "\020\01FLAG1\02FLAG2\03FLAG3\04FLAG4"
+ *
+ * will output the following string if "flags" is set to 0x09:
+ *
+ *     0x2<FLAG1,FLAG4>
+ *
+ * You don't have to use octal in the bitfield string, that's just the
+ * convention currently used by the nmh code.  The order of flags in the
+ * bitfield string is not significant, but again, general convention is
+ * from least significant bit to most significant.
+ */
+char *snprintb(char *, size_t, unsigned, char *);

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 8d5423faf8e7149ce35e3ace24d4c999ee360e11..39f4ecc42d3e1e20f7b9e82e06ff72102bc42d0f 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/snprintb.h"
 #include "sbr/getcpy.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"

diff --git a/uip/mark.c b/uip/mark.c
index d39ed19cc7e02d7f1904587062eac34ea875b022..0d4dd0c86e91a467685923f1f59d54dafd87f8f2 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/snprintb.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index cd25abe534bbaf44ec6ca3f44f129bcdad5851d6..9403945654d22307866e03303895494e56b22bd0 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/snprintb.h"
 #include "sbr/copyip.h"
 #include "sbr/discard.h"
 #include "sbr/trimcpy.h"