type conflicts

SCCS-vsn: usr.sbin/sendmail/src/main.c 6.64
SCCS-vsn: usr.sbin/sendmail/src/err.c 6.19
SCCS-vsn: usr.sbin/sendmail/src/deliver.c 6.77

diff --git a/usr/src/usr.sbin/sendmail/src/deliver.c b/usr/src/usr.sbin/sendmail/src/deliver.c
index dfbb578..35b39f4 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/deliver.c
+++ b/usr/src/usr.sbin/sendmail/src/deliver.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)deliver.c  6.76 (Berkeley) %G%";
+static char sccsid[] = "@(#)deliver.c  6.77 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "sendmail.h"
 #endif /* not lint */
 
 #include "sendmail.h"


@@ -1573,7 +1573,7 @@ giveresponse(stat, m, mci, e)
        register MCI *mci;
        ENVELOPE *e;
 {
        register MCI *mci;
        ENVELOPE *e;
 {

-       register char *statmsg;
+       register const char *statmsg;

        extern char *SysExMsg[];
        register int i;
        extern int N_SysEx;
        extern char *SysExMsg[];
        register int i;
        extern int N_SysEx;

diff --git a/usr/src/usr.sbin/sendmail/src/err.c b/usr/src/usr.sbin/sendmail/src/err.c
index 1e76b7b..df69390 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/err.c
+++ b/usr/src/usr.sbin/sendmail/src/err.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)err.c      6.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)err.c      6.19 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -49,10 +49,10 @@ static void fmtmsg();
 void
 /*VARARGS1*/
 #ifdef __STDC__
 void
 /*VARARGS1*/
 #ifdef __STDC__

-syserr(char *fmt, ...)
+syserr(const char *fmt, ...)

 #else
 syserr(fmt, va_alist)
 #else
 syserr(fmt, va_alist)

-       char *fmt;
+       const char *fmt;

        va_dcl
 #endif
 {
        va_dcl
 #endif
 {


@@ -120,10 +120,10 @@ syserr(fmt, va_alist)
 /*VARARGS1*/
 void
 #ifdef __STDC__
 /*VARARGS1*/
 void
 #ifdef __STDC__

-usrerr(char *fmt, ...)
+usrerr(const char *fmt, ...)

 #else
 usrerr(fmt, va_alist)
 #else
 usrerr(fmt, va_alist)

-       char *fmt;
+       const char *fmt;

        va_dcl
 #endif
 {
        va_dcl
 #endif
 {


@@ -167,10 +167,10 @@ usrerr(fmt, va_alist)
 /*VARARGS2*/
 void
 #ifdef __STDC__
 /*VARARGS2*/
 void
 #ifdef __STDC__

-message(char *msg, ...)
+message(const char *msg, ...)

 #else
 message(msg, va_alist)
 #else
 message(msg, va_alist)

-       char *msg;
+       const char *msg;

        va_dcl
 #endif
 {
        va_dcl
 #endif
 {


@@ -203,10 +203,10 @@ message(msg, va_alist)
 /*VARARGS2*/
 void
 #ifdef __STDC__
 /*VARARGS2*/
 void
 #ifdef __STDC__

-nmessage(char *msg, ...)
+nmessage(const char *msg, ...)

 #else
 nmessage(msg, va_alist)
 #else
 nmessage(msg, va_alist)

-       char *msg;
+       const char *msg;

        va_dcl
 #endif
 {
        va_dcl
 #endif
 {

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index eb096f3..a3b8d35 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -13,7 +13,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     6.63 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     6.64 (Berkeley) %G%";

 #endif /* not lint */
 
 #define        _DEFINE
 #endif /* not lint */
 
 #define        _DEFINE


@@ -1458,11 +1458,11 @@ obsolete(argv)
 
 void
 #ifdef __STDC__
 
 void
 #ifdef __STDC__

-auth_warning(register ENVELOPE *e, char *msg, ...)
+auth_warning(register ENVELOPE *e, const char *msg, ...)

 #else
 auth_warning(e, msg, va_alist)
        register ENVELOPE *e;
 #else
 auth_warning(e, msg, va_alist)
        register ENVELOPE *e;

-       char *msg;
+       const char *msg;

        va_dcl
 #endif
 {
        va_dcl
 #endif
 {