X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e5479da8544d4fe47a320934667cb91c1c6a309e..99f61bcf8de3c5782e007559ce8f289be50e9b8b:/uip/mhparse.c?ds=inline

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 2e1beb96..efa88480 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -729,7 +729,7 @@ magic_skip:
      * Get any <Content-Id> given in buffer
      */
     if (magic && *cp == '<') {
-        mh_xfree(ct->c_id);
+        free(ct->c_id);
         ct->c_id = NULL;
 	if (!(dp = strchr(ct->c_id = ++cp, '>'))) {
 	    inform("invalid ID in message %s", ct->c_file);
@@ -1108,7 +1108,7 @@ InitMultiPart (CT ct)
 
 	bp = cte + strlen (cte) - 1;
 	while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';
-	for (bp = cte; *bp && isblank ((unsigned char) *bp); ++bp) continue;
+	for (bp = cte; isblank((unsigned char)*bp); ++bp) continue;
 
 	inform("\"%s/%s\" type in message %s must be encoded in\n"
 	    "7bit, 8bit, or binary, per RFC 2045 (6.4).  "
@@ -1714,11 +1714,11 @@ size_encoding (CT ct)
     }
 
     if (ct->c_encoding == CE_EXTERNAL)
-	return (ct->c_end - ct->c_begin);	
+	return ct->c_end - ct->c_begin;	
 
     file = NULL;
     if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
-	return (ct->c_end - ct->c_begin);
+	return ct->c_end - ct->c_begin;
 
     if (fstat (fd, &st) != NOTOK)
 	size = (long) st.st_size;
@@ -2000,9 +2000,6 @@ openQuoted (CT ct, char **file)
 	MD5Init (&mdContext);
 
     quoted = 0;
-#ifdef lint
-    mask = 0;
-#endif
 
     fseek (ct->c_fp, ct->c_begin, SEEK_SET);
     while (len > 0) {
@@ -2583,7 +2580,7 @@ openFTP (CT ct, char **file)
 		execvp (ftp, vec);
 		fprintf (stderr, "unable to exec ");
 		perror (ftp);
-		_exit (-1);
+		_exit(1);
 		/* NOTREACHED */
 
 	    default:
@@ -2716,7 +2713,7 @@ openMail (CT ct, char **file)
 	    execvp (mailproc, vec);
 	    fprintf (stderr, "unable to exec ");
 	    perror (mailproc);
-	    _exit (-1);
+	    _exit(1);
 	    /* NOTREACHED */
 
 	default:
@@ -2745,7 +2742,7 @@ openMail (CT ct, char **file)
 
     /* showproc is for mhshow and mhstore, though mhlist -debug
      * prints it, too. */
-    mh_xfree(ct->c_showproc);
+    free(ct->c_showproc);
     ct->c_showproc = mh_xstrdup("true");
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
@@ -2844,7 +2841,7 @@ openURL (CT ct, char **file)
 	execvp(program, args.msgs);
 	fprintf(stderr, "Unable to exec ");
 	perror(program);
-	_exit(-1);
+	_exit(1);
 	/* NOTREACHED */
 
     default:
@@ -3396,7 +3393,7 @@ parse_header_attrs (const char *filename, const char *fieldname,
                     inform("missing language tag in message %s's %s: field\n"
                         "    (parameter %s)", filename, fieldname, nameptr);
 		    free(nameptr);
-                    mh_xfree(charset);
+                    free(charset);
 		    return NOTOK;
 		}
 
@@ -3419,8 +3416,8 @@ parse_header_attrs (const char *filename, const char *fieldname,
                         inform("invalid encoded sequence in message %s's %s: field\n"
                             "    (parameter %s)", filename, fieldname, nameptr);
 			free(nameptr);
-                        mh_xfree(charset);
-                        mh_xfree(lang);
+                        free(charset);
+                        free(lang);
 			return NOTOK;
 		    }
 		    vp += 2;
@@ -3460,8 +3457,8 @@ bad_quote:
                         inform("invalid quoted-string in message %s's %s: field\n"
                             "    (parameter %s)", filename, fieldname, nameptr);
 			free(nameptr);
-                        mh_xfree(charset);
-                        mh_xfree(lang);
+                        free(charset);
+                        free(lang);
 			return NOTOK;
 		    case '"':
 			break;
@@ -3568,9 +3565,9 @@ bad_quote:
 	     */
 
 	    if (index == 0 && encoded) {
-                mh_xfree(pp->charset);
+                free(pp->charset);
 	    	pp->charset = charset;
-                mh_xfree(pp->lang);
+                free(pp->lang);
 		pp->lang = lang;
 	    }
 	} else {
@@ -3669,7 +3666,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 
 	if (strlen(params->pm_name) > CPERLIN) {
 	    inform("Parameter name \"%s\" is too long", params->pm_name);
-            mh_xfree(paramout);
+            free(paramout);
 	    return NULL;
 	}
 
@@ -3706,7 +3703,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 				 numchars, valoff);
 
 	    if (i == 0) {
-                mh_xfree(paramout);
+                free(paramout);
 		return NULL;
 	    }
 
@@ -3769,7 +3766,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 	    		     strlen(params->pm_value + valoff), valoff);
 
 	if (i == 0) {
-            mh_xfree(paramout);
+            free(paramout);
 	    return NULL;
 	}