External/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2024-10-01 03:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't shadow global function names

Browse Source 
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@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2022-09-28 14:33:21 +10:00 committed by Stefano Brivio
parent ab96da98cd
commit a668d87e7e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qrap.c
View File

@ -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;