Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Jun 2018 11:44:56 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r335638 - head/usr.bin/rusers
Message-ID:  <201806251144.w5PBiu3k033441@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eadler
Date: Mon Jun 25 11:44:56 2018
New Revision: 335638
URL: https://svnweb.freebsd.org/changeset/base/335638

Log:
  rusers: modernize a bit

Modified:
  head/usr.bin/rusers/rusers.c

Modified: head/usr.bin/rusers/rusers.c
==============================================================================
--- head/usr.bin/rusers/rusers.c	Mon Jun 25 11:44:53 2018	(r335637)
+++ head/usr.bin/rusers/rusers.c	Mon Jun 25 11:44:56 2018	(r335638)
@@ -94,9 +94,9 @@ remember_host(struct in_addr addr)
 }
 
 static int
-rusers_reply(caddr_t replyp, struct sockaddr_in *raddrp)
+rusers_reply(void *replyp, struct sockaddr_in *raddrp)
 {
-	u_int x;
+	unsigned int x;
 	int idle;
 	char date[32], idle_time[64], remote[64];
 	struct hostent *hp;
@@ -190,14 +190,14 @@ onehost(char *host)
 	if (rusers_clnt == NULL)
 		errx(1, "%s", clnt_spcreateerror(""));
 
-	bzero((char *)&up, sizeof(up));
+	memset(&up, 0, sizeof(up));
 	tv.tv_sec = 15;	/* XXX ?? */
 	tv.tv_usec = 0;
 	if (clnt_call(rusers_clnt, RUSERSPROC_NAMES, (xdrproc_t)xdr_void, NULL,
 	    (xdrproc_t)xdr_utmpidlearr, &up, tv) != RPC_SUCCESS)
 		errx(1, "%s", clnt_sperror(rusers_clnt, ""));
 	memcpy(&addr.sin_addr.s_addr, hp->h_addr, sizeof(addr.sin_addr.s_addr));
-	rusers_reply((caddr_t)&up, &addr);
+	rusers_reply(&up, &addr);
 	clnt_destroy(rusers_clnt);
 }
 
@@ -207,7 +207,7 @@ allhosts(void)
 	utmpidlearr up;
 	enum clnt_stat clnt_stat;
 
-	bzero((char *)&up, sizeof(up));
+	memset(&up, 0, sizeof(up));
 	clnt_stat = clnt_broadcast(RUSERSPROG, RUSERSVERS_IDLE,
 	    RUSERSPROC_NAMES, (xdrproc_t)xdr_void, NULL,
 	    (xdrproc_t)xdr_utmpidlearr, (char *)&up,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806251144.w5PBiu3k033441>