File e9f69374-util-don-t-shadow-global-umask-declara... of Package libvirt.1263

Overview Repositories Revisions Requests Users Attributes Meta

File e9f69374-util-don-t-shadow-global-umask-declaration.patch of Package libvirt.1263

From e9f6937454d705deb0ed276d7194dcf12987c2a7 Mon Sep 17 00:00:00 2001
From: Martin Kletzander <mkletzan@redhat.com>
Date: Wed, 3 Sep 2014 15:39:15 +0200
Subject: [PATCH] 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>
---
 src/util/vircommand.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: libvirt-1.2.5/src/util/vircommand.c
===================================================================
--- libvirt-1.2.5.orig/src/util/vircommand.c
+++ libvirt-1.2.5/src/util/vircommand.c
@@ -132,7 +132,7 @@ struct _virCommand {
 #if defined(WITH_SECDRIVER_APPARMOR)
     char *appArmorProfile;
 #endif
-    int umask;
+    int mask;
 };
 
 /* See virCommandSetDryRun for description for this variable */
@@ -510,8 +510,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) {
@@ -986,12 +986,12 @@ virCommandSetMaxFiles(virCommandPtr cmd,
     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;
 }
 
 /**

Places

File e9f69374-util-don-t-shadow-global-umask-declaration.patch of Package libvirt.1263

Places