m_getfld.c: Alter Peek() to match Getc()'s structure.

Their logic was equivalent, but written differently, which didn't help
the reader easily see they were the same apart from whether the returned
character was consumed.  Now they're visually similar too.

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 84636a6f56150a0b89c28e76f8c8f93f8a1063d3..6804e58e56be4bf84d8476e8e7db837e7867d074 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -520,10 +520,11 @@ Getc (m_getfld_state_t s) {
  * or EOF on end of file. */
 static int
 Peek (m_getfld_state_t s) {
  * or EOF on end of file. */
 static int
 Peek (m_getfld_state_t s) {

-    if (s->end - s->readpos < 1  &&  read_more (s) == 0) {
+    if ((s->end - s->readpos < 1 && read_more (s) == 0) ||
+        s->readpos >= s->end)

         return EOF;
         return EOF;

-    }
-    return s->readpos < s->end  ?  (unsigned char) *s->readpos  :  EOF;
+
+    return (unsigned char)*s->readpos;

 }
 
 /* If there's room, undo the consumption of one character from msg_buf,
 }
 
 /* If there's room, undo the consumption of one character from msg_buf,