From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top
Subject: [PATCH 10/28] Don't shadow global function names
Date: Wed, 28 Sep 2022 14:33:21 +1000 [thread overview]
Message-ID: <20220928043339.613538-11-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20220928043339.613538-1-david@gibson.dropbear.id.au>
[-- Attachment #1: Type: text/plain, Size: 1427 bytes --]
cppcheck points out that qrap's main shadows the global err() function with
a local. Rename it to rc to avoid the clash.
Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
qrap.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/qrap.c b/qrap.c
index da96b22..a7d0645 100644
--- a/qrap.c
+++ b/qrap.c
@@ -115,7 +115,7 @@ void usage(const char *name)
*/
int main(int argc, char **argv)
{
- int i, s, qemu_argc = 0, addr_map = 0, has_dev = 0, retry_on_reset, err;
+ int i, s, qemu_argc = 0, addr_map = 0, has_dev = 0, retry_on_reset, rc;
struct timeval tv = { .tv_sec = 0, .tv_usec = (long)(500 * 1000) };
char *qemu_argv[ARG_MAX], dev_str[ARG_MAX];
struct sockaddr_un addr = {
@@ -281,13 +281,13 @@ retry:
errno = 0;
if (connect(s, (const struct sockaddr *)&addr, sizeof(addr))) {
- err = errno;
+ rc = errno;
perror("connect");
} else if (send(s, &probe, sizeof(probe), 0) != sizeof(probe)) {
- err = errno;
+ rc = errno;
perror("send");
} else if (recv(s, &probe_r, 1, MSG_PEEK) <= 0) {
- err = errno;
+ rc = errno;
perror("recv");
} else {
break;
@@ -315,7 +315,7 @@ retry:
* this FIXME will probably remain until the tool itself is
* obsoleted.
*/
- if (retry_on_reset && err == ECONNRESET) {
+ if (retry_on_reset && rc == ECONNRESET) {
retry_on_reset--;
usleep(50 * 1000);
goto retry;
--
@@ -115,7 +115,7 @@ void usage(const char *name)
*/
int main(int argc, char **argv)
{
- int i, s, qemu_argc = 0, addr_map = 0, has_dev = 0, retry_on_reset, err;
+ int i, s, qemu_argc = 0, addr_map = 0, has_dev = 0, retry_on_reset, rc;
struct timeval tv = { .tv_sec = 0, .tv_usec = (long)(500 * 1000) };
char *qemu_argv[ARG_MAX], dev_str[ARG_MAX];
struct sockaddr_un addr = {
@@ -281,13 +281,13 @@ retry:
errno = 0;
if (connect(s, (const struct sockaddr *)&addr, sizeof(addr))) {
- err = errno;
+ rc = errno;
perror("connect");
} else if (send(s, &probe, sizeof(probe), 0) != sizeof(probe)) {
- err = errno;
+ rc = errno;
perror("send");
} else if (recv(s, &probe_r, 1, MSG_PEEK) <= 0) {
- err = errno;
+ rc = errno;
perror("recv");
} else {
break;
@@ -315,7 +315,7 @@ retry:
* this FIXME will probably remain until the tool itself is
* obsoleted.
*/
- if (retry_on_reset && err == ECONNRESET) {
+ if (retry_on_reset && rc == ECONNRESET) {
retry_on_reset--;
usleep(50 * 1000);
goto retry;
--
2.37.3
next prev parent reply other threads:[~2022-09-28 4:33 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 4:33 [PATCH 00/28] Fixes for static checkers David Gibson
2022-09-28 4:33 ` [PATCH 01/28] Clean up parsing of port ranges David Gibson
2022-09-28 20:57 ` Stefano Brivio
2022-09-29 1:04 ` David Gibson
2022-09-28 4:33 ` [PATCH 02/28] clang-tidy: Suppress warning about unchecked error in logfn macro David Gibson
2022-09-28 4:33 ` [PATCH 03/28] clang-tidy: Fix spurious null pointer warning in pasta_start_ns() David Gibson
2022-09-28 4:33 ` [PATCH 04/28] clang-tidy: Remove duplicate #include from icmp.c David Gibson
2022-09-28 4:33 ` [PATCH 05/28] Catch failures when installing signal handlers David Gibson
2022-09-28 4:33 ` [PATCH 06/28] Pack DHCPv6 "on wire" structures David Gibson
2022-09-28 4:33 ` [PATCH 07/28] Clean up parsing in conf_runas() David Gibson
2022-09-28 20:57 ` Stefano Brivio
2022-09-29 1:44 ` David Gibson
2022-09-28 4:33 ` [PATCH 08/28] cppcheck: Reduce scope of some variables David Gibson
2022-09-28 4:33 ` [PATCH 09/28] Don't shadow 'i' in conf_ports() David Gibson
2022-09-28 4:33 ` David Gibson [this message]
2022-09-28 4:33 ` [PATCH 11/28] Stricter checking for nsholder.c David Gibson
2022-09-28 4:33 ` [PATCH 12/28] cppcheck: Work around false positive NULL pointer dereference error David Gibson
2022-09-28 4:33 ` [PATCH 13/28] cppcheck: Use inline suppression for ffsl() David Gibson
2022-09-28 4:33 ` [PATCH 14/28] cppcheck: Use inline suppressions for qrap.c David Gibson
2022-09-28 4:33 ` [PATCH 15/28] cppcheck: Use inline suppression for strtok() in conf.c David Gibson
2022-09-28 4:33 ` [PATCH 16/28] Avoid ugly 'end' members in netlink structures David Gibson
2022-09-28 4:33 ` [PATCH 17/28] cppcheck: Broaden suppression for unused struct members David Gibson
2022-09-28 4:33 ` [PATCH 18/28] cppcheck: Remove localtime suppression for pcap.c David Gibson
2022-09-28 4:33 ` [PATCH 19/28] qrap: Handle case of PATH environment variable being unset David Gibson
2022-09-28 4:33 ` [PATCH 20/28] cppcheck: Suppress same-value-in-ternary branches warning David Gibson
2022-09-28 20:58 ` Stefano Brivio
2022-09-29 1:00 ` David Gibson
2022-09-28 4:33 ` [PATCH 21/28] cppcheck: Suppress NULL pointer warning in tcp_sock_consume() David Gibson
2022-09-28 20:58 ` Stefano Brivio
2022-09-29 1:07 ` David Gibson
2022-09-28 4:33 ` [PATCH 22/28] Regenerate seccomp.h if seccomp.sh changes David Gibson
2022-09-28 4:33 ` [PATCH 23/28] cppcheck: Avoid errors due to zeroes in bitwise ORs David Gibson
2022-09-28 4:33 ` [PATCH 24/28] cppcheck: Remove unused knownConditionTrueFalse suppression David Gibson
2022-09-28 20:58 ` Stefano Brivio
2022-09-29 1:24 ` David Gibson
2022-09-28 4:33 ` [PATCH 25/28] cppcheck: Remove unused objectIndex suppressions David Gibson
2022-09-28 20:58 ` Stefano Brivio
2022-09-29 1:12 ` David Gibson
2022-09-28 4:33 ` [PATCH 26/28] cppcheck: Remove unused va_list_usedBeforeStarted suppression David Gibson
2022-09-28 4:33 ` [PATCH 27/28] Mark unused functions for cppcheck David Gibson
2022-09-28 4:33 ` [PATCH 28/28] cppcheck: Remove unused unmatchedSuppression suppressions David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220928043339.613538-11-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).