diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2013-04-30 11:42:57 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2013-04-30 11:42:57 +0000 |
| commit | 2a41efef1807c0b1fe84371807de445b0fffa39f (patch) | |
| tree | a3f6dcf8439d27a3247a173689e3862087245fd9 | |
| parent | ee10a72954f20eac77c06551b267796f86c28146 (diff) | |
Remove unused function argument variables 'len' and 'auth' from
ntp_sendmsg(). They have been removed from the function body in the past
but not from the argument list.
From Maxime Villard
| -rw-r--r-- | usr.sbin/ntpd/client.c | 5 | ||||
| -rw-r--r-- | usr.sbin/ntpd/ntp_msg.c | 5 | ||||
| -rw-r--r-- | usr.sbin/ntpd/ntpd.h | 4 | ||||
| -rw-r--r-- | usr.sbin/ntpd/server.c | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/usr.sbin/ntpd/client.c b/usr.sbin/ntpd/client.c index c6f20a25207..0b59427b4b1 100644 --- a/usr.sbin/ntpd/client.c +++ b/usr.sbin/ntpd/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.89 2011/09/21 15:41:30 phessler Exp $ */ +/* $OpenBSD: client.c,v 1.90 2013/04/30 11:42:56 mglocker Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -186,8 +186,7 @@ client_query(struct ntp_peer *p) p->query->msg.xmttime.fractionl = arc4random(); p->query->xmttime = gettime_corrected(); - if (ntp_sendmsg(p->query->fd, NULL, &p->query->msg, - NTP_MSGSIZE_NOAUTH, 0) == -1) { + if (ntp_sendmsg(p->query->fd, NULL, &p->query->msg) == -1) { p->senderrors++; set_next(p, INTERVAL_QUERY_PATHETIC); p->trustlevel = TRUSTLEVEL_PATHETIC; diff --git a/usr.sbin/ntpd/ntp_msg.c b/usr.sbin/ntpd/ntp_msg.c index 354b89b239e..15920417adb 100644 --- a/usr.sbin/ntpd/ntp_msg.c +++ b/usr.sbin/ntpd/ntp_msg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntp_msg.c,v 1.18 2007/10/19 15:53:57 otto Exp $ */ +/* $OpenBSD: ntp_msg.c,v 1.19 2013/04/30 11:42:56 mglocker Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -40,8 +40,7 @@ ntp_getmsg(struct sockaddr *sa, char *p, ssize_t len, struct ntp_msg *msg) } int -ntp_sendmsg(int fd, struct sockaddr *sa, struct ntp_msg *msg, ssize_t len, - int auth) +ntp_sendmsg(int fd, struct sockaddr *sa, struct ntp_msg *msg) { socklen_t sa_len; ssize_t n; diff --git a/usr.sbin/ntpd/ntpd.h b/usr.sbin/ntpd/ntpd.h index 80ac74042ba..5cce7dd060d 100644 --- a/usr.sbin/ntpd/ntpd.h +++ b/usr.sbin/ntpd/ntpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ntpd.h,v 1.106 2012/09/20 12:43:16 patrick Exp $ */ +/* $OpenBSD: ntpd.h,v 1.107 2013/04/30 11:42:56 mglocker Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -226,7 +226,7 @@ struct ntp_conf_sensor *new_sensor(char *); /* ntp_msg.c */ int ntp_getmsg(struct sockaddr *, char *, ssize_t, struct ntp_msg *); -int ntp_sendmsg(int, struct sockaddr *, struct ntp_msg *, ssize_t, int); +int ntp_sendmsg(int, struct sockaddr *, struct ntp_msg *); /* server.c */ int setup_listeners(struct servent *, struct ntpd_conf *, u_int *); diff --git a/usr.sbin/ntpd/server.c b/usr.sbin/ntpd/server.c index 218524686df..754be380be8 100644 --- a/usr.sbin/ntpd/server.c +++ b/usr.sbin/ntpd/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.36 2011/09/21 15:41:30 phessler Exp $ */ +/* $OpenBSD: server.c,v 1.37 2013/04/30 11:42:56 mglocker Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -210,6 +210,6 @@ server_dispatch(int fd, struct ntpd_conf *lconf) reply.rootdelay = d_to_sfp(lconf->status.rootdelay); reply.refid = lconf->status.refid; - ntp_sendmsg(fd, (struct sockaddr *)&fsa, &reply, size, 0); + ntp_sendmsg(fd, (struct sockaddr *)&fsa, &reply); return (0); } |