Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/rpc.statd fix bogus %m



details:   https://anonhg.NetBSD.org/src/rev/dbf31a5bafb7
branches:  trunk
changeset: 340080:dbf31a5bafb7
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Aug 21 15:41:38 2015 +0000

description:
fix bogus %m
use EXIT_FAILURE

diffstat:

 usr.sbin/rpc.statd/statd.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r e37a2324eac5 -r dbf31a5bafb7 usr.sbin/rpc.statd/statd.c
--- a/usr.sbin/rpc.statd/statd.c        Fri Aug 21 15:33:04 2015 +0000
+++ b/usr.sbin/rpc.statd/statd.c        Fri Aug 21 15:41:38 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: statd.c,v 1.29 2009/04/18 13:04:50 lukem Exp $ */
+/*     $NetBSD: statd.c,v 1.30 2015/08/21 15:41:38 christos Exp $      */
 
 /*
  * Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: statd.c,v 1.29 2009/04/18 13:04:50 lukem Exp $");
+__RCSID("$NetBSD: statd.c,v 1.30 2015/08/21 15:41:38 christos Exp $");
 #endif
 
 /* main() function for status monitor daemon.  Some of the code in this        */
@@ -119,11 +119,11 @@
        rpc_control(RPC_SVC_CONNMAXREC_SET, &maxrec);
 
        if (!svc_create(sm_prog_1, SM_PROG, SM_VERS, "udp")) {
-               errx(1, "cannot create udp service.");
+               errx(EXIT_FAILURE, "cannot create udp service.");
                /* NOTREACHED */
        }
        if (!svc_create(sm_prog_1, SM_PROG, SM_VERS, "tcp")) {
-               errx(1, "cannot create udp service.");
+               errx(EXIT_FAILURE, "cannot create udp service.");
                /* NOTREACHED */
        }
 
@@ -525,7 +525,7 @@
        db = dbopen(filename, O_RDWR|O_CREAT|O_NDELAY|O_EXLOCK, 0644, DB_HASH, 
            NULL);
        if (db == NULL)
-               err(1, "Cannot open `%s'", filename);
+               err(EXIT_FAILURE, "Cannot open `%s'", filename);
 
        switch ((*db->get)(db, &undefkey, &data, 0)) {
        case 1:
@@ -535,11 +535,11 @@
                return;
 
        case -1:
-               err(1, "error accessing database (%m)");
+               err(EXIT_FAILURE, "error accessing database (%s)", strerror(errno));
        case 0:
                /* Existing database */
                if (data.size != sizeof(status_info))
-                       errx(1, "database corrupted %lu != %lu",
+                       errx(EXIT_FAILURE, "database corrupted %lu != %lu",
                            (u_long)data.size, (u_long)sizeof(status_info));
                memcpy(&status_info, data.data, data.size);
                break;



Home | Main Index | Thread Index | Old Index