From patchwork Sun Dec 17 03:55:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 849589 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pEoxmhV8"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ALJpRDoR"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yzr1G5f4rz9sCZ for ; Sun, 17 Dec 2017 14:55:43 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=61ACywlZPFyToRYMQHfWEWgYD+UX2caq4loH1jDQdvU=; b=pEoxmhV8Fpg9y/ ZU98AEXbNHfS1FcGmh1ZyOHtAC/7BzfT6rA/DseJej+9O2gElLTIVz7FqzWeA6a6RwIHwG+SyL0Ye aghjvkGAUoBCEADCCphXkuR3I0qCuqx+ten0ji5KVKyH4So6ivOyya1m5Nj8woDNba5RoJMGkKiWG lDtXjIyhvSKmeCHcfiWfUClmf6cWCHIPy/dBbhF17QD6nRnGgpXzolVC6H4efi7OMzl+f/HVQzHl4 zIQHVZ1G6lyhflZeslRr1Jolq5H3y3mud8K3TBp4INof6zGF3Kqy78pGq8ak8MAw/UDz1eRMjr6C9 0ioyq77BF00gJeT+cIqw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eQQ37-00086K-J5; Sun, 17 Dec 2017 03:55:37 +0000 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eQQ33-00080t-UI for lede-dev@lists.infradead.org; Sun, 17 Dec 2017 03:55:36 +0000 Received: by mail-pg0-x242.google.com with SMTP id j4so7874105pgp.1 for ; Sat, 16 Dec 2017 19:55:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=BHwvjZAwDcts9Vyc2q0+XjPGMjjx8VoPPyvmNo8JSZQ=; b=ALJpRDoR9yFnGKaGMjJ8w/gNkgowlsrtr6A+pqxoyHA2HvEgMJibFQjvZqUUiwZ7Tc QZKiNK51yg0QvNNb7vyTmLpVROVRGu4qFn9VavtW0ihezLGOd90SUxDWhZoHWD3QhGro A8M/CpuXuYfPUPPoCOY6ZaX18VlvkgbduwaJgER9Kem+ynWC5FrF4x6Ne09Xk4KpJzJM 1RoYRHcoYldSZA3XVPOAb4vhMWzMaR9uxi5mlHevd3eE5Wu1SR+fj08vA9WA18FY9C2n XwPa7w4jYQ6JlBzfYBDpRszpYbOlSS/gCSvfNprpQ/xCk6+8Y40q0oPZINHQD3OW1Gig iR3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BHwvjZAwDcts9Vyc2q0+XjPGMjjx8VoPPyvmNo8JSZQ=; b=QpzfLZuUItxxYSb5MiKiFATsy54TZDM9lVpNjDYNFMrwl/1eqDYtkB8DXIN9wuVDRO QCPMDIqYXiVx18+rU5v8d2s50a1KCeVGTgu/zdHFVG2V3MsVsog3UEC7p22R+Z9Q7/w3 0Xac9ESRCbxniUVK0ObOI+6WY5jBh3W9qI01AoMCK42QpGZynQ7vGj18smRN1ygf2CYu M2BaAJwG8uGGxeIKj7LeXyLuyYwcyB6ZluwgmhIpD385tw9Mno/Bc6Pb4UQm5bQXskJ0 1WlQL7nPy9eWcFMgC1pqb4mHBTa1l5522L9EsM+X6JQ47zJqKTzNVbBEuO36TLJJTFX3 Dj2w== X-Gm-Message-State: AKGB3mIAHEegXvoFrmaju+yj1LN2xwdi3+Thrp9i8BOpErYh/Tg70ycP 18gs7px4rqk+fDX5j+IOE+HRnYc+ X-Google-Smtp-Source: ACJfBouVptrwX/UKYw2iU01J+OfikSk437ih63nrRecAOzGd21751ZOsOG0vftJ8qStOAEK4imA5JA== X-Received: by 10.98.73.142 with SMTP id r14mr18081591pfi.223.1513482911250; Sat, 16 Dec 2017 19:55:11 -0800 (PST) Received: from DESKTOP-CEH0M93.lan ([2001:470:1f05:c3e:1832:b9e8:6e4b:cea4]) by smtp.gmail.com with ESMTPSA id j6sm20052751pfk.152.2017.12.16.19.55.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 16 Dec 2017 19:55:10 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Sat, 16 Dec 2017 19:55:04 -0800 Message-Id: <1513482904-28682-1-git-send-email-rosenp@gmail.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171216_195534_062403_7405F1C1 X-CRM114-Status: GOOD ( 10.80 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c05:0:0:0:242 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH] odhcpd: Replace strerror(errno) with %m format X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rosen Penev MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Saves a few bytes. Signed-off-by: Rosen Penev --- src/config.c | 2 +- src/dhcpv4.c | 6 ++---- src/dhcpv6.c | 6 ++---- src/ndp.c | 7 +++---- src/netlink.c | 4 ++-- src/odhcpd.c | 4 ++-- src/router.c | 5 ++--- src/ubus.c | 2 +- 8 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/config.c b/src/config.c index bb885d0..9bbb773 100644 --- a/src/config.c +++ b/src/config.c @@ -184,7 +184,7 @@ static int mkdir_p(char *dir, mode_t mask) return 0; if (ret) - syslog(LOG_ERR, "mkdir(%s, %d) failed: %s\n", dir, mask, strerror(errno)); + syslog(LOG_ERR, "mkdir(%s, %d) failed: %m\n", dir, mask); return ret; } diff --git a/src/dhcpv4.c b/src/dhcpv4.c index c367507..db5f138 100644 --- a/src/dhcpv4.c +++ b/src/dhcpv4.c @@ -86,8 +86,7 @@ int dhcpv4_setup_interface(struct interface *iface, bool enable) int sock = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP); if (sock < 0) { - syslog(LOG_ERR, "Failed to create DHCPv4 server socket: %s", - strerror(errno)); + syslog(LOG_ERR, "Failed to create DHCPv4 server socket: %m"); return -1; } @@ -110,8 +109,7 @@ int dhcpv4_setup_interface(struct interface *iface, bool enable) {INADDR_ANY}, {0}}; if (bind(sock, (struct sockaddr*)&bind_addr, sizeof(bind_addr))) { - syslog(LOG_ERR, "Failed to open DHCPv4 server socket: %s", - strerror(errno)); + syslog(LOG_ERR, "Failed to open DHCPv4 server socket: %m"); return -1; } diff --git a/src/dhcpv6.c b/src/dhcpv6.c index 462a85e..e092c10 100644 --- a/src/dhcpv6.c +++ b/src/dhcpv6.c @@ -53,8 +53,7 @@ int dhcpv6_setup_interface(struct interface *iface, bool enable) if (enable && iface->dhcpv6) { int sock = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP); if (sock < 0) { - syslog(LOG_ERR, "Failed to create DHCPv6 server socket: %s", - strerror(errno)); + syslog(LOG_ERR, "Failed to create DHCPv6 server socket: %m"); return -1; } @@ -76,8 +75,7 @@ int dhcpv6_setup_interface(struct interface *iface, bool enable) 0, IN6ADDR_ANY_INIT, 0}; if (bind(sock, (struct sockaddr*)&bind_addr, sizeof(bind_addr))) { - syslog(LOG_ERR, "Failed to open DHCPv6 server socket: %s", - strerror(errno)); + syslog(LOG_ERR, "Failed to open DHCPv6 server socket: %m"); return -1; } diff --git a/src/ndp.c b/src/ndp.c index d589066..72fd3bc 100644 --- a/src/ndp.c +++ b/src/ndp.c @@ -62,7 +62,7 @@ int ndp_init(void) // Open ICMPv6 socket ping_socket = socket(AF_INET6, SOCK_RAW | SOCK_CLOEXEC, IPPROTO_ICMPV6); if (ping_socket < 0) { - syslog(LOG_ERR, "Unable to open raw socket: %s", strerror(errno)); + syslog(LOG_ERR, "Unable to open raw socket: %m"); return -1; } @@ -113,8 +113,7 @@ int ndp_setup_interface(struct interface *iface, bool enable) int sock = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC, htons(ETH_P_IPV6)); if (sock < 0) { - syslog(LOG_ERR, "Unable to open packet socket: %s", - strerror(errno)); + syslog(LOG_ERR, "Unable to open packet socket: %m"); ret = -1; goto out; } @@ -126,7 +125,7 @@ int ndp_setup_interface(struct interface *iface, bool enable) if (setsockopt(sock, SOL_SOCKET, SO_ATTACH_FILTER, &bpf_prog, sizeof(bpf_prog))) { - syslog(LOG_ERR, "Failed to set BPF: %s", strerror(errno)); + syslog(LOG_ERR, "Failed to set BPF: %m"); ret = -1; goto out; } diff --git a/src/netlink.c b/src/netlink.c index ca9376e..e9fd04a 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -58,13 +58,13 @@ int netlink_init(void) { rtnl_socket = create_socket(NETLINK_ROUTE); if (!rtnl_socket) { - syslog(LOG_ERR, "Unable to open nl socket: %s", strerror(errno)); + syslog(LOG_ERR, "Unable to open nl socket: %m"); goto err; } rtnl_event.sock = create_socket(NETLINK_ROUTE); if (!rtnl_event.sock) { - syslog(LOG_ERR, "Unable to open nl event socket: %s", strerror(errno)); + syslog(LOG_ERR, "Unable to open nl event socket: %m"); goto err; } diff --git a/src/odhcpd.c b/src/odhcpd.c index 97a6de9..8c1273c 100644 --- a/src/odhcpd.c +++ b/src/odhcpd.c @@ -187,8 +187,8 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest, ssize_t sent = sendmsg(socket, &msg, MSG_DONTWAIT); if (sent < 0) - syslog(LOG_NOTICE, "Failed to send to %s%%%s (%s)", - ipbuf, iface->ifname, strerror(errno)); + syslog(LOG_NOTICE, "Failed to send to %s%%%s (%m)", + ipbuf, iface->ifname); else syslog(LOG_DEBUG, "Sent %li bytes to %s%%%s", (long)sent, ipbuf, iface->ifname); diff --git a/src/router.c b/src/router.c index c35cd12..f6d99a8 100644 --- a/src/router.c +++ b/src/router.c @@ -48,7 +48,7 @@ int router_init(void) // Open ICMPv6 socket int sock = socket(AF_INET6, SOCK_RAW | SOCK_CLOEXEC, IPPROTO_ICMPV6); if (sock < 0 && errno != EAFNOSUPPORT) { - syslog(LOG_ERR, "Failed to open RAW-socket: %s", strerror(errno)); + syslog(LOG_ERR, "Failed to open RAW-socket: %m"); return -1; } @@ -82,8 +82,7 @@ int router_init(void) odhcpd_register(&router_event); if (!(fp_route = fopen("/proc/net/ipv6_route", "r"))) - syslog(LOG_ERR, "Failed to open routing table: %s", - strerror(errno)); + syslog(LOG_ERR, "Failed to open routing table: %m"); netlink_add_netevent_handler(&router_netevent_handler); diff --git a/src/ubus.c b/src/ubus.c index 19b14be..6af5911 100644 --- a/src/ubus.c +++ b/src/ubus.c @@ -412,7 +412,7 @@ bool ubus_has_prefix(const char *name, const char *ifname) int ubus_init(void) { if (!(ubus = ubus_connect(NULL))) { - syslog(LOG_ERR, "Unable to connect to ubus: %s", strerror(errno)); + syslog(LOG_ERR, "Unable to connect to ubus: %m"); return -1; }