summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorPeter Valchev <pvalchev@cvs.openbsd.org>2001-09-26 06:07:29 +0000
committerPeter Valchev <pvalchev@cvs.openbsd.org>2001-09-26 06:07:29 +0000
commit81d7316a0fd03a90c6274ed025efe3d9db9c22d6 (patch)
tree3b3dde31daf6e3e419e5359dfc7fe415456a9ccc /usr.bin
parent450f0435cc177f758171ac06f69f18444988ba4f (diff)
Wall cleanup w/ some fixes; ok millert
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tip/aculib/biz22.c13
-rw-r--r--usr.bin/tip/aculib/biz31.c6
-rw-r--r--usr.bin/tip/aculib/courier.c9
-rw-r--r--usr.bin/tip/aculib/df.c13
-rw-r--r--usr.bin/tip/aculib/dn11.c13
-rw-r--r--usr.bin/tip/aculib/hayes.c19
-rw-r--r--usr.bin/tip/aculib/t3000.c12
-rw-r--r--usr.bin/tip/aculib/v3451.c16
-rw-r--r--usr.bin/tip/aculib/v831.c14
-rw-r--r--usr.bin/tip/aculib/ventel.c13
-rw-r--r--usr.bin/tip/cmds.c6
-rw-r--r--usr.bin/tip/cu.c6
-rw-r--r--usr.bin/tip/tip.c6
13 files changed, 81 insertions, 65 deletions
diff --git a/usr.bin/tip/aculib/biz22.c b/usr.bin/tip/aculib/biz22.c
index 768dfb75da7..71ad9c52eb2 100644
--- a/usr.bin/tip/aculib/biz22.c
+++ b/usr.bin/tip/aculib/biz22.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: biz22.c,v 1.5 2001/07/12 05:17:24 deraadt Exp $ */
+/* $OpenBSD: biz22.c,v 1.6 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: biz22.c,v 1.6 1997/02/11 09:24:11 mrg Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)biz22.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: biz22.c,v 1.5 2001/07/12 05:17:24 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: biz22.c,v 1.6 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
#include "tip.h"
@@ -49,7 +49,8 @@ static void sigALRM();
static int timeout = 0;
static jmp_buf timeoutbuf;
-static int cmd(), detect();
+static int cmd(), detect();
+void biz22_disconnect();
/*
* Dial up on a BIZCOMP Model 1022 with either
@@ -98,7 +99,7 @@ biz_dialer(num, mod)
char line[80];
(void)sprintf(line, "%ld second dial timeout",
- (long)number(value(DIALTIMEOUT)));
+ number(value(DIALTIMEOUT)));
logent(value(HOST), num, "biz1022", line);
}
#endif
@@ -107,6 +108,7 @@ biz_dialer(num, mod)
return (connected);
}
+int
biz22w_dialer(num, acu)
char *num, *acu;
{
@@ -114,6 +116,7 @@ biz22w_dialer(num, acu)
return (biz_dialer(num, "W"));
}
+int
biz22f_dialer(num, acu)
char *num, *acu;
{
@@ -121,6 +124,7 @@ biz22f_dialer(num, acu)
return (biz_dialer(num, "V"));
}
+void
biz22_disconnect()
{
write(FD, DISCONNECT_CMD, 4);
@@ -128,6 +132,7 @@ biz22_disconnect()
tcflush(FD, TCIOFLUSH);
}
+void
biz22_abort()
{
diff --git a/usr.bin/tip/aculib/biz31.c b/usr.bin/tip/aculib/biz31.c
index 96c99372e57..82bb245be2f 100644
--- a/usr.bin/tip/aculib/biz31.c
+++ b/usr.bin/tip/aculib/biz31.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: biz31.c,v 1.4 1997/04/02 01:47:06 millert Exp $ */
+/* $OpenBSD: biz31.c,v 1.5 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: biz31.c,v 1.5 1997/02/11 09:24:14 mrg Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)biz31.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: biz31.c,v 1.4 1997/04/02 01:47:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: biz31.c,v 1.5 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
#include "tip.h"
@@ -91,7 +91,7 @@ biz_dialer(num, mod)
if (timeout) {
char line[80];
- (void)sprintf(line, "%d second dial timeout",
+ (void)sprintf(line, "%ld second dial timeout",
number(value(DIALTIMEOUT)));
logent(value(HOST), num, "biz", line);
}
diff --git a/usr.bin/tip/aculib/courier.c b/usr.bin/tip/aculib/courier.c
index 8ee311c6b69..3860f3ea947 100644
--- a/usr.bin/tip/aculib/courier.c
+++ b/usr.bin/tip/aculib/courier.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: courier.c,v 1.7 2001/09/04 23:35:59 millert Exp $ */
+/* $OpenBSD: courier.c,v 1.8 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: courier.c,v 1.7 1997/02/11 09:24:16 mrg Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)courier.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: courier.c,v 1.7 2001/09/04 23:35:59 millert Exp $";
+static char rcsid[] = "$OpenBSD: courier.c,v 1.8 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
/*
@@ -108,7 +108,7 @@ badsynch:
connected = cour_connect();
#ifdef ACULOG
if (timeout) {
- (void)sprintf(line, "%d second dial timeout",
+ (void)sprintf(line, "%ld second dial timeout",
number(value(DIALTIMEOUT)));
logent(value(HOST), num, "cour", line);
}
@@ -255,9 +255,7 @@ again:
putchar(c);
#endif
}
-error1:
printf("%s\r\n", dialer_buf);
-error:
signal(SIGALRM, f);
return (0);
}
@@ -308,6 +306,7 @@ coursync()
return (0);
}
+static void
cour_write(fd, cp, n)
int fd;
char *cp;
diff --git a/usr.bin/tip/aculib/df.c b/usr.bin/tip/aculib/df.c
index 9050b6eb44a..9418cf29b99 100644
--- a/usr.bin/tip/aculib/df.c
+++ b/usr.bin/tip/aculib/df.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: df.c,v 1.3 1996/06/26 05:40:52 deraadt Exp $ */
+/* $OpenBSD: df.c,v 1.4 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: df.c,v 1.4 1995/10/29 00:49:51 pk Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)df.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: df.c,v 1.3 1996/06/26 05:40:52 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: df.c,v 1.4 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
/*
@@ -50,6 +50,7 @@ static char rcsid[] = "$OpenBSD: df.c,v 1.3 1996/06/26 05:40:52 deraadt Exp $";
static jmp_buf Sjbuf;
static void timeout();
+int
df02_dialer(num, acu)
char *num, *acu;
{
@@ -57,6 +58,7 @@ df02_dialer(num, acu)
return (df_dialer(num, acu, 0));
}
+int
df03_dialer(num, acu)
char *num, *acu;
{
@@ -64,13 +66,14 @@ df03_dialer(num, acu)
return (df_dialer(num, acu, 1));
}
+int
df_dialer(num, acu, df03)
char *num, *acu;
int df03;
{
register int f = FD;
struct termios cntrl;
- int speed = 0, rw = 2;
+ int speed = 0;
char c = '\0';
tcgetattr(f, &cntrl);
@@ -117,16 +120,16 @@ df_dialer(num, acu, df03)
return (c == 'A');
}
+void
df_disconnect()
{
- int rw = 2;
-
write(FD, "\001", 1);
sleep(1);
tcflush(FD, TCIOFLUSH);
}
+void
df_abort()
{
diff --git a/usr.bin/tip/aculib/dn11.c b/usr.bin/tip/aculib/dn11.c
index 4d5e590a81e..7ed77c63ded 100644
--- a/usr.bin/tip/aculib/dn11.c
+++ b/usr.bin/tip/aculib/dn11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dn11.c,v 1.3 1996/06/26 05:40:53 deraadt Exp $ */
+/* $OpenBSD: dn11.c,v 1.4 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: dn11.c,v 1.4 1995/10/29 00:49:53 pk Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)dn11.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: dn11.c,v 1.3 1996/06/26 05:40:53 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: dn11.c,v 1.4 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
/*
@@ -46,17 +46,16 @@ static char rcsid[] = "$OpenBSD: dn11.c,v 1.3 1996/06/26 05:40:53 deraadt Exp $"
*/
#include "tip.h"
-int dn_abort();
+void dn_abort();
void alarmtr();
static jmp_buf jmpbuf;
static int child = -1, dn;
+int
dn_dialer(num, acu)
char *num, *acu;
{
- extern errno;
- char *p, *q, phone[40];
- int lt, nw, connected = 1;
+ int lt, nw;
register int timelim;
struct termios cntrl;
@@ -128,6 +127,7 @@ alarmtr()
* Insurance, for some reason we don't seem to be
* hanging up...
*/
+void
dn_disconnect()
{
@@ -137,6 +137,7 @@ dn_disconnect()
close(FD);
}
+void
dn_abort()
{
diff --git a/usr.bin/tip/aculib/hayes.c b/usr.bin/tip/aculib/hayes.c
index 7a0649c81b9..02743cd5542 100644
--- a/usr.bin/tip/aculib/hayes.c
+++ b/usr.bin/tip/aculib/hayes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hayes.c,v 1.6 1997/04/02 01:47:06 millert Exp $ */
+/* $OpenBSD: hayes.c,v 1.7 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: hayes.c,v 1.6 1997/02/11 09:24:17 mrg Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)hayes.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: hayes.c,v 1.6 1997/04/02 01:47:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: hayes.c,v 1.7 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
/*
@@ -84,6 +84,7 @@ static char dumbuf[DUMBUFLEN];
#define FAILED 4
static int state = IDLE;
+int
hay_dialer(num, acu)
register char *num;
char *acu;
@@ -130,7 +131,7 @@ hay_dialer(num, acu)
tcflush(FD, TCIOFLUSH);
#ifdef ACULOG
if (timeout) {
- (void)sprintf(line, "%d second dial timeout",
+ (void)sprintf(line, "%ld second dial timeout",
number(value(DIALTIMEOUT)));
logent(value(HOST), num, "hayes", line);
}
@@ -141,11 +142,9 @@ hay_dialer(num, acu)
}
+void
hay_disconnect()
{
- char c;
- int len, rlen;
-
/* first hang up the modem*/
#ifdef DEBUG
printf("\rdisconnecting modem....\n\r");
@@ -156,11 +155,10 @@ hay_disconnect()
goodbye();
}
+void
hay_abort()
{
- char c;
-
write(FD, "\r", 1); /* send anything to abort the call */
hay_disconnect();
}
@@ -210,6 +208,7 @@ gobble(match)
return (status);
}
+static void
error_rep(c)
register char c;
{
@@ -250,9 +249,10 @@ error_rep(c)
/*
* set modem back to normal verbose status codes.
*/
+void
goodbye()
{
- int len, rlen;
+ int len;
char c;
tcflush(FD, TCIOFLUSH);
@@ -294,6 +294,7 @@ goodbye()
#define MAXRETRY 5
+int
hay_sync()
{
int len, retry = 0;
diff --git a/usr.bin/tip/aculib/t3000.c b/usr.bin/tip/aculib/t3000.c
index 5355abdbda6..e51a4f04fa3 100644
--- a/usr.bin/tip/aculib/t3000.c
+++ b/usr.bin/tip/aculib/t3000.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t3000.c,v 1.7 2001/09/09 19:26:53 millert Exp $ */
+/* $OpenBSD: t3000.c,v 1.8 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: t3000.c,v 1.5 1997/02/11 09:24:18 mrg Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)t3000.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: t3000.c,v 1.7 2001/09/09 19:26:53 millert Exp $";
+static char rcsid[] = "$OpenBSD: t3000.c,v 1.8 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
/*
@@ -59,6 +59,7 @@ static jmp_buf timeoutbuf, intbuf;
static int t3000_sync(), t3000_connect(), t3000_swallow();
static void t3000_nap();
+int
t3000_dialer(num, acu)
register char *num;
char *acu;
@@ -106,7 +107,7 @@ badsynch:
connected = t3000_connect();
#ifdef ACULOG
if (timeout) {
- (void)sprintf(line, "%d second dial timeout",
+ (void)sprintf(line, "%ld second dial timeout",
number(value(DIALTIMEOUT)));
logent(value(HOST), num, "t3000", line);
}
@@ -116,6 +117,7 @@ badsynch:
return (connected);
}
+void
t3000_disconnect()
{
/* first hang up the modem*/
@@ -126,6 +128,7 @@ t3000_disconnect()
close(FD);
}
+void
t3000_abort()
{
t3000_write(FD, "\r", 1); /* send anything to abort the call */
@@ -265,9 +268,7 @@ again:
putchar(c);
#endif
}
-error1:
printf("%s\r\n", dialer_buf);
-error:
signal(SIGALRM, f);
return (0);
}
@@ -321,6 +322,7 @@ if (len == 0) len = 1;
return (0);
}
+static int
t3000_write(fd, cp, n)
int fd;
char *cp;
diff --git a/usr.bin/tip/aculib/v3451.c b/usr.bin/tip/aculib/v3451.c
index f7388f43d01..c986d074d2b 100644
--- a/usr.bin/tip/aculib/v3451.c
+++ b/usr.bin/tip/aculib/v3451.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3451.c,v 1.4 1997/04/02 01:47:07 millert Exp $ */
+/* $OpenBSD: v3451.c,v 1.5 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: v3451.c,v 1.6 1997/02/11 09:24:20 mrg Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)v3451.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: v3451.c,v 1.4 1997/04/02 01:47:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: v3451.c,v 1.5 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
/*
@@ -51,18 +51,16 @@ static jmp_buf Sjbuf;
static int expect(), notin(), prefix();
static void vawrite(), alarmtr();
+int
v3451_dialer(num, acu)
register char *num;
char *acu;
{
sig_t func;
int ok;
- int slow = number(value(BAUDRATE)) < 1200, rw = 2;
+ int slow = number(value(BAUDRATE)) < 1200;
char phone[50];
struct termios cntrl;
-#ifdef ACULOG
- char line[80];
-#endif
/*
* Get in synch
@@ -129,12 +127,14 @@ v3451_dialer(num, acu)
return (1);
}
+void
v3451_disconnect()
{
close(FD);
}
+void
v3451_abort()
{
@@ -151,7 +151,7 @@ vawrite(cp, delay)
write(FD, cp, 1);
}
-static
+static int
expect(cp)
register char *cp;
{
@@ -207,7 +207,7 @@ notin(sh, lg)
return (1);
}
-static
+static int
prefix(s1, s2)
register char *s1, *s2;
{
diff --git a/usr.bin/tip/aculib/v831.c b/usr.bin/tip/aculib/v831.c
index af9e1b48cce..48d2a10aa6c 100644
--- a/usr.bin/tip/aculib/v831.c
+++ b/usr.bin/tip/aculib/v831.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v831.c,v 1.4 1997/04/02 01:47:08 millert Exp $ */
+/* $OpenBSD: v831.c,v 1.5 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: v831.c,v 1.5 1996/12/29 10:42:01 cgd Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)v831.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: v831.c,v 1.4 1997/04/02 01:47:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: v831.c,v 1.5 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
/*
@@ -47,19 +47,19 @@ static char rcsid[] = "$OpenBSD: v831.c,v 1.4 1997/04/02 01:47:08 millert Exp $"
#include "tip.h"
#include <termios.h>
-int v831_abort();
+void v831_abort();
static void alarmtr();
static int dialit();
static char *sanitize();
-extern int errno;
static jmp_buf jmpbuf;
static int child = -1;
+int
v831_dialer(num, acu)
char *num, *acu;
{
- int status, pid, connected = 1;
+ int status, pid;
register int timelim;
if (boolean(value(VERBOSE)))
@@ -130,6 +130,7 @@ alarmtr()
* Insurance, for some reason we don't seem to be
* hanging up...
*/
+void
v831_disconnect()
{
struct termios cntrl;
@@ -149,6 +150,7 @@ v831_disconnect()
close(FD);
}
+void
v831_abort()
{
@@ -193,7 +195,7 @@ dialit(phonenum, acu)
register struct vaconfig *vp;
struct termios cntrl;
char c;
- int i, two = 2;
+ int i;
phonenum = sanitize(phonenum);
#ifdef DEBUG
diff --git a/usr.bin/tip/aculib/ventel.c b/usr.bin/tip/aculib/ventel.c
index 0628b0e9b9d..04cedc38f48 100644
--- a/usr.bin/tip/aculib/ventel.c
+++ b/usr.bin/tip/aculib/ventel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ventel.c,v 1.5 1997/04/02 01:47:08 millert Exp $ */
+/* $OpenBSD: ventel.c,v 1.6 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: ventel.c,v 1.6 1997/02/11 09:24:21 mrg Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ventel.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: ventel.c,v 1.5 1997/04/02 01:47:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: ventel.c,v 1.6 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
/*
@@ -65,9 +65,10 @@ static void echo();
*/
#define delay(num,denom) busyloop(CPUSPEED*num/denom)
#define CPUSPEED 1000000 /* VAX 780 is 1MIPS */
-#define DELAY(n) { register long N = (n); while (--N > 0); }
-busyloop(n) { DELAY(n); }
+#define DELAY(n) do { register long N = (n); while (--N > 0); } while (0)
+#define busyloop(n) do { DELAY(n); } while (0)
+int
ven_dialer(num, acu)
register char *num;
char *acu;
@@ -106,7 +107,7 @@ ven_dialer(num, acu)
tcflush(FD, TCIOFLUSH);
#ifdef ACULOG
if (timeout) {
- (void)sprintf(line, "%d second dial timeout",
+ (void)sprintf(line, "%ld second dial timeout",
number(value(DIALTIMEOUT)));
logent(value(HOST), num, "ventel", line);
}
@@ -136,12 +137,14 @@ ven_dialer(num, acu)
return (connected);
}
+void
ven_disconnect()
{
close(FD);
}
+void
ven_abort()
{
diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c
index 55026646998..eaebf8de5f2 100644
--- a/usr.bin/tip/cmds.c
+++ b/usr.bin/tip/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.11 2001/09/09 17:58:41 millert Exp $ */
+/* $OpenBSD: cmds.c,v 1.12 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: cmds.c,v 1.7 1997/02/11 09:24:03 mrg Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: cmds.c,v 1.11 2001/09/09 17:58:41 millert Exp $";
+static char rcsid[] = "$OpenBSD: cmds.c,v 1.12 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
#include "tip.h"
@@ -806,7 +806,7 @@ listvariables()
putchar('\n');
break;
case NUMBER:
- printf(" %d\r\n", number(p->v_value));
+ printf(" %ld\r\n", number(p->v_value));
break;
case BOOL:
printf(" %s\r\n",
diff --git a/usr.bin/tip/cu.c b/usr.bin/tip/cu.c
index edb1e9b8d56..8a44845b426 100644
--- a/usr.bin/tip/cu.c
+++ b/usr.bin/tip/cu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cu.c,v 1.9 2001/09/24 17:43:15 millert Exp $ */
+/* $OpenBSD: cu.c,v 1.10 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: cu.c,v 1.5 1997/02/11 09:24:05 mrg Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)cu.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: cu.c,v 1.9 2001/09/24 17:43:15 millert Exp $";
+static char rcsid[] = "$OpenBSD: cu.c,v 1.10 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
#include "tip.h"
@@ -111,7 +111,7 @@ cumain(argc, argv)
DV[strlen(DV)-1] = ch;
break;
default:
- cuusage;
+ cuusage();
break;
}
}
diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c
index bfa760ad2f7..fbceb708ff5 100644
--- a/usr.bin/tip/tip.c
+++ b/usr.bin/tip/tip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tip.c,v 1.13 2001/09/09 19:30:49 millert Exp $ */
+/* $OpenBSD: tip.c,v 1.14 2001/09/26 06:07:28 pvalchev Exp $ */
/* $NetBSD: tip.c,v 1.13 1997/04/20 00:03:05 mellon Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tip.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: tip.c,v 1.13 2001/09/09 19:30:49 millert Exp $";
+static char rcsid[] = "$OpenBSD: tip.c,v 1.14 2001/09/26 06:07:28 pvalchev Exp $";
#endif /* not lint */
/*
@@ -135,7 +135,7 @@ main(argc, argv)
*/
if (strlen(system) > sizeof PNbuf - 1) {
fprintf(stderr, "%s: phone number too long (max = %d bytes)\n",
- __progname, sizeof(PNbuf) - 1);
+ __progname, (int)sizeof(PNbuf) - 1);
exit(1);
}
strncpy( PNbuf, system, sizeof PNbuf - 1 );