Silence some of the -Wnon-const-format warnings and add __printflike()

to a function prototype which needs it.

Approved by:	brian
MFC After:	2 weeks

2 files changed, 11 insertions, 6 deletions

diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index f0af0e8..0fa08b5 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -1570,7 +1570,7 @@ SetVariable(struct cmdargs const *arg)
       mp_RestartAutoloadTimer(&arg->bundle->ncp.mp);
     } else {
       err = "Set autoload requires three arguments\n";
-      log_Printf(LogWARN, err);
+      log_Printf(LogWARN, "%s", err);
     }
     break;
 
@@ -1605,7 +1605,7 @@ SetVariable(struct cmdargs const *arg)
         l->ccp.cfg.deflate.in.winsize = 0;
     } else {
       err = "No window size specified\n";
-      log_Printf(LogWARN, err);
+      log_Printf(LogWARN, "%s", err);
     }
     break;
 
@@ -1662,7 +1662,7 @@ SetVariable(struct cmdargs const *arg)
       cx->physical->link.lcp.cfg.accmap = (u_int32_t)ulong_val;
     } else {
       err = "No accmap specified\n";
-      log_Printf(LogWARN, err);
+      log_Printf(LogWARN, "%s", err);
     }
     break;
 
@@ -1831,7 +1831,7 @@ SetVariable(struct cmdargs const *arg)
       bundle_SetIdleTimer(arg->bundle, timeout, min);
     }
     if (err)
-      log_Printf(LogWARN, err);
+      log_Printf(LogWARN, "%s", err);
     break;
 
   case VAR_LQRPERIOD:
@@ -2005,7 +2005,7 @@ SetVariable(struct cmdargs const *arg)
       return physical_SetParity(arg->cx->physical, argp);
     else {
       err = "Parity value must be odd, even or none\n";
-      log_Printf(LogWARN, err);
+      log_Printf(LogWARN, "%s", err);
     }
     break;
 
@@ -2016,7 +2016,7 @@ SetVariable(struct cmdargs const *arg)
       physical_SetRtsCts(arg->cx->physical, 0);
     else {
       err = "RTS/CTS value must be on or off\n";
-      log_Printf(LogWARN, err);
+      log_Printf(LogWARN, "%s", err);
     }
     break;
 
diff --git a/usr.sbin/ppp/prompt.h b/usr.sbin/ppp/prompt.h
index 6e3bc32..6569cd9 100644
--- a/usr.sbin/ppp/prompt.h
+++ b/usr.sbin/ppp/prompt.h
@@ -75,7 +75,12 @@ extern void prompt_Printf(struct prompt *, const char *, ...)
 #else
 extern void prompt_Printf(struct prompt *, const char *, ...);
 #endif
+#ifdef __GNUC__
+extern void prompt_vPrintf(struct prompt *, const char *, _BSD_VA_LIST_)
+			   __attribute__ ((format (printf, 2, 0)));
+#else
 extern void prompt_vPrintf(struct prompt *, const char *, _BSD_VA_LIST_);
+#endif
 #define PROMPT_DONT_WANT_INT 1
 #define PROMPT_WANT_INT 0
 extern void prompt_TtyInit(struct prompt *);