turn newstr() and crlf() into macros

SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 3.110

diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h
index fa17bc3..e7cc0bb 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/sendmail.h
+++ b/usr/src/usr.sbin/sendmail/src/sendmail.h
@@ -442,12 +442,25 @@ EXTERN u_char     tTdvect[100];
 
 # include      <sysexits.h>
 
 
 # include      <sysexits.h>
 

+
+/*
+**  Some in-line functions
+*/
+
+/* set exit status */

 # define setstat(s)            { if (ExitStat == EX_OK) ExitStat = s; }
 
 # define setstat(s)            { if (ExitStat == EX_OK) ExitStat = s; }
 

+/* line terminator appropriate for a given mailer */
+# define crlf(m)               (bitset(M_CRLF, (m)->m_flags) ? "\r\n" : "\n")

 
 

-/* useful functions */
+/* make a copy of a string */
+# define newstr(s)             strcpy(xalloc(strlen(s) + 1), s)
+
+
+/*
+**  Declarations of useful functions
+*/

 
 

-extern char    *newstr();

 extern ADDRESS *parseaddr();
 extern char    *xalloc();
 extern bool    sameaddr();
 extern ADDRESS *parseaddr();
 extern char    *xalloc();
 extern bool    sameaddr();


@@ -456,4 +469,3 @@ extern EVENT        *setevent();
 extern char    *sfgets();
 extern char    *queuename();
 extern time_t  curtime();
 extern char    *sfgets();
 extern char    *queuename();
 extern time_t  curtime();

-extern char    *crlf();