shared/install: rename UnitFileChange to InstallChange
It's shorter and more generic. The struct can contain info about changes to unit files, but also symlinks and errors.
This commit is contained in:
@@ -11,7 +11,7 @@ int verb_add_dependency(int argc, char *argv[], void *userdata) {
|
||||
_cleanup_strv_free_ char **names = NULL;
|
||||
_cleanup_free_ char *target = NULL;
|
||||
const char *verb = argv[0];
|
||||
UnitFileChange *changes = NULL;
|
||||
InstallChange *changes = NULL;
|
||||
size_t n_changes = 0;
|
||||
UnitDependency dep;
|
||||
int r;
|
||||
@@ -38,7 +38,7 @@ int verb_add_dependency(int argc, char *argv[], void *userdata) {
|
||||
|
||||
if (install_client_side()) {
|
||||
r = unit_file_add_dependency(arg_scope, unit_file_flags_from_args(), arg_root, names, target, dep, &changes, &n_changes);
|
||||
unit_file_dump_changes(r, "add dependency on", changes, n_changes, arg_quiet);
|
||||
install_changes_dump(r, "add dependency on", changes, n_changes, arg_quiet);
|
||||
|
||||
if (r > 0)
|
||||
r = 0;
|
||||
@@ -84,7 +84,7 @@ int verb_add_dependency(int argc, char *argv[], void *userdata) {
|
||||
}
|
||||
|
||||
finish:
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
install_changes_free(changes, n_changes);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ static int normalize_names(char **names) {
|
||||
int verb_enable(int argc, char *argv[], void *userdata) {
|
||||
_cleanup_strv_free_ char **names = NULL;
|
||||
const char *verb = argv[0];
|
||||
UnitFileChange *changes = NULL;
|
||||
InstallChange *changes = NULL;
|
||||
size_t n_changes = 0;
|
||||
int carries_install_info = -1;
|
||||
bool ignore_carries_install_info = arg_quiet;
|
||||
@@ -127,7 +127,7 @@ int verb_enable(int argc, char *argv[], void *userdata) {
|
||||
else
|
||||
assert_not_reached();
|
||||
|
||||
unit_file_dump_changes(r, verb, changes, n_changes, arg_quiet);
|
||||
install_changes_dump(r, verb, changes, n_changes, arg_quiet);
|
||||
if (r < 0)
|
||||
goto finish;
|
||||
r = 0;
|
||||
@@ -280,7 +280,7 @@ int verb_enable(int argc, char *argv[], void *userdata) {
|
||||
}
|
||||
|
||||
finish:
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
install_changes_free(changes, n_changes);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "systemctl.h"
|
||||
|
||||
static int show_installation_targets_client_side(const char *name) {
|
||||
UnitFileChange *changes = NULL;
|
||||
InstallChange *changes = NULL;
|
||||
size_t n_changes = 0;
|
||||
UnitFileFlags flags;
|
||||
char **p;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
#include "systemctl.h"
|
||||
|
||||
int verb_preset_all(int argc, char *argv[], void *userdata) {
|
||||
UnitFileChange *changes = NULL;
|
||||
InstallChange *changes = NULL;
|
||||
size_t n_changes = 0;
|
||||
int r;
|
||||
|
||||
if (install_client_side()) {
|
||||
r = unit_file_preset_all(arg_scope, unit_file_flags_from_args(), arg_root, arg_preset_mode, &changes, &n_changes);
|
||||
unit_file_dump_changes(r, "preset", changes, n_changes, arg_quiet);
|
||||
install_changes_dump(r, "preset", changes, n_changes, arg_quiet);
|
||||
|
||||
if (r > 0)
|
||||
r = 0;
|
||||
@@ -57,7 +57,7 @@ int verb_preset_all(int argc, char *argv[], void *userdata) {
|
||||
}
|
||||
|
||||
finish:
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
install_changes_free(changes, n_changes);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ int verb_get_default(int argc, char *argv[], void *userdata) {
|
||||
|
||||
int verb_set_default(int argc, char *argv[], void *userdata) {
|
||||
_cleanup_free_ char *unit = NULL;
|
||||
UnitFileChange *changes = NULL;
|
||||
InstallChange *changes = NULL;
|
||||
size_t n_changes = 0;
|
||||
int r;
|
||||
|
||||
@@ -108,7 +108,7 @@ int verb_set_default(int argc, char *argv[], void *userdata) {
|
||||
|
||||
if (install_client_side()) {
|
||||
r = unit_file_set_default(arg_scope, UNIT_FILE_FORCE, arg_root, unit, &changes, &n_changes);
|
||||
unit_file_dump_changes(r, "set default", changes, n_changes, arg_quiet);
|
||||
install_changes_dump(r, "set default", changes, n_changes, arg_quiet);
|
||||
|
||||
if (r > 0)
|
||||
r = 0;
|
||||
@@ -154,7 +154,7 @@ int verb_set_default(int argc, char *argv[], void *userdata) {
|
||||
}
|
||||
|
||||
finish:
|
||||
unit_file_changes_free(changes, n_changes);
|
||||
install_changes_free(changes, n_changes);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user