Replace some ints that are only ever 0 or 1 with bool.

[nmh] / uip / annosbr.c

diff --git a/uip/annosbr.c b/uip/annosbr.c
index d91ebf2910686a5063a66baff98e0f7d9d2be16d..c5ca38bf1284afdad0a9c40f3081fae3e829a98b 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -96,7 +96,7 @@ annolist(char *file, char *comp, char *text, int number)
      *  This buffer might need to be quite large, so we grow it as needed.
      */
 
      *  This buffer might need to be quite large, so we grow it as needed.
      */
 

-    field = (char *)mh_xmalloc(field_size = 256);
+    field = mh_xmalloc(field_size = 256);

 
     /*
      *  Get the length of the field name since we use it often.
 
     /*
      *  Get the length of the field name since we use it often.


@@ -121,7 +121,7 @@ annolist(char *file, char *comp, char *text, int number)
            }
 
            if (++n >= field_size - 1) {
            }
 
            if (++n >= field_size - 1) {

-               field = (char *) mh_xrealloc((void *)field, field_size += 256);
+               field = mh_xrealloc((void *)field, field_size += 256);

                
                cp = field + n - 1;
            }
                
                cp = field + n - 1;
            }


@@ -186,7 +186,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
     mode = fstat (fd, &st) != NOTOK ? (int) (st.st_mode & 0777) : m_gmprot ();
 
     if ((cp = m_mktemp2(file, "annotate", NULL, &tmp)) == NULL) {
     mode = fstat (fd, &st) != NOTOK ? (int) (st.st_mode & 0777) : m_gmprot ();
 
     if ((cp = m_mktemp2(file, "annotate", NULL, &tmp)) == NULL) {

-       adios(NULL, "unable to create temporary file");
+       die("unable to create temporary file");

     }
     strncpy (tmpfil, cp, sizeof(tmpfil));
     chmod (tmpfil, mode);
     }
     strncpy (tmpfil, cp, sizeof(tmpfil));
     chmod (tmpfil, mode);


@@ -201,9 +201,9 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
 
     if (delete >= -1 || append) {
        if ((fp = fdopen(fd, "r")) == NULL)
 
     if (delete >= -1 || append) {
        if ((fp = fdopen(fd, "r")) == NULL)

-           adios(NULL, "unable to fdopen file.");
+           die("unable to fdopen file.");

 
 

-       field = (char *)mh_xmalloc(field_size = 256);
+       field = mh_xmalloc(field_size = 256);

     }
 
     /*
     }
 
     /*


@@ -257,7 +257,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
                }
 
                if (++n >= field_size - 1) {
                }
 
                if (++n >= field_size - 1) {

-                   field = (char *) mh_xrealloc((void *)field, field_size *= 2);
+                   field = mh_xrealloc((void *)field, field_size *= 2);

                
                    cp = field + n - 1;
                }
                
                    cp = field + n - 1;
                }


@@ -324,7 +324,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
             */
 
            if ((n = fputs(field, tmp)) == EOF || (c == '\n' && fputc('\n', tmp) == EOF))
             */
 
            if ((n = fputs(field, tmp)) == EOF || (c == '\n' && fputc('\n', tmp) == EOF))

-               adios(NULL, "unable to write temporary file.");
+               die("unable to write temporary file.");

 
        } while (*field != '\0' && *field != '-');
 
 
        } while (*field != '\0' && *field != '-');
 


@@ -332,7 +332,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
         *  Get rid of the field buffer because we're done with it.
         */
 
         *  Get rid of the field buffer because we're done with it.
         */
 

-       free((void *)field);
+       free(field);

     }
 
     else {
     }
 
     else {


@@ -393,7 +393,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
      */
 
     if (fp && lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1)
      */
 
     if (fp && lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1)

-        adios(NULL, "can't seek.");
+        die("can't seek.");

 
     cpydata (fd, fileno (tmp), file, tmpfil);
     fclose (tmp);
 
     cpydata (fd, fileno (tmp), file, tmpfil);
     fclose (tmp);