SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemctl: systematically rename verb entrypoints verb_xyz()

Browse Source 
Let's clean up our function naming a bit, and always name the
verb_xyz(), where the xyz maps to the command line verb as closely as
possible.

No actual code changes, just an attempt to make the systemctl sources a
bit more systematic, and less surprising.
This commit is contained in:
Lennart Poettering
2022-02-22 14:15:07 +01:00
parent c972880640
commit 32baf64d5a
58 changed files with 167 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemctl/systemctl-enable.c
+4 -4
View File
@@ -62,7 +62,7 @@ static int normalize_names(char **names, bool warn_if_path) {
return 0;
}
int enable_unit(int argc, char *argv[], void *userdata) {
int verb_enable(int argc, char *argv[], void *userdata) {
_cleanup_strv_free_ char **names = NULL;
const char *verb = argv[0];
UnitFileChange *changes = NULL;
@@ -86,7 +86,7 @@ int enable_unit(int argc, char *argv[], void *userdata) {
if (strv_isempty(names)) {
if (arg_no_reload || install_client_side())
return 0;
return daemon_reload(argc, argv, userdata);
return verb_daemon_reload(argc, argv, userdata);
}
if (streq(verb, "disable")) {
@@ -235,7 +235,7 @@ int enable_unit(int argc, char *argv[], void *userdata) {
/* Try to reload if enabled */
if (!arg_no_reload)
r = daemon_reload(argc, argv, userdata);
r = verb_daemon_reload(argc, argv, userdata);
else
r = 0;
}
@@ -273,7 +273,7 @@ int enable_unit(int argc, char *argv[], void *userdata) {
new_args[i + 1] = basename(names[i]);
new_args[i + 1] = NULL;
r = start_unit(len + 1, new_args, userdata);
r = verb_start(len + 1, new_args, userdata);
}
}