Merge all the various definitions of the err variable
This commit is contained in:
parent
b94fa5bfcf
commit
1ab32c39d0
1 changed files with 5 additions and 5 deletions
10
main.c
10
main.c
|
@ -62,6 +62,7 @@ char** argdup(int argc, const char** argv)
|
|||
|
||||
int main(int argc, const char** argv)
|
||||
{
|
||||
int err;
|
||||
if (argc == 1)
|
||||
{
|
||||
printf("Usage: pidjail PROGRAM ARGUMENTS...\n"
|
||||
|
@ -72,7 +73,7 @@ int main(int argc, const char** argv)
|
|||
// next fork shall be in a new pid namespace
|
||||
if (unshare(CLONE_NEWPID) != 0)
|
||||
{
|
||||
int err = errno;
|
||||
err = errno;
|
||||
printf("Failed to unshare pid namespace (%d)\n", err);
|
||||
return err;
|
||||
}
|
||||
|
@ -102,7 +103,7 @@ int main(int argc, const char** argv)
|
|||
int status;
|
||||
if (waitpid(pid, &status, 0) == -1)
|
||||
{
|
||||
int err = errno;
|
||||
err = errno;
|
||||
printf("Failed to wait (%d)\n", err);
|
||||
return err;
|
||||
}
|
||||
|
@ -123,7 +124,6 @@ int main(int argc, const char** argv)
|
|||
pid_t first_child = pid;
|
||||
pid_t exited_child;
|
||||
int child_status;
|
||||
int err;
|
||||
|
||||
// Setup forward for SIGTERM
|
||||
pid_child = first_child;
|
||||
|
@ -157,8 +157,8 @@ int main(int argc, const char** argv)
|
|||
|
||||
if (execvp(newargs[0], newargs) == -1)
|
||||
{
|
||||
printf("Failed to exec (%d)\n", errno);
|
||||
return errno;
|
||||
printf("Failed to exec (%d)\n", err);
|
||||
return err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue