diff options
author | des <des@FreeBSD.org> | 2009-09-25 22:45:59 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2009-09-25 22:45:59 +0000 |
commit | bf5117185e83a178d672946c3f7053d0ef92be27 (patch) | |
tree | 394fcfe01b613c0b5b5edbfc414a17c73481ad5d /libexec/rpc.rquotad | |
parent | b79ff8160af6fa640e29ce784e59acd49cd1e7fc (diff) | |
parent | 5c2742e3dae3ef549329b770ec44b16ca930dc1f (diff) | |
download | FreeBSD-src-bf5117185e83a178d672946c3f7053d0ef92be27.zip FreeBSD-src-bf5117185e83a178d672946c3f7053d0ef92be27.tar.gz |
Sync with head
Diffstat (limited to 'libexec/rpc.rquotad')
-rw-r--r-- | libexec/rpc.rquotad/rquotad.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c index 63bb0c7..2499c48 100644 --- a/libexec/rpc.rquotad/rquotad.c +++ b/libexec/rpc.rquotad/rquotad.c @@ -57,8 +57,8 @@ static void cleanup(int sig) { - (void) sig; - (void) rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL); + (void)sig; + (void)rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL); exit(0); } @@ -71,18 +71,17 @@ main(void) socklen_t fromlen; fromlen = sizeof(from); - if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) { + if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) from_inetd = 0; - } if (!from_inetd) { daemon(0, 0); - (void) rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL); + (void)rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL); - (void) signal(SIGINT, cleanup); - (void) signal(SIGTERM, cleanup); - (void) signal(SIGHUP, cleanup); + (void)signal(SIGINT, cleanup); + (void)signal(SIGTERM, cleanup); + (void)signal(SIGHUP, cleanup); } openlog("rpc.rquotad", LOG_CONS|LOG_PID, LOG_DAEMON); @@ -95,10 +94,11 @@ main(void) exit(1); } ok = svc_reg(transp, RQUOTAPROG, RQUOTAVERS, - rquota_service, NULL); - } else + rquota_service, NULL); + } else { ok = svc_create(rquota_service, - RQUOTAPROG, RQUOTAVERS, "udp"); + RQUOTAPROG, RQUOTAVERS, "udp"); + } if (!ok) { syslog(LOG_ERR, "unable to register (RQUOTAPROG, RQUOTAVERS, %s)", @@ -143,7 +143,7 @@ sendquota(struct svc_req *request, SVCXPRT *transp) struct dqblk dqblk; struct timeval timev; - bzero((char *)&getq_args, sizeof(getq_args)); + bzero(&getq_args, sizeof(getq_args)); if (!svc_getargs(transp, (xdrproc_t)xdr_getquota_args, &getq_args)) { svcerr_decode(transp); return; @@ -196,7 +196,7 @@ printerr_reply(SVCXPRT *transp) /* when a reply to a request failed */ caller = (struct sockaddr *)svc_getrpccaller(transp)->buf; getnameinfo(caller, caller->sa_len, name, sizeof (name), - NULL, 0, NI_NUMERICHOST); + NULL, 0, NI_NUMERICHOST); errno = save_errno; if (errno == 0) syslog(LOG_ERR, "couldn't send reply to %s", name); @@ -221,15 +221,13 @@ initfs(void) if (!hasquota(fs, &qfpathname)) continue; - fs_current = (struct fs_stat *) malloc(sizeof(struct fs_stat)); + fs_current = malloc(sizeof(struct fs_stat)); fs_current->fs_next = fs_next; /* next element */ - fs_current->fs_file = - malloc(sizeof(char) * (strlen(fs->fs_file) + 1)); + fs_current->fs_file = malloc(strlen(fs->fs_file) + 1); strcpy(fs_current->fs_file, fs->fs_file); - fs_current->qfpathname = - malloc(sizeof(char) * (strlen(qfpathname) + 1)); + fs_current->qfpathname = malloc(strlen(qfpathname) + 1); strcpy(fs_current->qfpathname, qfpathname); stat(fs_current->fs_file, &st); |