Don't `else' after return. Simplify control flow.

[nmh] / sbr / seq_bits.c

diff --git a/sbr/seq_bits.c b/sbr/seq_bits.c
index 56bd2ec18df4b11065098ecc50e2060bb42f0c62..f27efa9f717560ea63aeed348df0efcf36a4ab5c 100644 (file)
--- a/sbr/seq_bits.c
+++ b/sbr/seq_bits.c
@@ -2,8 +2,6 @@
 /*
  * seq_bits.c -- return the snprintb() string for a sequence
  *
 /*
  * seq_bits.c -- return the snprintb() string for a sequence
  *

- * $Id$
- *

  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.


@@ -15,16 +13,26 @@
 char *
 seq_bits (struct msgs *mp)
 {
 char *
 seq_bits (struct msgs *mp)
 {

-    int i;
+    size_t i;

     size_t len;
     static char buffer[BUFSIZ];
 
     strncpy (buffer, MBITS, sizeof(buffer));
 
     size_t len;
     static char buffer[BUFSIZ];
 
     strncpy (buffer, MBITS, sizeof(buffer));
 

-    for (i = 0; mp->msgattrs[i]; i++) {
+    for (i = 0; i < svector_size (mp->msgattrs); i++) {

        len = strlen (buffer);
        snprintf (buffer + len, sizeof(buffer) - len,
        len = strlen (buffer);
        snprintf (buffer + len, sizeof(buffer) - len,

-               "%c%s", FFATTRSLOT + 1 + i, mp->msgattrs[i]);
+                 "%c%s", FFATTRSLOT + 1 + (int) i,
+                  svector_at (mp->msgattrs, i));
+       /*
+        * seq_bits() is used by seq_printdebug(), which passes an
+        * unsigned int bit vector to snprintb().  So limit the
+        * size of the return value accordingly.   Even worse,
+        * snprintb() only uses characters up through ASCII space
+        * as the delimiter (the %c character above).  So limit
+        * based on that.
+        */
+       if ((int) i == ' ' - FFATTRSLOT - 1) break;

     }
 
     return buffer;
     }
 
     return buffer;