diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2001-05-28 17:10:35 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2001-05-28 17:10:35 +0000 |
commit | fe77e70108d5e4da42ec6ee7e4f1bfaccd64ef04 (patch) | |
tree | 94f6971eb38134bbccc202099b9cf11ca0d5b908 /contrib/sendmail/src/savemail.c | |
parent | 175e3eb50e42986bc6de77adab1f3e58878b2a88 (diff) | |
download | FreeBSD-src-fe77e70108d5e4da42ec6ee7e4f1bfaccd64ef04.zip FreeBSD-src-fe77e70108d5e4da42ec6ee7e4f1bfaccd64ef04.tar.gz |
Resolve conflicts from 8.11.4 import
Diffstat (limited to 'contrib/sendmail/src/savemail.c')
-rw-r--r-- | contrib/sendmail/src/savemail.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index 2d52e5e..4e310ba 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -12,7 +12,7 @@ */ #ifndef lint -static char id[] = "@(#)$Id: savemail.c,v 8.212.4.12 2001/01/07 19:31:05 gshapiro Exp $"; +static char id[] = "@(#)$Id: savemail.c,v 8.212.4.13 2001/05/03 17:24:15 gshapiro Exp $"; #endif /* ! lint */ /* $FreeBSD$ */ @@ -1415,7 +1415,7 @@ xtextify(t, taboo) if (l > bplen) { if (bp != NULL) - free(bp); + sm_free(bp); bp = xalloc(l); bplen = l; } @@ -1468,7 +1468,7 @@ xuntextify(t) if (l > bplen) { if (bp != NULL) - free(bp); + sm_free(bp); bp = xalloc(l); bplen = l; } |