m_name.c: Move interface to own file.

[nmh] / sbr / fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 2e547286fd81e3c1e3771a7806aa710a0167916c..c5dc4f753b3f78a409e3fc03c5c4655f3aede248 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -8,12 +8,17 @@
  * fmt_compile (found in fmt_compile.c).
  */
 
  * fmt_compile (found in fmt_compile.c).
  */
 

-#include <h/mh.h>
-#include <h/addrsbr.h>
-#include <h/fmt_scan.h>
-#include <h/tws.h>
-#include <h/fmt_compile.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "strindex.h"
+#include "fmt_rfc2047.h"
+#include "uprf.h"
+#include "context_find.h"
+#include "error.h"
+#include "h/addrsbr.h"
+#include "h/fmt_scan.h"
+#include "h/tws.h"
+#include "h/fmt_compile.h"
+#include "h/utils.h"

 #include "unquote.h"
 
 #ifdef HAVE_SYS_TIME_H
 #include "unquote.h"
 
 #ifdef HAVE_SYS_TIME_H


@@ -67,7 +72,8 @@ match (char *str, char *sub)
  * copy a number to the destination subject to a maximum width
  */
 void
  * copy a number to the destination subject to a maximum width
  */
 void

-cpnumber(charstring_t dest, int num, int wid, char fill, size_t max) {
+cpnumber(charstring_t dest, int num, int wid, char fill, size_t max)
+{

     /* Maybe we should handle left padding at some point? */
     if (wid == 0)
        return;
     /* Maybe we should handle left padding at some point? */
     if (wid == 0)
        return;


@@ -120,9 +126,10 @@ cpnumber(charstring_t dest, int num, int wid, char fill, size_t max) {
  * aligned no more than max characters are copied
  */
 void
  * aligned no more than max characters are copied
  */
 void

-cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
+cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max)
+{

     int remaining;     /* remaining output width available */
     int remaining;     /* remaining output width available */

-    int rjust;
+    bool rjust;

     struct charstring *trimmed;
     size_t end;        /* number of input bytes remaining in str */
 #ifdef MULTIBYTE_SUPPORT
     struct charstring *trimmed;
     size_t end;        /* number of input bytes remaining in str */
 #ifdef MULTIBYTE_SUPPORT


@@ -134,10 +141,10 @@ cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) {
     char *sp;          /* current position in source string */
 
     /* get alignment */
     char *sp;          /* current position in source string */
 
     /* get alignment */

-    rjust = 0;
+    rjust = false;

     if ((remaining = wid) < 0) {
        remaining = -remaining;
     if ((remaining = wid) < 0) {
        remaining = -remaining;

-       rjust++;
+       rjust = true;

     }
     if (remaining > (int) max) { remaining = max; }
 
     }
     if (remaining > (int) max) { remaining = max; }
 


@@ -396,7 +403,8 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
     char *sp;
     char *savestr, *str;
     char buffer[NMH_BUFSIZ], buffer2[NMH_BUFSIZ];
     char *sp;
     char *savestr, *str;
     char buffer[NMH_BUFSIZ], buffer2[NMH_BUFSIZ];

-    int i, c, rjust;
+    int i, c;
+    bool rjust;

     int value;
     time_t t;
     size_t max;
     int value;
     time_t t;
     size_t max;


@@ -464,11 +472,11 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
            break;
        case FT_LITF:
            sp = fmt->f_text;
            break;
        case FT_LITF:
            sp = fmt->f_text;

-           rjust = 0;
+           rjust = false;

            i = fmt->f_width;
            if (i < 0) {
                i = -i;
            i = fmt->f_width;
            if (i < 0) {
                i = -i;

-               rjust++;                /* XXX should do something with this */
+               rjust = true;           /* XXX should do something with this */

            }
            while ((c = *sp++) && --i >= 0 && charstring_chars (scanlp) < max) {
                charstring_push_back (scanlp, c);
            }
            while ((c = *sp++) && --i >= 0 && charstring_chars (scanlp) < max) {
                charstring_push_back (scanlp, c);


@@ -723,10 +731,10 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
                    str = buffer;
                    while (isspace((unsigned char) *str))
                            str++;
                    str = buffer;
                    while (isspace((unsigned char) *str))
                            str++;

-                   rjust = 0;
+                   rjust = false;

                    if ((i = fmt->f_width) < 0) {
                            i = -i;
                    if ((i = fmt->f_width) < 0) {
                            i = -i;

-                           rjust++;
+                           rjust = true;

                    }
 
                    if (!rjust && i > 0 && (int) strlen(str) > i)
                    }
 
                    if (!rjust && i > 0 && (int) strlen(str) > i)