X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1c91be5784ddebaa6a54f1f2c42a8016f10af6de..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/annosbr.c

diff --git a/uip/annosbr.c b/uip/annosbr.c
index a73c8277..9d73a094 100644
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -88,7 +88,7 @@ annolist(char *file, char *comp, char *text, int number)
     int		n;		/* number of bytes written */
     char	*sp;		/* another miscellaneous character pointer */
 
-    if ((fp = fopen(file, "r")) == (FILE *)0)
+    if ((fp = fopen(file, "r")) == NULL)
 	adios(file, "unable to open");
 
     /*
@@ -117,7 +117,6 @@ annolist(char *file, char *comp, char *text, int number)
 	for (n = 0, cp = field; (c = getc(fp)) != EOF; *cp++ = c) {
 	    if (c == '\n' && (c = getc(fp)) != ' ' && c != '\t') {
 		(void)ungetc(c, fp);
-		c = '\n';
 		break;
 	    }
 
@@ -141,7 +140,7 @@ annolist(char *file, char *comp, char *text, int number)
 	    if (number)
 		(void)printf("%d\t", ++count);
 
-	    if (text == (char *)0 && (sp = strrchr(cp, '/')) != (char *)0)
+	    if (text == NULL && (sp = strrchr(cp, '/')) != (char *)0)
 		cp = sp + 1;
 
 	    (void)printf("%s\n", cp);
@@ -204,7 +203,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
      */
 
     if (delete >= -1 || append != 0) {
-	if ((fp = fdopen(fd, "r")) == (FILE *)0)
+	if ((fp = fdopen(fd, "r")) == NULL)
 	    adios(NULL, "unable to fdopen file.");
 
 	field = (char *)mh_xmalloc(field_size = 256);
@@ -297,7 +296,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
 
 	    if (strncasecmp(field, comp, length) == 0 && field[length] == ':') {
 		if (delete == 0) {
-		    if (text == (char *)0)
+		    if (text == NULL)
 			break;
 
 		    for (cp = field + length + 1; *cp == ' ' || *cp == '\t'; cp++)
@@ -308,7 +307,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
 				break;
 		    }
 		    else {
-			if ((sp = strrchr(cp, '/')) != (char *)0)
+			if ((sp = strrchr(cp, '/')) != NULL)
 			    cp = sp + 1;
 
 			if (strcmp(cp, text) == 0)
@@ -396,10 +395,8 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
      *	copying routine uses the descriptor, not the pointer.
      */
 
-    if (append || delete >= -1) {
-	if (lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1)
-	    adios(NULL, "can't seek.");
-    }
+    if (fp && lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1)
+        adios(NULL, "can't seek.");
 
     cpydata (fd, fileno (tmp), file, tmpfil);
     fclose (tmp);
@@ -447,7 +444,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
      *	lkclose() fail, but that failure is ignored so it's not a problem.
      */
 
-    if (delete >= -1)
+    if (fp)
 	(void)fclose(fp);
 
     return 0;