External/libvirt
1
0
Fork 0
Code

Remove unnecessary curly brackets in daemon/ and examples/

Browse Source 
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2014-11-13 15:20:27 +01:00
parent e09f9e4c32
commit cfd9c02802
4 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
daemon/libvirtd.c
View File

@ -981,9 +981,8 @@ static int migrateProfile(void)
if (!(home = virGetUserDirectory())) if (!(home = virGetUserDirectory()))
goto cleanup; goto cleanup;
if (virAsprintf(&old_base, "%s/.libvirt", home) < 0) { if (virAsprintf(&old_base, "%s/.libvirt", home) < 0)
goto cleanup; goto cleanup;
}
/* if the new directory is there or the old one is not: do nothing */ /* if the new directory is there or the old one is not: do nothing */
if (!(config_dir = virGetUserConfigDirectory())) if (!(config_dir = virGetUserConfigDirectory()))
@ -998,22 +997,19 @@ static int migrateProfile(void)
} }
/* test if we already attempted to migrate first */ /* test if we already attempted to migrate first */
if (virAsprintf(&updated, "%s/DEPRECATED-DIRECTORY", old_base) < 0) { if (virAsprintf(&updated, "%s/DEPRECATED-DIRECTORY", old_base) < 0)
goto cleanup; goto cleanup;
} if (virFileExists(updated))
if (virFileExists(updated)) {
goto cleanup; goto cleanup;
}
config_home = virGetEnvBlockSUID("XDG_CONFIG_HOME"); config_home = virGetEnvBlockSUID("XDG_CONFIG_HOME");
if (config_home && config_home[0] != '\0') { if (config_home && config_home[0] != '\0') {
if (VIR_STRDUP(xdg_dir, config_home) < 0) if (VIR_STRDUP(xdg_dir, config_home) < 0)
goto cleanup; goto cleanup;
} else { } else {
if (virAsprintf(&xdg_dir, "%s/.config", home) < 0) { if (virAsprintf(&xdg_dir, "%s/.config", home) < 0)
goto cleanup; goto cleanup;
} }
}
old_umask = umask(077); old_umask = umask(077);
if (virFileMakePath(xdg_dir) < 0) { if (virFileMakePath(xdg_dir) < 0) {
@ -1164,9 +1160,8 @@ int main(int argc, char **argv) {
c = getopt_long(argc, argv, "ldf:p:t:vVh", opts, &optidx); c = getopt_long(argc, argv, "ldf:p:t:vVh", opts, &optidx);
if (c == -1) { if (c == -1)
break; break;
}
switch (c) { switch (c) {
case 0: case 0:

12
daemon/remote.c
View File

@ -500,9 +500,8 @@ remoteRelayDomainEventGraphics(virConnectPtr conn,
authScheme, callback->callbackID); authScheme, callback->callbackID);
VIR_DEBUG("Subject %d", subject->nidentity); VIR_DEBUG("Subject %d", subject->nidentity);
for (i = 0; i < subject->nidentity; i++) { for (i = 0; i < subject->nidentity; i++)
VIR_DEBUG(" %s=%s", subject->identities[i].type, subject->identities[i].name); VIR_DEBUG(" %s=%s", subject->identities[i].type, subject->identities[i].name);
}
/* build return data */ /* build return data */
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));
@ -4268,9 +4267,8 @@ remoteDispatchDomainOpenGraphicsFd(virNetServerPtr server ATTRIBUTE_UNUSED,
cleanup: cleanup:
VIR_FORCE_CLOSE(fd); VIR_FORCE_CLOSE(fd);
if (rv < 0) { if (rv < 0)
virNetMessageSaveError(rerr); virNetMessageSaveError(rerr);
}
if (dom) if (dom)
virDomainFree(dom); virDomainFree(dom);
@ -5689,9 +5687,8 @@ remoteDispatchDomainCreateXMLWithFiles(virNetServerPtr server ATTRIBUTE_UNUSED,
rv = 0; rv = 0;
cleanup: cleanup:
for (i = 0; i < nfiles; i++) { for (i = 0; i < nfiles; i++)
VIR_FORCE_CLOSE(files[i]); VIR_FORCE_CLOSE(files[i]);
}
VIR_FREE(files); VIR_FREE(files);
if (rv < 0) if (rv < 0)
virNetMessageSaveError(rerr); virNetMessageSaveError(rerr);
@ -5741,9 +5738,8 @@ static int remoteDispatchDomainCreateWithFiles(virNetServerPtr server ATTRIBUTE_
rv = 0; rv = 0;
cleanup: cleanup:
for (i = 0; i < nfiles; i++) { for (i = 0; i < nfiles; i++)
VIR_FORCE_CLOSE(files[i]); VIR_FORCE_CLOSE(files[i]);
}
VIR_FREE(files); VIR_FREE(files);
if (rv < 0) if (rv < 0)
virNetMessageSaveError(rerr); virNetMessageSaveError(rerr);

3
examples/object-events/event-test.c
View File

@ -730,9 +730,8 @@ int main(int argc, char **argv)
virConnectUnregisterCloseCallback(dconn, connectClose); virConnectUnregisterCloseCallback(dconn, connectClose);
VIR_DEBUG("Closing connection"); VIR_DEBUG("Closing connection");
if (dconn && virConnectClose(dconn) < 0) { if (dconn && virConnectClose(dconn) < 0)
printf("error closing\n"); printf("error closing\n");
}
printf("done\n"); printf("done\n");
return 0; return 0;

9
examples/openauth/openauth.c
View File

@ -132,9 +132,8 @@ showDomains(virConnectPtr conn)
goto out; goto out;
} }
if (numNames > 0) { if (numNames > 0)
printf("Inactive domains:\n"); printf("Inactive domains:\n");
}
for (i = 0; i < numNames; i++) { for (i = 0; i < numNames; i++) {
printf(" %s\n", *(nameList + i)); printf(" %s\n", *(nameList + i));
@ -181,9 +180,8 @@ authCallback(virConnectCredentialPtr cred, unsigned int ncred, void *cbdata)
case VIR_CRED_AUTHNAME: case VIR_CRED_AUTHNAME:
cred[i].result = strdup(authData->username); cred[i].result = strdup(authData->username);
if (cred[i].result == NULL) { if (cred[i].result == NULL)
return -1; return -1;
}
cred[i].resultlen = strlen(cred[i].result); cred[i].resultlen = strlen(cred[i].result);
break; break;
@ -191,9 +189,8 @@ authCallback(virConnectCredentialPtr cred, unsigned int ncred, void *cbdata)
case VIR_CRED_PASSPHRASE: case VIR_CRED_PASSPHRASE:
cred[i].result = strdup(authData->password); cred[i].result = strdup(authData->password);
if (cred[i].result == NULL) { if (cred[i].result == NULL)
return -1; return -1;
}
cred[i].resultlen = strlen(cred[i].result); cred[i].resultlen = strlen(cred[i].result);
break; break;