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

bus: s/BusAddress/BusLocator/

Browse Source 
Mechanical rename in response to
https://github.com/systemd/systemd/pull/15331#issuecomment-611472240
This commit is contained in:
Vito Caputo
2020-04-10 09:16:43 +02:00
committed by Zbigniew Jędrzejewski-Szmek
parent 764bffee88
commit a028ef14c9
2 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/bus-util.c
+27 -27
View File
@@ -1406,7 +1406,7 @@ const struct hash_ops bus_message_hash_ops = {
int bus_call_method_async(
sd_bus *bus,
sd_bus_slot **slot,
const BusAddress *address,
const BusLocator *locator,
const char *member,
sd_bus_message_handler_t callback,
void *userdata,
@@ -1415,10 +1415,10 @@ int bus_call_method_async(
va_list ap;
int r;
assert(address);
assert(locator);
va_start(ap, types);
r = sd_bus_call_method_asyncv(bus, slot, address->destination, address->path, address->interface, member, callback, userdata, types, ap);
r = sd_bus_call_method_asyncv(bus, slot, locator->destination, locator->path, locator->interface, member, callback, userdata, types, ap);
va_end(ap);
return r;
@@ -1426,7 +1426,7 @@ int bus_call_method_async(
int bus_call_method(
sd_bus *bus,
const BusAddress *address,
const BusLocator *locator,
const char *member,
sd_bus_error *error,
sd_bus_message **reply,
@@ -1435,10 +1435,10 @@ int bus_call_method(
va_list ap;
int r;
assert(address);
assert(locator);
va_start(ap, types);
r = sd_bus_call_methodv(bus, address->destination, address->path, address->interface, member, error, reply, types, ap);
r = sd_bus_call_methodv(bus, locator->destination, locator->path, locator->interface, member, error, reply, types, ap);
va_end(ap);
return r;
@@ -1446,56 +1446,56 @@ int bus_call_method(
int bus_get_property(
sd_bus *bus,
const BusAddress *address,
const BusLocator *locator,
const char *member,
sd_bus_error *error,
sd_bus_message **reply,
const char *type) {
assert(address);
assert(locator);
return sd_bus_get_property(bus, address->destination, address->path, address->interface, member, error, reply, type);
return sd_bus_get_property(bus, locator->destination, locator->path, locator->interface, member, error, reply, type);
}
int bus_get_property_trivial(
sd_bus *bus,
const BusAddress *address,
const BusLocator *locator,
const char *member,
sd_bus_error *error,
char type, void *ptr) {
assert(address);
assert(locator);
return sd_bus_get_property_trivial(bus, address->destination, address->path, address->interface, member, error, type, ptr);
return sd_bus_get_property_trivial(bus, locator->destination, locator->path, locator->interface, member, error, type, ptr);
}
int bus_get_property_string(
sd_bus *bus,
const BusAddress *address,
const BusLocator *locator,
const char *member,
sd_bus_error *error,
char **ret) {
assert(address);
assert(locator);
return sd_bus_get_property_string(bus, address->destination, address->path, address->interface, member, error, ret);
return sd_bus_get_property_string(bus, locator->destination, locator->path, locator->interface, member, error, ret);
}
int bus_get_property_strv(
sd_bus *bus,
const BusAddress *address,
const BusLocator *locator,
const char *member,
sd_bus_error *error,
char ***ret) {
assert(address);
assert(locator);
return sd_bus_get_property_strv(bus, address->destination, address->path, address->interface, member, error, ret);
return sd_bus_get_property_strv(bus, locator->destination, locator->path, locator->interface, member, error, ret);
}
int bus_set_property(
sd_bus *bus,
const BusAddress *address,
const BusLocator *locator,
const char *member,
sd_bus_error *error,
const char *type, ...) {
@@ -1503,10 +1503,10 @@ int bus_set_property(
va_list ap;
int r;
assert(address);
assert(locator);
va_start(ap, type);
r = sd_bus_set_propertyv(bus, address->destination, address->path, address->interface, member, error, type, ap);
r = sd_bus_set_propertyv(bus, locator->destination, locator->path, locator->interface, member, error, type, ap);
va_end(ap);
return r;
@@ -1515,26 +1515,26 @@ int bus_set_property(
int bus_match_signal(
sd_bus *bus,
sd_bus_slot **ret,
const BusAddress *address,
const BusLocator *locator,
const char *member,
sd_bus_message_handler_t callback,
void *userdata) {
assert(address);
assert(locator);
return sd_bus_match_signal(bus, ret, address->destination, address->path, address->interface, member, callback, userdata);
return sd_bus_match_signal(bus, ret, locator->destination, locator->path, locator->interface, member, callback, userdata);
}
int bus_match_signal_async(
sd_bus *bus,
sd_bus_slot **ret,
const BusAddress *address,
const BusLocator *locator,
const char *member,
sd_bus_message_handler_t callback,
sd_bus_message_handler_t install_callback,
void *userdata) {
assert(address);
assert(locator);
return sd_bus_match_signal_async(bus, ret, address->destination, address->path, address->interface, member, callback, install_callback, userdata);
return sd_bus_match_signal_async(bus, ret, locator->destination, locator->path, locator->interface, member, callback, install_callback, userdata);
}
src/shared/bus-util.h
+11 -11
View File
@@ -22,11 +22,11 @@ typedef enum BusTransport {
_BUS_TRANSPORT_INVALID = -1
} BusTransport;
typedef struct BusAddress {
typedef struct BusLocator {
const char *destination;
const char *path;
const char *interface;
} BusAddress;
} BusLocator;
typedef int (*bus_property_set_t) (sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata);
@@ -189,12 +189,12 @@ extern const struct hash_ops bus_message_hash_ops;
/* Shorthand flavors of the sd-bus convenience helpers with destination,path,interface
* strings encapsulated within a single struct.
*/
int bus_call_method_async(sd_bus *bus, sd_bus_slot **slot, const BusAddress *address, const char *member, sd_bus_message_handler_t callback, void *userdata, const char *types, ...);
int bus_call_method(sd_bus *bus, const BusAddress *address, const char *member, sd_bus_error *error, sd_bus_message **reply, const char *types, ...);
int bus_get_property(sd_bus *bus, const BusAddress *address, const char *member, sd_bus_error *error, sd_bus_message **reply, const char *type);
int bus_get_property_trivial(sd_bus *bus, const BusAddress *address, const char *member, sd_bus_error *error, char type, void *ptr);
int bus_get_property_string(sd_bus *bus, const BusAddress *address, const char *member, sd_bus_error *error, char **ret);
int bus_get_property_strv(sd_bus *bus, const BusAddress *address, const char *member, sd_bus_error *error, char ***ret);
int bus_set_property(sd_bus *bus, const BusAddress *address, const char *member, sd_bus_error *error, const char *type, ...);
int bus_match_signal(sd_bus *bus, sd_bus_slot **ret, const BusAddress *address, const char *member, sd_bus_message_handler_t callback, void *userdata);
int bus_match_signal_async(sd_bus *bus, sd_bus_slot **ret, const BusAddress *address, const char *member, sd_bus_message_handler_t callback, sd_bus_message_handler_t install_callback, void *userdata);
int bus_call_method_async(sd_bus *bus, sd_bus_slot **slot, const BusLocator *locator, const char *member, sd_bus_message_handler_t callback, void *userdata, const char *types, ...);
int bus_call_method(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *error, sd_bus_message **reply, const char *types, ...);
int bus_get_property(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *error, sd_bus_message **reply, const char *type);
int bus_get_property_trivial(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *error, char type, void *ptr);
int bus_get_property_string(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *error, char **ret);
int bus_get_property_strv(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *error, char ***ret);
int bus_set_property(sd_bus *bus, const BusLocator *locator, const char *member, sd_bus_error *error, const char *type, ...);
int bus_match_signal(sd_bus *bus, sd_bus_slot **ret, const BusLocator *locator, const char *member, sd_bus_message_handler_t callback, void *userdata);
int bus_match_signal_async(sd_bus *bus, sd_bus_slot **ret, const BusLocator *locator, const char *member, sd_bus_message_handler_t callback, sd_bus_message_handler_t install_callback, void *userdata);