mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cppcheck: Reduce scope of some variables

Browse source 
Minor style improvement suggested by cppcheck.

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:19 +10:00 committed by Stefano Brivio
parent 68ef4931cb
commit eb5e123038
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch.c
View file

@ -25,7 +25,7 @@
#ifdef __x86_64__ #ifdef __x86_64__
void arch_avx2_exec(char **argv) void arch_avx2_exec(char **argv)
{ {
char exe[PATH_MAX] = { 0 }, new_path[PATH_MAX + sizeof(".avx2")], *p; char exe[PATH_MAX] = { 0 }, *p;
if (readlink("/proc/self/exe", exe, PATH_MAX - 1) < 0) { if (readlink("/proc/self/exe", exe, PATH_MAX - 1) < 0) {
perror("readlink /proc/self/exe"); perror("readlink /proc/self/exe");
@ -37,6 +37,8 @@ void arch_avx2_exec(char **argv)
return; return;
if (__builtin_cpu_supports("avx2")) { if (__builtin_cpu_supports("avx2")) {
char new_path[PATH_MAX + sizeof(".avx2")];
snprintf(new_path, PATH_MAX + sizeof(".avx2"), "%s.avx2", exe); snprintf(new_path, PATH_MAX + sizeof(".avx2"), "%s.avx2", exe);
execve(new_path, argv, environ); execve(new_path, argv, environ);
perror("Can't run AVX2 build, using non-AVX2 version"); perror("Can't run AVX2 build, using non-AVX2 version");

3
netlink.c
View file

@ -147,7 +147,6 @@ unsigned int nl_get_ext_if(sa_family_t af)
}; };
struct nlmsghdr *nh; struct nlmsghdr *nh;
struct rtattr *rta; struct rtattr *rta;
struct rtmsg *rtm;
char buf[BUFSIZ]; char buf[BUFSIZ];
ssize_t n; ssize_t n;
size_t na; size_t na;
@ -158,7 +157,7 @@ unsigned int nl_get_ext_if(sa_family_t af)
nh = (struct nlmsghdr *)buf; nh = (struct nlmsghdr *)buf;
for ( ; NLMSG_OK(nh, n); nh = NLMSG_NEXT(nh, n)) { for ( ; NLMSG_OK(nh, n); nh = NLMSG_NEXT(nh, n)) {
rtm = (struct rtmsg *)NLMSG_DATA(nh); struct rtmsg *rtm = (struct rtmsg *)NLMSG_DATA(nh);
if (rtm->rtm_dst_len || rtm->rtm_family != af) if (rtm->rtm_dst_len || rtm->rtm_family != af)
continue; continue;

5
tap.c
View file

@ -782,12 +782,12 @@ restart:
*/ */
static void tap_sock_unix_init(struct ctx *c) static void tap_sock_unix_init(struct ctx *c)
{ {
int fd = socket(AF_UNIX, SOCK_STREAM, 0), ex; int fd = socket(AF_UNIX, SOCK_STREAM, 0);
struct epoll_event ev = { 0 }; struct epoll_event ev = { 0 };
struct sockaddr_un addr = { struct sockaddr_un addr = {
.sun_family = AF_UNIX, .sun_family = AF_UNIX,
}; };
int i, ret; int i;
if (fd < 0) { if (fd < 0) {
perror("UNIX socket"); perror("UNIX socket");
@ -802,6 +802,7 @@ static void tap_sock_unix_init(struct ctx *c)
for (i = 1; i < UNIX_SOCK_MAX; i++) { for (i = 1; i < UNIX_SOCK_MAX; i++) {
char *path = addr.sun_path; char *path = addr.sun_path;
int ex, ret;
if (*c->sock_path) if (*c->sock_path)
memcpy(path, c->sock_path, UNIX_PATH_MAX); memcpy(path, c->sock_path, UNIX_PATH_MAX);