openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

domain_conf: silence gcc warnings 

../../src/conf/domain_conf.c:10949: error: declaration of 'socket'
shadows a global declaration [-Wshadow]

../../src/conf/domain_conf.c:24373: error: declaration of 'listen'
shadows a global declaration [-Wshadow]

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-06-10 19:09:29 +02:00
parent ecdff2fd89
commit 13da6ff078
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/conf/domain_conf.c
View File

@ -10946,7 +10946,7 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def,
char *type = virXMLPropString(node, "type"); char *type = virXMLPropString(node, "type");
char *address = virXMLPropString(node, "address"); char *address = virXMLPropString(node, "address");
char *network = virXMLPropString(node, "network"); char *network = virXMLPropString(node, "network");
char *socket = virXMLPropString(node, "socket"); char *socketPath = virXMLPropString(node, "socket");
char *fromConfig = virXMLPropString(node, "fromConfig"); char *fromConfig = virXMLPropString(node, "fromConfig");
char *addressCompat = NULL; char *addressCompat = NULL;
char *socketCompat = NULL; char *socketCompat = NULL;
@ -11012,16 +11012,16 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def,
} }
if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) { if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) {
if (socket && socketCompat && STRNEQ(socket, socketCompat)) { if (socketPath && socketCompat && STRNEQ(socketPath, socketCompat)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("graphics 'socket' attribute '%s' must match " _("graphics 'socket' attribute '%s' must match "
"'socket' attribute of first listen element " "'socket' attribute of first listen element "
"(found '%s')"), socketCompat, socket); "(found '%s')"), socketCompat, socketPath);
goto error; goto error;
} }
if (!socket) { if (!socketPath) {
socket = socketCompat; socketPath = socketCompat;
socketCompat = NULL; socketCompat = NULL;
} }
} }
@ -11045,15 +11045,15 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def,
network = NULL; network = NULL;
} }
if (socket && socket[0]) { if (socketPath && socketPath[0]) {
if (def->type != VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) { if (def->type != VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("'socket' attribute is valid only for listen " _("'socket' attribute is valid only for listen "
"type 'socket'")); "type 'socket'"));
goto error; goto error;
} }
def->socket = socket; def->socket = socketPath;
socket = NULL; socketPath = NULL;
} }
if (fromConfig && if (fromConfig &&
@ -11074,7 +11074,7 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def,
VIR_FREE(type); VIR_FREE(type);
VIR_FREE(address); VIR_FREE(address);
VIR_FREE(network); VIR_FREE(network);
VIR_FREE(socket); VIR_FREE(socketPath);
VIR_FREE(fromConfig); VIR_FREE(fromConfig);
VIR_FREE(addressCompat); VIR_FREE(addressCompat);
VIR_FREE(socketCompat); VIR_FREE(socketCompat);
@ -24368,24 +24368,24 @@ virDomainGraphicsListenAppendAddress(virDomainGraphicsDefPtr def,
int int
virDomainGraphicsListenAppendSocket(virDomainGraphicsDefPtr def, virDomainGraphicsListenAppendSocket(virDomainGraphicsDefPtr def,
const char *socket) const char *socketPath)
{ {
virDomainGraphicsListenDef listen; virDomainGraphicsListenDef glisten;
memset(&listen, 0, sizeof(listen)); memset(&glisten, 0, sizeof(glisten));
listen.type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET; glisten.type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET;
if (VIR_STRDUP(listen.socket, socket) < 0) if (VIR_STRDUP(glisten.socket, socketPath) < 0)
goto error; goto error;
if (VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, listen) < 0) if (VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, glisten) < 0)
goto error; goto error;
return 0; return 0;
error: error:
VIR_FREE(listen.socket); VIR_FREE(glisten.socket);
return -1; return -1;
} }