diff options
-rw-r--r-- | sbin/ldconfig/ldconfig.c | 9 | ||||
-rw-r--r-- | sbin/mount_portal/conf.c | 4 | ||||
-rw-r--r-- | sbin/mount_portalfs/conf.c | 4 | ||||
-rw-r--r-- | sbin/mountd/mountd.c | 4 | ||||
-rw-r--r-- | sbin/nos-tun/nos-tun.c | 4 | ||||
-rw-r--r-- | sbin/slattach/slattach.c | 6 | ||||
-rw-r--r-- | sbin/startslip/startslip.c | 5 | ||||
-rw-r--r-- | usr.sbin/mount_portalfs/conf.c | 4 | ||||
-rw-r--r-- | usr.sbin/mountd/mountd.c | 4 |
9 files changed, 24 insertions, 20 deletions
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index 301a871..197cf78 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -30,7 +30,7 @@ #ifndef lint static const char rcsid[] = - "$Id$"; + "$Id: ldconfig.c,v 1.23 1998/07/06 07:02:26 charnier Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -381,7 +381,7 @@ buildhints() if (verbose) printf("Totals: entries %d, buckets %ld, string size %d\n", - nhints, hdr.hh_nbucket, strtab_sz); + nhints, (long)hdr.hh_nbucket, strtab_sz); /* Allocate buckets and string table */ blist = (struct hints_bucket *)xmalloc(n); @@ -511,13 +511,14 @@ readhints() hdr = (struct hints_header *)addr; if (HH_BADMAG(*hdr)) { - warnx("%s: bad magic: %lo", hints_file, hdr->hh_magic); + warnx("%s: bad magic: %lo", hints_file, + (unsigned long)hdr->hh_magic); return -1; } if (hdr->hh_version != LD_HINTS_VERSION_1 && hdr->hh_version != LD_HINTS_VERSION_2) { - warnx("unsupported version: %ld", hdr->hh_version); + warnx("unsupported version: %ld", (long)hdr->hh_version); return -1; } diff --git a/sbin/mount_portal/conf.c b/sbin/mount_portal/conf.c index 3b0d965..373e62d 100644 --- a/sbin/mount_portal/conf.c +++ b/sbin/mount_portal/conf.c @@ -39,7 +39,7 @@ #ifndef lint static const char rcsid[] = - "$Id$"; + "$Id: conf.c,v 1.6 1998/07/06 07:19:24 charnier Exp $"; #endif /* not lint */ #include <errno.h> @@ -206,7 +206,7 @@ int lno; if (val) { char errbuf[_POSIX2_LINE_MAX]; regerror(val, &p->p_rx, errbuf, sizeof errbuf); - syslog(LOG_ERR, "%s:%s: regcomp %s: %s", + syslog(LOG_ERR, "%s:%d: regcomp %s: %s", conf_file, curp->p_lno, curp->p_key, errbuf); regfree(&p->p_rx); p->p_rxvalid = 0; diff --git a/sbin/mount_portalfs/conf.c b/sbin/mount_portalfs/conf.c index 3b0d965..373e62d 100644 --- a/sbin/mount_portalfs/conf.c +++ b/sbin/mount_portalfs/conf.c @@ -39,7 +39,7 @@ #ifndef lint static const char rcsid[] = - "$Id$"; + "$Id: conf.c,v 1.6 1998/07/06 07:19:24 charnier Exp $"; #endif /* not lint */ #include <errno.h> @@ -206,7 +206,7 @@ int lno; if (val) { char errbuf[_POSIX2_LINE_MAX]; regerror(val, &p->p_rx, errbuf, sizeof errbuf); - syslog(LOG_ERR, "%s:%s: regcomp %s: %s", + syslog(LOG_ERR, "%s:%d: regcomp %s: %s", conf_file, curp->p_lno, curp->p_key, errbuf); regfree(&p->p_rx); p->p_rxvalid = 0; diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index abe5476..fe556db 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -45,7 +45,7 @@ static const char copyright[] = static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$Id$"; + "$Id: mountd.c,v 1.32 1998/07/15 06:21:40 charnier Exp $"; #endif /*not lint*/ #include <sys/param.h> @@ -492,7 +492,7 @@ mntsrv(rqstp, transp) else if (log) syslog(LOG_NOTICE, "dump request succeeded from %s", - inet_ntoa(saddrin), dirpath); + inet_ntoa(saddrin)); return; case RPCMNT_UMOUNT: if (sport >= IPPORT_RESERVED && resvport_only) { diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c index 9b9d6d4..20058ca 100644 --- a/sbin/nos-tun/nos-tun.c +++ b/sbin/nos-tun/nos-tun.c @@ -50,7 +50,7 @@ #ifndef lint static const char rcsid[] = - "$Id$"; + "$Id: nos-tun.c,v 1.3 1998/07/15 06:38:53 charnier Exp $"; #endif /* not lint */ #include <fcntl.h> @@ -120,7 +120,7 @@ int tun_open(char *devname, struct sockaddr *ouraddr, char *theiraddr) s = socket(AF_INET, SOCK_DGRAM, 0); if (s < 0) { - syslog(LOG_ERR,"can't open socket - %M"); + syslog(LOG_ERR,"can't open socket - %m"); goto tunc_return; } diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c index 9edf888..892560c 100644 --- a/sbin/slattach/slattach.c +++ b/sbin/slattach/slattach.c @@ -42,7 +42,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)slattach.c 4.6 (Berkeley) 6/1/90";*/ -static char rcsid[] = "$Id: slattach.c,v 1.31 1998/02/20 07:28:50 jb Exp $"; +static char rcsid[] = "$Id: slattach.c,v 1.32 1998/06/28 20:33:36 bde Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -429,7 +429,9 @@ void configure_network() if (unit < 0) unit = new_unit; if (new_unit != unit) { - syslog(LOG_ERR, "slip unit changed from sl%d to sl%d, but no -u CMD was specified!"); + syslog(LOG_ERR, + "slip unit changed from sl%d to sl%d, but no -u CMD was specified!", + unit, new_unit); exit_handler(1); } syslog(LOG_NOTICE,"sl%d connected to %s at %d baud",unit,dev,speed); diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c index b639c00..b893050 100644 --- a/sbin/startslip/startslip.c +++ b/sbin/startslip/startslip.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: startslip.c,v 1.27 1997/12/22 13:46:08 eivind Exp $ + * $Id: startslip.c,v 1.28 1998/06/28 20:40:51 bde Exp $ */ #ifndef lint @@ -251,7 +251,8 @@ restart: sleep(5); } if (logged_in) { - syslog(LOG_INFO, "%s: connection time elapsed: %ld secs", username, conn_time); + syslog(LOG_INFO, "%s: connection time elapsed: %ld secs", + username, (long)conn_time); sprintf(buf, "LINE=%d %s %s down", diali ? (dialc - 1) % diali : 0, downscript ? downscript : "/sbin/ifconfig" , unitname); diff --git a/usr.sbin/mount_portalfs/conf.c b/usr.sbin/mount_portalfs/conf.c index 3b0d965..373e62d 100644 --- a/usr.sbin/mount_portalfs/conf.c +++ b/usr.sbin/mount_portalfs/conf.c @@ -39,7 +39,7 @@ #ifndef lint static const char rcsid[] = - "$Id$"; + "$Id: conf.c,v 1.6 1998/07/06 07:19:24 charnier Exp $"; #endif /* not lint */ #include <errno.h> @@ -206,7 +206,7 @@ int lno; if (val) { char errbuf[_POSIX2_LINE_MAX]; regerror(val, &p->p_rx, errbuf, sizeof errbuf); - syslog(LOG_ERR, "%s:%s: regcomp %s: %s", + syslog(LOG_ERR, "%s:%d: regcomp %s: %s", conf_file, curp->p_lno, curp->p_key, errbuf); regfree(&p->p_rx); p->p_rxvalid = 0; diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index abe5476..fe556db 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -45,7 +45,7 @@ static const char copyright[] = static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$Id$"; + "$Id: mountd.c,v 1.32 1998/07/15 06:21:40 charnier Exp $"; #endif /*not lint*/ #include <sys/param.h> @@ -492,7 +492,7 @@ mntsrv(rqstp, transp) else if (log) syslog(LOG_NOTICE, "dump request succeeded from %s", - inet_ntoa(saddrin), dirpath); + inet_ntoa(saddrin)); return; case RPCMNT_UMOUNT: if (sport >= IPPORT_RESERVED && resvport_only) { |