External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-05 04:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Don't shadow global variable "remove" in cmdMetadata

Browse Source 
Some systems apparently have a global variable/function called remove
and thus break compilation of virsh-domain.c. Rename the variable to
avoid this.

Reported by GuanQiang.
This commit is contained in:
Peter Krempa 2013-09-17 13:40:08 +02:00
parent 0d4f469c87
commit 6bf4c77984
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/virsh-domain.c
View File

@ -6854,7 +6854,7 @@ cmdMetadata(vshControl *ctl, const vshCmd *cmd)
bool live = vshCommandOptBool(cmd, "live"); bool live = vshCommandOptBool(cmd, "live");
bool current = vshCommandOptBool(cmd, "current"); bool current = vshCommandOptBool(cmd, "current");
bool edit = vshCommandOptBool(cmd, "edit"); bool edit = vshCommandOptBool(cmd, "edit");
bool remove = vshCommandOptBool(cmd, "remove"); bool rem = vshCommandOptBool(cmd, "remove");
const char *set = NULL; const char *set = NULL;
const char *uri = NULL; const char *uri = NULL;
const char *key = NULL; const char *key = NULL;
@ -6886,12 +6886,12 @@ cmdMetadata(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
} }
if (set || remove) { if (set || rem) {
if (virDomainSetMetadata(dom, VIR_DOMAIN_METADATA_ELEMENT, if (virDomainSetMetadata(dom, VIR_DOMAIN_METADATA_ELEMENT,
set, key, uri, flags)) set, key, uri, flags))
goto cleanup; goto cleanup;
if (remove) if (rem)
vshPrint("%s\n", _("Metadata removed")); vshPrint("%s\n", _("Metadata removed"));
else else
vshPrint("%s\n", _("Metadata modified")); vshPrint("%s\n", _("Metadata modified"));