Added consts to adios(), advise(), and advertise() to sync master

and nmh-oauth branch.

diff --git a/h/prototypes.h b/h/prototypes.h
index 33ac013..daa1c61 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -18,10 +18,10 @@ char *etcpath(char *);
 struct msgs_array;
 
 void add_profile_entry (const char *, const char *);
 struct msgs_array;
 
 void add_profile_entry (const char *, const char *);

-void adios (char *, const char *, ...) NORETURN;
+void adios (const char *, const char *, ...) NORETURN;

 void admonish (char *, char *, ...);
 void admonish (char *, char *, ...);

-void advertise (char *, char *, const char *, va_list);
-void advise (char *, char *, ...);
+void advertise (const char *, char *, const char *, va_list);
+void advise (const char *, const char *, ...);

 char **argsplit (char *, char **, int *);
 void argsplit_msgarg (struct msgs_array *, char *, char **);
 void argsplit_insert (struct msgs_array *, char *, char **);
 char **argsplit (char *, char **, int *);
 void argsplit_msgarg (struct msgs_array *, char *, char **);
 void argsplit_insert (struct msgs_array *, char *, char **);

diff --git a/sbr/error.c b/sbr/error.c
index 184c950..c23c3df 100644 (file)
--- a/sbr/error.c
+++ b/sbr/error.c
@@ -17,7 +17,7 @@
  * print out error message
  */
 void
  * print out error message
  */
 void

-advise (char *what, char *fmt, ...)
+advise (const char *what, const char *fmt, ...)

 {
     va_list ap;
 
 {
     va_list ap;
 


@@ -31,7 +31,7 @@ advise (char *what, char *fmt, ...)
  * print out error message and exit
  */
 void
  * print out error message and exit
  */
 void

-adios (char *what, const char *fmt, ...)
+adios (const char *what, const char *fmt, ...)

 {
     va_list ap;
 
 {
     va_list ap;
 


@@ -60,7 +60,7 @@ admonish (char *what, char *fmt, ...)
  * main routine for printing error messages.
  */
 void
  * main routine for printing error messages.
  */
 void

-advertise (char *what, char *tail, const char *fmt, va_list ap)
+advertise (const char *what, char *tail, const char *fmt, va_list ap)

 {
     int        eindex = errno;
     char buffer[BUFSIZ], err[BUFSIZ];
 {
     int        eindex = errno;
     char buffer[BUFSIZ], err[BUFSIZ];


@@ -85,7 +85,7 @@ advertise (char *what, char *tail, const char *fmt, va_list ap)
        if (*what) {
            iov->iov_len = strlen (iov->iov_base = " ");
            iov++;
        if (*what) {
            iov->iov_len = strlen (iov->iov_base = " ");
            iov++;

-           iov->iov_len = strlen (iov->iov_base = what);
+           iov->iov_len = strlen (iov->iov_base = (void*)what);

            iov++;
            iov->iov_len = strlen (iov->iov_base = ": ");
            iov++;
            iov++;
            iov->iov_len = strlen (iov->iov_base = ": ");
            iov++;