Source-Changes-HG archive

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

[src/trunk]: src/external/bsd/blacklist/lib Use %s+strerro(errno) instead of ...



details:   https://anonhg.NetBSD.org/src/rev/99ed8f32130d
branches:  trunk
changeset: 346713:99ed8f32130d
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jul 29 17:13:09 2016 +0000

description:
Use %s+strerro(errno) instead of %m (From Kurt Lidl)

diffstat:

 external/bsd/blacklist/lib/bl.c |  25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diffs (81 lines):

diff -r 0337ff27986f -r 99ed8f32130d external/bsd/blacklist/lib/bl.c
--- a/external/bsd/blacklist/lib/bl.c   Fri Jul 29 15:43:02 2016 +0000
+++ b/external/bsd/blacklist/lib/bl.c   Fri Jul 29 17:13:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bl.c,v 1.27 2015/12/30 16:42:48 christos Exp $ */
+/*     $NetBSD: bl.c,v 1.28 2016/07/29 17:13:09 christos Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: bl.c,v 1.27 2015/12/30 16:42:48 christos Exp $");
+__RCSID("$NetBSD: bl.c,v 1.28 2016/07/29 17:13:09 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -152,8 +152,8 @@
                b->b_fd = socket(PF_LOCAL,
                    SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK|SOCK_NOSIGPIPE, 0);
                if (b->b_fd == -1) {
-                       bl_log(b->b_fun, LOG_ERR, "%s: socket failed (%m)",
-                           __func__);
+                       bl_log(b->b_fun, LOG_ERR, "%s: socket failed (%s)",
+                           __func__, strerror(errno));
                        BL_UNLOCK(b);
                        return -1;
                }
@@ -200,8 +200,8 @@
                         */
                        if (b->b_connected != 1) {
                                bl_log(b->b_fun, LOG_DEBUG,
-                                   "%s: connect failed for `%s' (%m)",
-                                   __func__, sun->sun_path);
+                                   "%s: connect failed for `%s' (%s)",
+                                   __func__, sun->sun_path, strerror(errno));
                                b->b_connected = 1;
                        }
                        BL_UNLOCK(b);
@@ -220,8 +220,8 @@
                errno = serrno;
                if (rv == -1) {
                        bl_log(b->b_fun, LOG_ERR,
-                           "%s: bind failed for `%s' (%m)",
-                           __func__, sun->sun_path);
+                           "%s: bind failed for `%s' (%s)",
+                           __func__, sun->sun_path, strerror(errno));
                        goto out;
                }
        }
@@ -260,7 +260,8 @@
        if (setsockopt(b->b_fd, CRED_LEVEL, CRED_NAME,
            &one, (socklen_t)sizeof(one)) == -1) {
                bl_log(b->b_fun, LOG_ERR, "%s: setsockopt %s "
-                   "failed (%m)", __func__, __STRING(CRED_NAME));
+                   "failed (%s)", __func__, __STRING(CRED_NAME),
+                   strerror(errno));
                goto out;
        }
 #endif
@@ -296,7 +297,8 @@
        return b;
 out:
        free(b);
-       bl_log(fun, LOG_ERR, "%s: malloc failed (%m)", __func__);
+       bl_log(fun, LOG_ERR, "%s: malloc failed (%s)", __func__,
+           strerror(errno));
        return NULL;
 }
 
@@ -451,7 +453,8 @@
 
         rlen = recvmsg(b->b_fd, &msg, 0);
         if (rlen == -1) {
-               bl_log(b->b_fun, LOG_ERR, "%s: recvmsg failed (%m)", __func__);
+               bl_log(b->b_fun, LOG_ERR, "%s: recvmsg failed (%s)", __func__,
+                   strerror(errno));
                return NULL;
         }
 



Home | Main Index | Thread Index | Old Index