mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 13:45:38 +00:00
util: don't shadow global umask declaration
Commit 0e1a1a8c
introduced umask for virCommand, but the variables
used emit a warning on older compilers about shadowed global
declaration.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
parent
760cf5d30e
commit
e9f6937454
@ -133,7 +133,7 @@ struct _virCommand {
|
||||
#if defined(WITH_SECDRIVER_APPARMOR)
|
||||
char *appArmorProfile;
|
||||
#endif
|
||||
int umask;
|
||||
int mask;
|
||||
};
|
||||
|
||||
/* See virCommandSetDryRun for description for this variable */
|
||||
@ -583,8 +583,8 @@ virExec(virCommandPtr cmd)
|
||||
|
||||
/* child */
|
||||
|
||||
if (cmd->umask)
|
||||
umask(cmd->umask);
|
||||
if (cmd->mask)
|
||||
umask(cmd->mask);
|
||||
ret = EXIT_CANCELED;
|
||||
openmax = sysconf(_SC_OPEN_MAX);
|
||||
if (openmax < 0) {
|
||||
@ -1085,12 +1085,12 @@ virCommandSetMaxFiles(virCommandPtr cmd, unsigned int files)
|
||||
cmd->maxFiles = files;
|
||||
}
|
||||
|
||||
void virCommandSetUmask(virCommandPtr cmd, int umask)
|
||||
void virCommandSetUmask(virCommandPtr cmd, int mask)
|
||||
{
|
||||
if (!cmd || cmd->has_error)
|
||||
return;
|
||||
|
||||
cmd->umask = umask;
|
||||
cmd->mask = mask;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user