External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote: remove unnecessary return value and if branch

Browse Source 
Function daemonConfigFilePath() will assign a path to
remote_config_file definitely and the path will be validated
in following codes. So, it's unnecessary to return value
from daemonConfigFilePath() and check the returned value.

Signed-off-by: jiangjiacheng <jiangjiacheng@huawei.com>
Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
This commit is contained in:
jiangjiacheng 2022-09-06 21:48:30 +08:00 committed by Michal Privoznik
parent 51f8130d78
commit 381c8dbde0
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/remote/remote_daemon.c
View File

@ -903,11 +903,7 @@ int main(int argc, char **argv) {
/* No explicit config, so try and find a default one */
if (remote_config_file == NULL) {
implicit_conf = true;
if (daemonConfigFilePath(privileged,
&remote_config_file) < 0) {
VIR_ERROR(_("Can't determine config path"));
exit(EXIT_FAILURE);
}
daemonConfigFilePath(privileged, &remote_config_file);
}
/* Read the config file if it exists */

4
src/remote/remote_daemon_config.c
View File

@ -72,7 +72,7 @@ remoteConfigGetAuth(virConf *conf,
return 0;
}
int
void
daemonConfigFilePath(bool privileged, char **configfile)
{
if (privileged) {
@ -84,8 +84,6 @@ daemonConfigFilePath(bool privileged, char **configfile)
*configfile = g_strdup_printf("%s/%s.conf", configdir, DAEMON_NAME);
}
return 0;
}
struct daemonConfig*

2
src/remote/remote_daemon_config.h
View File

@ -99,7 +99,7 @@ struct daemonConfig {
};
int daemonConfigFilePath(bool privileged, char **configfile);
void daemonConfigFilePath(bool privileged, char **configfile);
struct daemonConfig* daemonConfigNew(bool privileged);
void daemonConfigFree(struct daemonConfig *data);
int daemonConfigLoadFile(struct daemonConfig *data,