tree-wide: Fix declaration/definition parameter name mismatches
This commit is contained in:
committed by
Yu Watanabe
parent
a8374a7607
commit
6a9f0641cd
@@ -10,7 +10,7 @@ typedef enum {
|
||||
|
||||
extern const BusObjectImplementation machine_object;
|
||||
|
||||
char* machine_bus_path(Machine *s);
|
||||
char* machine_bus_path(Machine *m);
|
||||
|
||||
int bus_machine_method_unregister(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
||||
int bus_machine_method_terminate(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
||||
|
||||
@@ -804,16 +804,16 @@ void machine_add_to_gc_queue(Machine *m) {
|
||||
manager_enqueue_gc(m->manager);
|
||||
}
|
||||
|
||||
MachineState machine_get_state(Machine *s) {
|
||||
assert(s);
|
||||
MachineState machine_get_state(Machine *m) {
|
||||
assert(m);
|
||||
|
||||
if (s->class == MACHINE_HOST)
|
||||
if (m->class == MACHINE_HOST)
|
||||
return MACHINE_RUNNING;
|
||||
|
||||
if (s->stopping)
|
||||
if (m->stopping)
|
||||
return MACHINE_CLOSING;
|
||||
|
||||
if (s->scope_job)
|
||||
if (m->scope_job)
|
||||
return MACHINE_OPENING;
|
||||
|
||||
return MACHINE_RUNNING;
|
||||
|
||||
@@ -105,7 +105,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Machine*, machine_free);
|
||||
|
||||
void machine_release_unit(Machine *m);
|
||||
|
||||
MachineState machine_get_state(Machine *u);
|
||||
MachineState machine_get_state(Machine *m);
|
||||
|
||||
const char* machine_class_to_string(MachineClass t) _const_;
|
||||
MachineClass machine_class_from_string(const char *s) _pure_;
|
||||
|
||||
@@ -217,7 +217,7 @@ int machine_get_addresses(Machine *machine, struct local_address **ret_addresses
|
||||
_cleanup_free_ struct local_address *addresses = NULL;
|
||||
int n;
|
||||
|
||||
n = local_addresses(/* rtnl = */ NULL, /* ifindex = */ 0, AF_UNSPEC, &addresses);
|
||||
n = local_addresses(/* context = */ NULL, /* ifindex = */ 0, AF_UNSPEC, &addresses);
|
||||
if (n < 0)
|
||||
return log_debug_errno(n, "Failed to get local addresses: %m");
|
||||
|
||||
@@ -267,7 +267,7 @@ int machine_get_addresses(Machine *machine, struct local_address **ret_addresses
|
||||
|
||||
pair[0] = safe_close(pair[0]);
|
||||
|
||||
int n = local_addresses(/* rtnl = */ NULL, /* ifindex = */ 0, AF_UNSPEC, &addresses);
|
||||
int n = local_addresses(/* context = */ NULL, /* ifindex = */ 0, AF_UNSPEC, &addresses);
|
||||
if (n < 0) {
|
||||
log_debug_errno(n, "Failed to get local addresses: %m");
|
||||
_exit(EXIT_FAILURE);
|
||||
|
||||
@@ -52,8 +52,8 @@ int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *err
|
||||
int manager_stop_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job);
|
||||
int manager_kill_unit(Manager *manager, const char *unit, const char *subgroup, int signo, sd_bus_error *error);
|
||||
int manager_unref_unit(Manager *m, const char *unit, sd_bus_error *error);
|
||||
int manager_unit_is_active(Manager *manager, const char *unit, sd_bus_error *reterr_errno);
|
||||
int manager_job_is_active(Manager *manager, const char *path, sd_bus_error *reterr_errno);
|
||||
int manager_unit_is_active(Manager *manager, const char *unit, sd_bus_error *reterr_error);
|
||||
int manager_job_is_active(Manager *manager, const char *path, sd_bus_error *reterr_error);
|
||||
|
||||
int manager_find_machine_for_uid(Manager *m, uid_t host_uid, Machine **ret_machine, uid_t *ret_internal_uid);
|
||||
int manager_find_machine_for_gid(Manager *m, gid_t host_gid, Machine **ret_machine, gid_t *ret_internal_gid);
|
||||
|
||||
Reference in New Issue
Block a user