h/prototypes.h: Remove mhlsbr() prototype; no such function.

[nmh] / sbr / m_getfld.c

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 2b5855419f52c295655338cfb41c6a00e94c7eca..940b3efc1bf3499ff9903f1258e69fbc0ee288a3 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -5,9 +5,11 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/mts.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "m_getfld.h"
+#include "error.h"
+#include "h/mts.h"
+#include "h/utils.h"

 #include <inttypes.h>
 
 /*
 #include <inttypes.h>
 
 /*


@@ -331,7 +333,8 @@ m_getfld_state_t m_getfld_state_init(FILE *iob)
 
 /* scan() needs to force an initial state of FLD for each message. */
 void
 
 /* scan() needs to force an initial state of FLD for each message. */
 void

-m_getfld_state_reset (m_getfld_state_t *gstate) {
+m_getfld_state_reset (m_getfld_state_t *gstate)
+{

     if (*gstate) {
        (*gstate)->state = FLD;
     }
     if (*gstate) {
        (*gstate)->state = FLD;
     }


@@ -341,7 +344,8 @@ m_getfld_state_reset (m_getfld_state_t *gstate) {
    calls, m_getfld() must keep track of the file position.  The caller
    must use this function to inform m_getfld(). */
 void
    calls, m_getfld() must keep track of the file position.  The caller
    must use this function to inform m_getfld(). */
 void

-m_getfld_track_filepos (m_getfld_state_t *gstate, FILE *iob) {
+m_getfld_track_filepos (m_getfld_state_t *gstate, FILE *iob)
+{

     if (! *gstate) {
        *gstate = m_getfld_state_init(iob);
     }
     if (! *gstate) {
        *gstate = m_getfld_state_init(iob);
     }


@@ -350,7 +354,8 @@ m_getfld_track_filepos (m_getfld_state_t *gstate, FILE *iob) {
 }
 
 /* m_getfld_track_filepos() with the existing iob. */
 }
 
 /* m_getfld_track_filepos() with the existing iob. */

-void m_getfld_track_filepos2(m_getfld_state_t *gstate)
+void
+m_getfld_track_filepos2(m_getfld_state_t *gstate)

 {
     if (!*gstate)
        die("m_getfld_track_filepos2 without gstate");
 {
     if (!*gstate)
        die("m_getfld_track_filepos2 without gstate");


@@ -358,7 +363,9 @@ void m_getfld_track_filepos2(m_getfld_state_t *gstate)
     m_getfld_track_filepos(gstate, (*gstate)->iob);
 }
 
     m_getfld_track_filepos(gstate, (*gstate)->iob);
 }
 

-void m_getfld_state_destroy (m_getfld_state_t *gstate) {
+void
+m_getfld_state_destroy (m_getfld_state_t *gstate)
+{

     m_getfld_state_t s = *gstate;
 
     if (s) {
     m_getfld_state_t s = *gstate;
 
     if (s) {


@@ -401,7 +408,8 @@ void m_getfld_state_destroy (m_getfld_state_t *gstate) {
 
 
 static void
 
 
 static void

-enter_getfld (m_getfld_state_t *gstate, FILE *iob) {
+enter_getfld (m_getfld_state_t *gstate, FILE *iob)
+{

     m_getfld_state_t s;
     off_t pos;
     off_t pos_movement;
     m_getfld_state_t s;
     off_t pos;
     off_t pos_movement;


@@ -475,7 +483,8 @@ enter_getfld (m_getfld_state_t *gstate, FILE *iob) {
 }
 
 static void
 }
 
 static void

-leave_getfld (m_getfld_state_t s) {
+leave_getfld (m_getfld_state_t s)
+{

     s->total_bytes_read += s->bytes_read;
 
     if (s->track_filepos) {
     s->total_bytes_read += s->bytes_read;
 
     if (s->track_filepos) {


@@ -493,7 +502,8 @@ leave_getfld (m_getfld_state_t s) {
 }
 
 static size_t
 }
 
 static size_t

-read_more (m_getfld_state_t s) {
+read_more (m_getfld_state_t s)
+{

     /* Retain at least edelimlen characters that have already been read,
        if at least edelimlen have been read, so that we can back up to them
        in m_Eom(). */
     /* Retain at least edelimlen characters that have already been read,
        if at least edelimlen have been read, so that we can back up to them
        in m_Eom(). */


@@ -519,7 +529,8 @@ read_more (m_getfld_state_t s) {
 /* Return the next character consumed from the input, fetching more of
  * the input for the buffer if required, or EOF on end of file. */
 static int
 /* Return the next character consumed from the input, fetching more of
  * the input for the buffer if required, or EOF on end of file. */
 static int

-Getc (m_getfld_state_t s) {
+Getc (m_getfld_state_t s)
+{

     if ((s->end - s->readpos < 1 && read_more (s) == 0) ||
         s->readpos >= s->end)
         return EOF;
     if ((s->end - s->readpos < 1 && read_more (s) == 0) ||
         s->readpos >= s->end)
         return EOF;


@@ -842,7 +853,8 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
 
 
 /* m_getfld() with the existing iob. */
 
 
 /* m_getfld() with the existing iob. */

-int m_getfld2(m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz)
+int
+m_getfld2(m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz)

 {
     if (!*gstate)
        die("m_getfld2 without gstate");
 {
     if (!*gstate)
        die("m_getfld2 without gstate");


@@ -942,7 +954,8 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob)
 
 
 /* m_unknown() with the existing iob. */
 
 
 /* m_unknown() with the existing iob. */

-void m_unknown2(m_getfld_state_t *gstate)
+void
+m_unknown2(m_getfld_state_t *gstate)

 {
     if (!*gstate)
        die("m_unknown2 without gstate");
 {
     if (!*gstate)
        die("m_unknown2 without gstate");