X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fannosbr.c;h=e8ef50ae209afa87e36002fbdd3879be3fba38f4;hp=6677d2146f21290a697ee896a3635fee67281c19;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=d9b1d57351d104d7ec1a5621f090657dcce8cb7f

diff --git a/uip/annosbr.c b/uip/annosbr.c
index 6677d21..e8ef50a 100644
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -11,6 +11,7 @@
 
 #include <h/mh.h>
 #include <h/tws.h>
+#include <h/utils.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <utime.h>
@@ -93,8 +94,7 @@ annolist(char *file, char *comp, char *text, int number)
      *  This buffer might need to be quite large, so we grow it as needed.
      */
 
-    if ((field = (char *)malloc(field_size = 256)) == (char *)0)
-	adios(NULL, "can't allocate field buffer.");
+    field = (char *)mh_xmalloc(field_size = 256);
 
     /*
      *  Get the length of the field name since we use it often.
@@ -120,8 +120,7 @@ annolist(char *file, char *comp, char *text, int number)
 	    }
 
 	    if (++n >= field_size - 1) {
-		if ((field = (char *)realloc((void *)field, field_size += 256)) == (char *)0)
-		    adios(NULL, "can't grow field buffer.");
+		field = (char *) mh_xrealloc((void *)field, field_size += 256);
 		
 		cp = field + n - 1;
 	    }
@@ -208,8 +207,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
 	if ((fp = fdopen(fd, "r")) == (FILE *)0)
 	    adios(NULL, "unable to fdopen file.");
 
-	if ((field = (char *)malloc(field_size = 256)) == (char *)0)
-	    adios(NULL, "can't allocate field buffer.");
+	field = (char *)mh_xmalloc(field_size = 256);
     }
 
     /*
@@ -263,8 +261,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
 		}
 
 		if (++n >= field_size - 1) {
-		    if ((field = (char *)realloc((void *)field, field_size *= 2)) == (char *)0)
-			adios(NULL, "can't grow field buffer.");
+		    field = (char *) mh_xrealloc((void *)field, field_size *= 2);
 		
 		    cp = field + n - 1;
 		}
@@ -384,7 +381,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
 		while (*cp && *cp++ != '\n')
 		    continue;
 		if (cp - sp)
-		    fprintf (tmp, "%s: %*.*s", comp, cp - sp, cp - sp, sp);
+		    fprintf (tmp, "%s: %*.*s", comp, (int)(cp - sp), (int)(cp - sp), sp);
 	    } while (*cp);
 	    if (cp[-1] != '\n' && cp != text)
 		putc ('\n', tmp);