summaryrefslogtreecommitdiff
path: root/lib/libutil
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2002-06-09 22:18:44 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2002-06-09 22:18:44 +0000
commit76ca910ee5863ed79f83a2b4f217a1df9f47c18b (patch)
tree49171afbff877381a7d0ba448cd7911c7fb951e5 /lib/libutil
parent2fb4e0192533ede27e5237da7214e7d2c7bfbceb (diff)
some -Wall and spaces cleanup, scsi.c left.
some brave soul should look at it.
Diffstat (limited to 'lib/libutil')
-rw-r--r--lib/libutil/check_expire.c4
-rw-r--r--lib/libutil/fparseln.c4
-rw-r--r--lib/libutil/getmaxpartitions.c4
-rw-r--r--lib/libutil/getrawpartition.c6
-rw-r--r--lib/libutil/login.c4
-rw-r--r--lib/libutil/login_tty.c4
-rw-r--r--lib/libutil/logout.c4
-rw-r--r--lib/libutil/logwtmp.c4
-rw-r--r--lib/libutil/opendev.c2
-rw-r--r--lib/libutil/passwd.c4
-rw-r--r--lib/libutil/pty.c10
-rw-r--r--lib/libutil/util.h4
-rw-r--r--lib/libutil/uucplock.c2
13 files changed, 28 insertions, 28 deletions
diff --git a/lib/libutil/check_expire.c b/lib/libutil/check_expire.c
index e782d16a6e2..ddae332586d 100644
--- a/lib/libutil/check_expire.c
+++ b/lib/libutil/check_expire.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: check_expire.c,v 1.5 2002/02/19 19:06:05 mpech Exp $ */
+/* $OpenBSD: check_expire.c,v 1.6 2002/06/09 22:18:43 fgsch Exp $ */
/*
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
@@ -88,7 +88,7 @@ login_check_expire(back, pwd, class, lastchance)
warn = 0;
} else {
dead = login_getcaptime(lc, "password-dead", 0, 0);
- warn = login_getcaptime(lc, "password-warn",
+ warn = login_getcaptime(lc, "password-warn",
2 * DAYSPERWEEK * SECSPERDAY,
2 * DAYSPERWEEK * SECSPERDAY);
if (dead < 0) {
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index 63c4e85121b..ceb1143b049 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/libutil/fparseln.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fparseln.c,v 1.3 2002/02/16 21:27:29 millert Exp $
+/* $OpenBSD: fparseln.c,v 1.4 2002/06/09 22:18:43 fgsch Exp $ */
/* $NetBSD: fparseln.c,v 1.7 1999/07/02 15:49:12 simonb Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fparseln.c,v 1.3 2002/02/16 21:27:29 millert Exp $";
+static const char rcsid[] = "$OpenBSD: fparseln.c,v 1.4 2002/06/09 22:18:43 fgsch Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
diff --git a/lib/libutil/getmaxpartitions.c b/lib/libutil/getmaxpartitions.c
index 0afe6e7ac66..1efab27a090 100644
--- a/lib/libutil/getmaxpartitions.c
+++ b/lib/libutil/getmaxpartitions.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getmaxpartitions.c,v 1.2 1996/06/17 07:46:01 downsj Exp $ */
+/* $OpenBSD: getmaxpartitions.c,v 1.3 2002/06/09 22:18:43 fgsch Exp $ */
/* $NetBSD: getmaxpartitions.c,v 1.1 1996/05/16 07:03:31 thorpej Exp $ */
/*-
@@ -38,7 +38,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: getmaxpartitions.c,v 1.1 1996/05/16 07:03:31 thorpej Exp $";
+static const char rcsid[] = "$NetBSD: getmaxpartitions.c,v 1.1 1996/05/16 07:03:31 thorpej Exp $";
#endif
#include <sys/param.h>
diff --git a/lib/libutil/getrawpartition.c b/lib/libutil/getrawpartition.c
index 346701d1d2c..69a349800ab 100644
--- a/lib/libutil/getrawpartition.c
+++ b/lib/libutil/getrawpartition.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getrawpartition.c,v 1.2 1996/06/17 07:46:02 downsj Exp $ */
+/* $OpenBSD: getrawpartition.c,v 1.3 2002/06/09 22:18:43 fgsch Exp $ */
/* $NetBSD: getrawpartition.c,v 1.1 1996/05/16 07:03:33 thorpej Exp $ */
/*-
@@ -38,7 +38,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: getrawpartition.c,v 1.1 1996/05/16 07:03:33 thorpej Exp $";
+static const char rcsid[] = "$NetBSD: getrawpartition.c,v 1.1 1996/05/16 07:03:33 thorpej Exp $";
#endif
#include <sys/param.h>
@@ -50,7 +50,7 @@ int
getrawpartition()
{
int rawpart, mib[2];
- size_t varlen;
+ size_t varlen;
mib[0] = CTL_KERN;
mib[1] = KERN_RAWPARTITION;
diff --git a/lib/libutil/login.c b/lib/libutil/login.c
index ae76b8a25bd..b82b58d9379 100644
--- a/lib/libutil/login.c
+++ b/lib/libutil/login.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login.c,v 1.6 2001/02/05 09:46:50 deraadt Exp $ */
+/* $OpenBSD: login.c,v 1.7 2002/06/09 22:18:43 fgsch Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,7 +34,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
/* from: static char sccsid[] = "@(#)login.c 8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: login.c,v 1.6 2001/02/05 09:46:50 deraadt Exp $";
+static const char rcsid[] = "$Id: login.c,v 1.7 2002/06/09 22:18:43 fgsch Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
index 8b88f4f6577..b6580eb20f3 100644
--- a/lib/libutil/login_tty.c
+++ b/lib/libutil/login_tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_tty.c,v 1.3 1996/06/17 07:46:02 downsj Exp $ */
+/* $OpenBSD: login_tty.c,v 1.4 2002/06/09 22:18:43 fgsch Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,7 +34,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
/* from: static char sccsid[] = "@(#)login_tty.c 8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: login_tty.c,v 1.3 1996/06/17 07:46:02 downsj Exp $";
+static const char rcsid[] = "$Id: login_tty.c,v 1.4 2002/06/09 22:18:43 fgsch Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
diff --git a/lib/libutil/logout.c b/lib/libutil/logout.c
index ca7c6873d0a..60ac6f87e05 100644
--- a/lib/libutil/logout.c
+++ b/lib/libutil/logout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: logout.c,v 1.4 1998/07/13 02:11:13 millert Exp $ */
+/* $OpenBSD: logout.c,v 1.5 2002/06/09 22:18:43 fgsch Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,7 +34,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
/* from: static char sccsid[] = "@(#)logout.c 8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: logout.c,v 1.4 1998/07/13 02:11:13 millert Exp $";
+static const char rcsid[] = "$Id: logout.c,v 1.5 2002/06/09 22:18:43 fgsch Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libutil/logwtmp.c b/lib/libutil/logwtmp.c
index cc9df123b09..86a0fabcdd7 100644
--- a/lib/libutil/logwtmp.c
+++ b/lib/libutil/logwtmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: logwtmp.c,v 1.4 1999/08/17 09:13:13 millert Exp $ */
+/* $OpenBSD: logwtmp.c,v 1.5 2002/06/09 22:18:43 fgsch Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,7 +34,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
/* from: static char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: logwtmp.c,v 1.4 1999/08/17 09:13:13 millert Exp $";
+static const char rcsid[] = "$Id: logwtmp.c,v 1.5 2002/06/09 22:18:43 fgsch Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libutil/opendev.c b/lib/libutil/opendev.c
index 0042663299f..5e3f9076378 100644
--- a/lib/libutil/opendev.c
+++ b/lib/libutil/opendev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: opendev.c,v 1.6 2000/04/30 17:37:46 millert Exp $ */
+/* $OpenBSD: opendev.c,v 1.7 2002/06/09 22:18:43 fgsch Exp $ */
/*
* Copyright (c) 2000, Todd C. Miller. All rights reserved.
diff --git a/lib/libutil/passwd.c b/lib/libutil/passwd.c
index fa1830d3817..68f718b74c4 100644
--- a/lib/libutil/passwd.c
+++ b/lib/libutil/passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: passwd.c,v 1.33 2002/05/24 21:27:38 deraadt Exp $ */
+/* $OpenBSD: passwd.c,v 1.34 2002/06/09 22:18:43 fgsch Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -34,7 +34,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: passwd.c,v 1.33 2002/05/24 21:27:38 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: passwd.c,v 1.34 2002/06/09 22:18:43 fgsch Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index c2493f2a53b..a03f2c0acc1 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pty.c,v 1.8 2002/05/24 22:04:02 deraadt Exp $ */
+/* $OpenBSD: pty.c,v 1.9 2002/06/09 22:18:43 fgsch Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,7 +34,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
/* from: static char sccsid[] = "@(#)pty.c 8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: pty.c,v 1.8 2002/05/24 22:04:02 deraadt Exp $";
+static const char rcsid[] = "$Id: pty.c,v 1.9 2002/06/09 22:18:43 fgsch Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
@@ -94,10 +94,10 @@ openpty(amaster, aslave, name, termp, winp)
strlcpy(name, line, 16);
}
if (termp)
- (void) tcsetattr(slave,
+ (void) tcsetattr(slave,
TCSAFLUSH, termp);
if (winp)
- (void) ioctl(slave, TIOCSWINSZ,
+ (void) ioctl(slave, TIOCSWINSZ,
(char *)winp);
return (0);
}
@@ -125,7 +125,7 @@ forkpty(amaster, name, termp, winp)
case -1:
return (-1);
case 0:
- /*
+ /*
* child
*/
(void) close(master);
diff --git a/lib/libutil/util.h b/lib/libutil/util.h
index dee86c93f15..7245ed03125 100644
--- a/lib/libutil/util.h
+++ b/lib/libutil/util.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.h,v 1.20 2002/02/17 19:42:26 millert Exp $ */
+/* $OpenBSD: util.h,v 1.21 2002/06/09 22:18:43 fgsch Exp $ */
/* $NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $ */
/*-
@@ -111,7 +111,7 @@ void login_fbtab(char *, uid_t, gid_t);
int login_check_expire(struct __sFILE *, struct passwd *, char *, int);
char *readlabelfs(char *, int);
const char *uu_lockerr(int _uu_lockresult);
-int uu_lock(const char *_ttyname);
+int uu_lock(const char *_ttyname);
int uu_lock_txfr(const char *_ttyname, pid_t _pid);
int uu_unlock(const char *_ttyname);
__END_DECLS
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index ff12b6360ff..bbdf1fa36c1 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -1,4 +1,4 @@
-/* * $OpenBSD: uucplock.c,v 1.9 2002/05/26 09:29:02 deraadt Exp $*/
+/* $OpenBSD: uucplock.c,v 1.10 2002/06/09 22:18:43 fgsch Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:16:16 +0000