X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/70637f3fad9cb3cbc6f4bd8d89a32bc474fc38ad..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/annosbr.c

diff --git a/uip/annosbr.c b/uip/annosbr.c
index 124c77e7..eafcbfc1 100644
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -5,11 +5,12 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/tws.h>
-#include <h/utils.h>
-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
+#include "h/mh.h"
+#include "sbr/error.h"
+#include "h/tws.h"
+#include "h/utils.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"
 #include <fcntl.h>
 #include <utime.h>
 
@@ -96,7 +97,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 +122,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 +141,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 +187,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());
+	die("unable to create temporary file");
     }
     strncpy (tmpfil, cp, sizeof(tmpfil));
     chmod (tmpfil, mode);
@@ -201,9 +202,9 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
 
     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 +258,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;
 		}
@@ -324,7 +325,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))
-		adios(NULL, "unable to write temporary file.");
+		die("unable to write temporary file.");
 
 	} while (*field != '\0' && *field != '-');
 
@@ -332,7 +333,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 {
@@ -393,7 +394,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)
-        adios(NULL, "can't seek.");
+        die("can't seek.");
 
     cpydata (fd, fileno (tmp), file, tmpfil);
     fclose (tmp);