X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/86c5ebc87b70528e01ba0477d021c2633d0a4c12..2d033e9c995d385fcd69cb604bf8814de4d1ccec:/sbr/m_getfld.c

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 4c775e4f..f17ad417 100644
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -432,7 +432,8 @@ read_more (m_getfld_state_t s) {
     ssize_t retain = s->edelimlen;
     size_t num_read;
 
-    if (retain < s->end - s->readpos) retain = s->end - s->readpos;
+    if (retain < s->end - s->readpos)
+        retain = s->end - s->readpos;
     assert (retain <= s->readpos - s->msg_buf);
 
     /* Move what we want to retain at end of the buffer to the beginning. */
@@ -547,7 +548,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
 		int next_char;
 		if (c == EOF  ||  (next_char = Peek (s)) == EOF) {
 		    *bufsz = *cp = *buf = 0;
-		    advise (NULL, "eof encountered in field \"%s\"", name);
+		    inform("eof encountered in field \"%s\"", name);
 		    leave_getfld (s);
 		    return s->state = FMTERR;
 		}
@@ -573,7 +574,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
 		if (*bufsz < n + 1) {
 		    /* No, it can't.  Oh well, guess we'll blow up. */
 		    *bufsz = *cp = *buf = 0;
-		    advise (NULL, "eol encountered in field \"%s\"", name);
+		    inform("eol encountered in field \"%s\"", name);
 		    s->state = FMTERR;
 		    break;
 		}
@@ -595,7 +596,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
                    it had read.  It's in c, use it. */
 		*cp++ = c;
 		*bufsz = *cp = *buf = 0;
-		advise (NULL, "field name \"%s\" exceeds %d bytes", name,
+		inform("field name \"%s\" exceeds %d bytes", name,
 			NAMESZ - 2);
 		s->state = LENERR;
 		break;
@@ -605,7 +606,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
 	    while (isspace ((unsigned char) *--cp) && cp >= name) continue;
 	    *++cp = 0;
 	    /* readpos points to the first character of the field body. */
-	    /* fall through */
+	    /* FALLTHRU */
 
 	case FLDPLUS: {
 	    /*
@@ -620,10 +621,12 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
 	    n = 0;
 	    for (finished = 0; ! finished; ) {
 		while (c != '\n'  &&  c != EOF  &&  n++ < max) {
-		    if ((c = Getc (s)) != EOF) { *cp++ = c; }
+		    if ((c = Getc (s)) != EOF)
+                        *cp++ = c;
 		}
 
-		if (c != EOF) c = Peek (s);
+		if (c != EOF)
+                    c = Peek (s);
 		if (max < n) {
 		    /* The dest buffer is full.  Need to back the read
 		       pointer up by one because when m_getfld() is