Fix some OpenBSD/alpha warnings

7 files changed, 16 insertions, 11 deletions

diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index d28c12c..00c8560 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ccp.c,v 1.38 1998/08/07 18:42:47 brian Exp $
+ * $Id: ccp.c,v 1.39 1998/08/26 17:39:36 brian Exp $
  *
  *	TODO:
  *		o Support other compression protocols
@@ -30,6 +30,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <termios.h>
 
 #include "defs.h"
diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c
index 66ffe73..c2652d6 100644
--- a/usr.sbin/ppp/chap.c
+++ b/usr.sbin/ppp/chap.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: chap.c,v 1.35 1998/07/28 21:54:29 brian Exp $
+ * $Id: chap.c,v 1.36 1998/08/07 18:42:47 brian Exp $
  *
  *	TODO:
  */
@@ -29,10 +29,10 @@
 
 #ifdef HAVE_DES
 #include <md4.h>
-#include <string.h>
 #endif
 #include <md5.h>
 #include <stdlib.h>
+#include <string.h>
 #include <termios.h>
 
 #include "mbuf.h"
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index d4f98c1..1721d9f 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: command.c,v 1.160 1998/08/25 17:48:42 brian Exp $
+ * $Id: command.c,v 1.161 1998/08/26 17:39:37 brian Exp $
  *
  */
 #include <sys/types.h>
@@ -126,7 +126,7 @@
 #define NEG_DNS		50
 
 const char Version[] = "2.0";
-const char VersionDate[] = "$Date: 1998/08/25 17:48:42 $";
+const char VersionDate[] = "$Date: 1998/08/26 17:39:37 $";
 
 static int ShowCommand(struct cmdargs const *);
 static int TerminalCommand(struct cmdargs const *);
@@ -1792,7 +1792,8 @@ AliasEnable(struct cmdargs const *arg)
 static int
 AliasOption(struct cmdargs const *arg)
 {
-  unsigned param = (unsigned)arg->cmd->args;
+  long param = (long)arg->cmd->args;
+
   if (arg->argc == arg->argn+1) {
     if (strcasecmp(arg->argv[arg->argn], "yes") == 0) {
       if (arg->bundle->AliasEnabled) {
diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index 8bff040..68672a5 100644
--- a/usr.sbin/ppp/link.c
+++ b/usr.sbin/ppp/link.c
@@ -23,13 +23,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *  $Id: link.c,v 1.4 1998/08/07 18:42:49 brian Exp $
+ *  $Id: link.c,v 1.5 1998/08/25 17:48:42 brian Exp $
  *
  */
 
 #include <sys/types.h>
 
 #include <stdio.h>
+#include <string.h>
 #include <termios.h>
 
 #include "defs.h"
diff --git a/usr.sbin/ppp/modem.c b/usr.sbin/ppp/modem.c
index 5764191..3c89492 100644
--- a/usr.sbin/ppp/modem.c
+++ b/usr.sbin/ppp/modem.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: modem.c,v 1.97 1998/08/07 18:42:50 brian Exp $
+ * $Id: modem.c,v 1.98 1998/08/09 15:34:11 brian Exp $
  *
  *  TODO:
  */
@@ -968,7 +968,7 @@ modem_DescriptorRead(struct descriptor *d, struct bundle *bundle,
         /* LCP packet is detected. Turn ourselves into packet mode */
         if (cp != rbuff)
           /* Get rid of the bit before the HDLC header */
-          log_WritePrompts(p->dl, "%.*s\r\n", cp - rbuff, rbuff);
+          log_WritePrompts(p->dl, "%.*s\r\n", (int)(cp - rbuff), rbuff);
         log_Printf(LogPHASE, "%s: PPP packet detected, coming up\n",
                    p->link.name);
         datalink_Up(p->dl, 0, 1);
diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c
index cc14300..95a39c69 100644
--- a/usr.sbin/ppp/pap.c
+++ b/usr.sbin/ppp/pap.c
@@ -18,7 +18,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: pap.c,v 1.25 1998/07/28 21:54:30 brian Exp $
+ * $Id: pap.c,v 1.26 1998/08/07 18:42:50 brian Exp $
  *
  *	TODO:
  */
@@ -28,6 +28,7 @@
 #include <netinet/ip.h>
 #include <sys/un.h>
 
+#include <string.h>
 #include <termios.h>
 
 #include "mbuf.h"
diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c
index ba1ef1b..8ff5b92 100644
--- a/usr.sbin/ppp/vjcomp.c
+++ b/usr.sbin/ppp/vjcomp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: vjcomp.c,v 1.21 1998/06/27 23:48:54 brian Exp $
+ * $Id: vjcomp.c,v 1.22 1998/08/07 18:42:51 brian Exp $
  *
  *  TODO:
  */
@@ -28,6 +28,7 @@
 #include <sys/un.h>
 
 #include <stdio.h>
+#include <string.h>
 
 #include "mbuf.h"
 #include "log.h"