]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
domain_conf.c: remove two dead stores
authorJim Meyering <meyering@redhat.com>
Fri, 4 Sep 2009 15:27:34 +0000 (17:27 +0200)
committerJim Meyering <meyering@redhat.com>
Mon, 7 Sep 2009 16:13:42 +0000 (18:13 +0200)
* src/domain_conf.c (virDomainSaveXML): Remove use and decl of "err".
(virDomainDefParseXML): Likewise.

src/domain_conf.c

index 8dde5ddf19c0bd66964b1912f82eeb6deb6e8a2d..050cf50aadea43080fd034a9680dccac61bb1033 100644 (file)
@@ -2520,8 +2520,7 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn,
     /* Extract domain uuid */
     tmp = virXPathString(conn, "string(./uuid[1])", ctxt);
     if (!tmp) {
-        int err;
-        if ((err = virUUIDGenerate(def->uuid))) {
+        if (virUUIDGenerate(def->uuid)) {
             virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
                                  "%s", _("Failed to generate UUID"));
             goto error;
@@ -4456,12 +4455,11 @@ int virDomainSaveXML(virConnectPtr conn,
     char *configFile = NULL;
     int fd = -1, ret = -1;
     size_t towrite;
-    int err;
 
     if ((configFile = virDomainConfigFile(conn, configDir, def->name)) == NULL)
         goto cleanup;
 
-    if ((err = virFileMakePath(configDir))) {
+    if (virFileMakePath(configDir)) {
         virReportSystemError(conn, errno,
                              _("cannot create config directory '%s'"),
                              configDir);