whatnow: Remove undocumented printf-formatting of -prompt string.

[nmh] / uip / annosbr.c

diff --git a/uip/annosbr.c b/uip/annosbr.c
index 124c77e7e979eaca6d0b7e744f004b94dd2a1c98..cadfa637998a65d3b38fb4a3271b55577cb88110 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -8,8 +8,8 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"
 #include <fcntl.h>
 #include <utime.h>
 
@@ -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.
      */
 
-    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.
@@ -121,7 +121,7 @@ annolist(char *file, char *comp, char *text, int number)
            }
 
            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;
            }
@@ -140,7 +140,7 @@ annolist(char *file, char *comp, char *text, int number)
            if (number)
                (void)printf("%d\t", ++count);
 
-           if (text == NULL && (sp = strrchr(cp, '/')) != (char *)0)
+           if (text == NULL && (sp = strrchr(cp, '/')))
                cp = sp + 1;
 
             puts(cp);
@@ -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) {
-       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+       adios(NULL, "unable to create temporary file");
     }
     strncpy (tmpfil, cp, sizeof(tmpfil));
     chmod (tmpfil, mode);
@@ -203,7 +203,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
        if ((fp = fdopen(fd, "r")) == NULL)
            adios(NULL, "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) {
-                   field = (char *) mh_xrealloc((void *)field, field_size *= 2);
+                   field = mh_xrealloc((void *)field, field_size *= 2);
                
                    cp = field + n - 1;
                }
@@ -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.
         */
 
-       free((void *)field);
+       free(field);
     }
 
     else {