diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c index 5ae097ba8..3d200bd99 100644 --- a/pipewire-jack/src/pipewire-jack.c +++ b/pipewire-jack/src/pipewire-jack.c @@ -6513,10 +6513,10 @@ int jack_connect (jack_client_t *client, if ((res = check_connect(c, src, dst)) != 1) goto exit; - snprintf(val[0], sizeof(val[0]), "%d", src->port.node_id); - snprintf(val[1], sizeof(val[1]), "%d", src->id); - snprintf(val[2], sizeof(val[2]), "%d", dst->port.node_id); - snprintf(val[3], sizeof(val[3]), "%d", dst->id); + snprintf(val[0], sizeof(val[0]), "%u", src->port.node_id); + snprintf(val[1], sizeof(val[1]), "%u", src->id); + snprintf(val[2], sizeof(val[2]), "%u", dst->port.node_id); + snprintf(val[3], sizeof(val[3]), "%u", dst->id); props = SPA_DICT_INIT(items, 0); items[props.n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_LINK_OUTPUT_NODE, val[0]); diff --git a/src/modules/module-adapter.c b/src/modules/module-adapter.c index 9f5474a08..3325602ac 100644 --- a/src/modules/module-adapter.c +++ b/src/modules/module-adapter.c @@ -184,7 +184,7 @@ static void *create_object(void *_data, if (properties == NULL) goto error_properties; - pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", + pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u", pw_impl_factory_get_info(d->factory)->id); linger = pw_properties_get_bool(properties, PW_KEY_OBJECT_LINGER, false); @@ -196,7 +196,7 @@ static void *create_object(void *_data, client = resource ? pw_resource_get_client(resource): NULL; if (client && !linger) { - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_impl_client_get_info(client)->id); } @@ -343,7 +343,7 @@ static void module_registered(void *data) char id[16]; int res; - snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id); + snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id); items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id); pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1)); diff --git a/src/modules/module-client-device.c b/src/modules/module-client-device.c index c02a4058f..658276eb9 100644 --- a/src/modules/module-client-device.c +++ b/src/modules/module-client-device.c @@ -135,9 +135,9 @@ static void *create_object(void *_data, goto error_properties; } - pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", + pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u", pw_global_get_id(pw_impl_factory_get_global(factory))); - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_global_get_id(pw_impl_client_get_global(client))); result = pw_client_device_new(device_resource, properties); diff --git a/src/modules/module-client-device/resource-device.c b/src/modules/module-client-device/resource-device.c index ca00bfef9..8b3ddea99 100644 --- a/src/modules/module-client-device/resource-device.c +++ b/src/modules/module-client-device/resource-device.c @@ -108,7 +108,7 @@ struct pw_impl_device *pw_client_device_new(struct pw_resource *resource, if (properties == NULL) return NULL; - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_impl_client_get_info(client)->id); device = pw_context_create_device(context, properties, sizeof(struct impl)); diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c index 14fda3a77..1e104429c 100644 --- a/src/modules/module-client-node/client-node.c +++ b/src/modules/module-client-node/client-node.c @@ -1764,7 +1764,7 @@ struct pw_impl_client_node *pw_impl_client_node_new(struct pw_resource *resource goto error_exit_free; } - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", client->global->id); + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", client->global->id); this = &impl->this; diff --git a/src/modules/module-link-factory.c b/src/modules/module-link-factory.c index d54df2758..1f01078e8 100644 --- a/src/modules/module-link-factory.c +++ b/src/modules/module-link-factory.c @@ -485,12 +485,12 @@ static void *create_object(void *_data, linger = pw_properties_get_bool(properties, PW_KEY_OBJECT_LINGER, false); - pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", + pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u", pw_impl_factory_get_info(d->factory)->id); client = resource ? pw_resource_get_client(resource) : NULL; if (client && !linger) - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_impl_client_get_info(client)->id); if (!d->allow_passive) diff --git a/src/modules/module-metadata.c b/src/modules/module-metadata.c index 79d80d1b4..84b98a7ce 100644 --- a/src/modules/module-metadata.c +++ b/src/modules/module-metadata.c @@ -203,9 +203,9 @@ static void *create_object(void *_data, if (properties == NULL) return NULL; - pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", + pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u", pw_impl_factory_get_info(data->factory)->id); - pw_properties_setf(properties, PW_KEY_MODULE_ID, "%d", + pw_properties_setf(properties, PW_KEY_MODULE_ID, "%u", pw_impl_module_get_info(data->module)->id); if (pw_properties_get(properties, PW_KEY_METADATA_NAME) == NULL) @@ -218,7 +218,7 @@ static void *create_object(void *_data, goto error_resource; } - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_impl_client_get_info(client)->id); result = pw_metadata_new(context, metadata_resource, properties); diff --git a/src/modules/module-profiler.c b/src/modules/module-profiler.c index 1709ec9a5..557ca2649 100644 --- a/src/modules/module-profiler.c +++ b/src/modules/module-profiler.c @@ -559,7 +559,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) free(impl); return -errno; } - pw_properties_setf(impl->properties, PW_KEY_OBJECT_ID, "%d", pw_global_get_id(impl->global)); + pw_properties_setf(impl->properties, PW_KEY_OBJECT_ID, "%u", pw_global_get_id(impl->global)); pw_properties_setf(impl->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64, pw_global_get_serial(impl->global)); diff --git a/src/modules/module-protocol-native.c b/src/modules/module-protocol-native.c index 98a43829b..2a0b2f438 100644 --- a/src/modules/module-protocol-native.c +++ b/src/modules/module-protocol-native.c @@ -663,7 +663,7 @@ static struct client_data *client_new(struct server *s, int fd) } #endif - pw_properties_setf(props, PW_KEY_MODULE_ID, "%d", d->module->global->id); + pw_properties_setf(props, PW_KEY_MODULE_ID, "%u", d->module->global->id); client = pw_context_create_client(s->this.core, protocol, props, sizeof(struct client_data)); diff --git a/src/modules/module-session-manager/client-endpoint/client-endpoint.c b/src/modules/module-session-manager/client-endpoint/client-endpoint.c index 4eca40fd8..2a64443e3 100644 --- a/src/modules/module-session-manager/client-endpoint/client-endpoint.c +++ b/src/modules/module-session-manager/client-endpoint/client-endpoint.c @@ -166,9 +166,9 @@ static void *create_object(void *data, if (!properties) goto no_mem; - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_impl_client_get_info(owner)->id); - pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", + pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u", pw_impl_factory_get_info(factory)->id); this->resource = pw_resource_new(owner, new_id, PW_PERM_ALL, type, version, 0); @@ -233,7 +233,7 @@ static void module_registered(void *data) char id[16]; int res; - snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id); + snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id); items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id); pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1)); diff --git a/src/modules/module-session-manager/client-session/client-session.c b/src/modules/module-session-manager/client-session/client-session.c index bb0f011ea..fc6f5857b 100644 --- a/src/modules/module-session-manager/client-session/client-session.c +++ b/src/modules/module-session-manager/client-session/client-session.c @@ -165,9 +165,9 @@ static void *create_object(void *data, if (!properties) goto no_mem; - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_impl_client_get_info(owner)->id); - pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", + pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u", pw_impl_factory_get_info(factory)->id); this->resource = pw_resource_new(owner, new_id, PW_PERM_ALL, type, version, 0); @@ -232,7 +232,7 @@ static void module_registered(void *data) char id[16]; int res; - snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id); + snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id); items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id); pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1)); diff --git a/src/modules/module-session-manager/endpoint-link.c b/src/modules/module-session-manager/endpoint-link.c index 964c5d140..7b21e0071 100644 --- a/src/modules/module-session-manager/endpoint-link.c +++ b/src/modules/module-session-manager/endpoint-link.c @@ -439,9 +439,9 @@ static void *create_object(void *data, goto error_link; } - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_impl_client_get_info(client)->id); - pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", + pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u", pw_impl_factory_get_info(d->factory)->id); result = link_new(pw_impl_client_get_context(client), impl_resource, properties); @@ -507,7 +507,7 @@ static void module_registered(void *data) char id[16]; int res; - snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id); + snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id); items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id); pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1)); diff --git a/src/modules/module-session-manager/endpoint-stream.c b/src/modules/module-session-manager/endpoint-stream.c index c93db3767..2ae855da5 100644 --- a/src/modules/module-session-manager/endpoint-stream.c +++ b/src/modules/module-session-manager/endpoint-stream.c @@ -430,9 +430,9 @@ static void *create_object(void *data, goto error_stream; } - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_impl_client_get_info(client)->id); - pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", + pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u", pw_impl_factory_get_info(d->factory)->id); result = stream_new(pw_impl_client_get_context(client), impl_resource, properties); @@ -498,7 +498,7 @@ static void module_registered(void *data) char id[16]; int res; - snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id); + snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id); items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id); pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1)); diff --git a/src/modules/module-session-manager/endpoint.c b/src/modules/module-session-manager/endpoint.c index 32aa1b16b..f67598bf1 100644 --- a/src/modules/module-session-manager/endpoint.c +++ b/src/modules/module-session-manager/endpoint.c @@ -439,9 +439,9 @@ static void *create_object(void *data, goto error_endpoint; } - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_impl_client_get_info(client)->id); - pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", + pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u", pw_impl_factory_get_info(d->factory)->id); result = endpoint_new(pw_impl_client_get_context(client), impl_resource, properties); @@ -507,7 +507,7 @@ static void module_registered(void *data) char id[16]; int res; - snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id); + snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id); items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id); pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1)); diff --git a/src/modules/module-session-manager/session.c b/src/modules/module-session-manager/session.c index de1fb4360..6a0ed02d8 100644 --- a/src/modules/module-session-manager/session.c +++ b/src/modules/module-session-manager/session.c @@ -428,9 +428,9 @@ static void *create_object(void *data, goto error_session; } - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_impl_client_get_info(client)->id); - pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", + pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u", pw_impl_factory_get_info(d->factory)->id); result = session_new(pw_impl_client_get_context(client), impl_resource, properties); @@ -495,7 +495,7 @@ static void module_registered(void *data) char id[16]; int res; - snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id); + snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id); items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id); pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1)); diff --git a/src/modules/module-spa-device-factory.c b/src/modules/module-spa-device-factory.c index a3b08a285..1acc63dd7 100644 --- a/src/modules/module-spa-device-factory.c +++ b/src/modules/module-spa-device-factory.c @@ -104,13 +104,13 @@ static void *create_object(void *_data, if ((factory_name = strdup(str)) == NULL) goto error_properties; - pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", + pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u", pw_global_get_id(pw_impl_factory_get_global(data->factory))); client = resource ? pw_resource_get_client(resource) : NULL; if (client) { - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_global_get_id(pw_impl_client_get_global(client))); } diff --git a/src/modules/module-spa-node-factory.c b/src/modules/module-spa-node-factory.c index c7fedd47e..87ff3fd45 100644 --- a/src/modules/module-spa-node-factory.c +++ b/src/modules/module-spa-node-factory.c @@ -209,14 +209,14 @@ static void *create_object(void *_data, if (factory_name == NULL) goto error_properties; - pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", + pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u", pw_global_get_id(pw_impl_factory_get_global(data->factory))); linger = pw_properties_get_bool(properties, PW_KEY_OBJECT_LINGER, false); client = resource ? pw_resource_get_client(resource) : NULL; if (client && !linger) { - pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", + pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", pw_global_get_id(pw_impl_client_get_global(client))); } diff --git a/src/pipewire/impl-client.c b/src/pipewire/impl-client.c index a13a40a5a..6566d1a51 100644 --- a/src/pipewire/impl-client.c +++ b/src/pipewire/impl-client.c @@ -557,7 +557,7 @@ int pw_impl_client_register(struct pw_impl_client *client, client->registered = true; client->info.id = client->global->id; - pw_properties_setf(client->properties, PW_KEY_OBJECT_ID, "%d", client->info.id); + pw_properties_setf(client->properties, PW_KEY_OBJECT_ID, "%u", client->info.id); pw_properties_setf(client->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64, pw_global_get_serial(client->global)); pw_global_add_listener(client->global, &client->global_listener, &global_events, client); diff --git a/src/pipewire/impl-core.c b/src/pipewire/impl-core.c index 3a43a8e88..3e5f0db8e 100644 --- a/src/pipewire/impl-core.c +++ b/src/pipewire/impl-core.c @@ -600,7 +600,7 @@ int pw_impl_core_register(struct pw_impl_core *core, core->registered = true; core->info.id = core->global->id; - pw_properties_setf(core->properties, PW_KEY_OBJECT_ID, "%d", core->info.id); + pw_properties_setf(core->properties, PW_KEY_OBJECT_ID, "%u", core->info.id); pw_properties_setf(core->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64, pw_global_get_serial(core->global)); diff --git a/src/pipewire/impl-device.c b/src/pipewire/impl-device.c index 53b76b236..281199519 100644 --- a/src/pipewire/impl-device.c +++ b/src/pipewire/impl-device.c @@ -612,7 +612,7 @@ int pw_impl_device_register(struct pw_impl_device *device, device->registered = true; device->info.id = device->global->id; - pw_properties_setf(device->properties, PW_KEY_OBJECT_ID, "%d", device->info.id); + pw_properties_setf(device->properties, PW_KEY_OBJECT_ID, "%u", device->info.id); pw_properties_setf(device->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64, pw_global_get_serial(device->global)); diff --git a/src/pipewire/impl-factory.c b/src/pipewire/impl-factory.c index 9a8e1c508..99900db47 100644 --- a/src/pipewire/impl-factory.c +++ b/src/pipewire/impl-factory.c @@ -185,7 +185,7 @@ int pw_impl_factory_register(struct pw_impl_factory *factory, factory->registered = true; factory->info.id = factory->global->id; - pw_properties_setf(factory->properties, PW_KEY_OBJECT_ID, "%d", factory->info.id); + pw_properties_setf(factory->properties, PW_KEY_OBJECT_ID, "%u", factory->info.id); pw_properties_setf(factory->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64, pw_global_get_serial(factory->global)); pw_properties_set(factory->properties, PW_KEY_FACTORY_NAME, factory->info.name); diff --git a/src/pipewire/impl-link.c b/src/pipewire/impl-link.c index 6eae5e6c7..9abc7c481 100644 --- a/src/pipewire/impl-link.c +++ b/src/pipewire/impl-link.c @@ -1687,7 +1687,7 @@ int pw_impl_link_register(struct pw_impl_link *link, link->registered = true; link->info.id = link->global->id; - pw_properties_setf(link->properties, PW_KEY_OBJECT_ID, "%d", link->info.id); + pw_properties_setf(link->properties, PW_KEY_OBJECT_ID, "%u", link->info.id); pw_properties_setf(link->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64, pw_global_get_serial(link->global)); pw_properties_setf(link->properties, PW_KEY_LINK_OUTPUT_NODE, "%u", link->info.output_node_id); diff --git a/src/pipewire/impl-module.c b/src/pipewire/impl-module.c index 54db8f868..f754dd9b5 100644 --- a/src/pipewire/impl-module.c +++ b/src/pipewire/impl-module.c @@ -235,7 +235,7 @@ pw_context_load_module(struct pw_context *context, goto error_no_global; this->info.id = this->global->id; - pw_properties_setf(this->properties, PW_KEY_OBJECT_ID, "%d", this->info.id); + pw_properties_setf(this->properties, PW_KEY_OBJECT_ID, "%u", this->info.id); pw_properties_setf(this->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64, pw_global_get_serial(this->global)); diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c index fb9cf56e4..e38b1640e 100644 --- a/src/pipewire/impl-node.c +++ b/src/pipewire/impl-node.c @@ -988,7 +988,7 @@ int pw_impl_node_register(struct pw_impl_node *this, this->from_driver_peer = pw_node_peer_ref(this, this); this->to_driver_peer = pw_node_peer_ref(this, this); - pw_properties_setf(this->properties, PW_KEY_OBJECT_ID, "%d", this->global->id); + pw_properties_setf(this->properties, PW_KEY_OBJECT_ID, "%u", this->global->id); pw_properties_setf(this->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64, pw_global_get_serial(this->global)); diff --git a/src/pipewire/impl-port.c b/src/pipewire/impl-port.c index 9b5855029..19bd631e2 100644 --- a/src/pipewire/impl-port.c +++ b/src/pipewire/impl-port.c @@ -1395,8 +1395,8 @@ int pw_impl_port_register(struct pw_impl_port *port, pw_global_add_listener(port->global, &port->global_listener, &global_events, port); port->info.id = port->global->id; - pw_properties_setf(port->properties, PW_KEY_NODE_ID, "%d", node->global->id); - pw_properties_setf(port->properties, PW_KEY_OBJECT_ID, "%d", port->info.id); + pw_properties_setf(port->properties, PW_KEY_NODE_ID, "%u", node->global->id); + pw_properties_setf(port->properties, PW_KEY_OBJECT_ID, "%u", port->info.id); pw_properties_setf(port->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64, pw_global_get_serial(port->global)); diff --git a/src/tools/pw-cli.c b/src/tools/pw-cli.c index 88356cb8f..b731e0acb 100644 --- a/src/tools/pw-cli.c +++ b/src/tools/pw-cli.c @@ -1760,8 +1760,8 @@ static bool do_create_link(struct data *data, const char *cmd, char *args, char if (!global_port_out || !global_port_in) continue; - pw_properties_setf(props, PW_KEY_LINK_OUTPUT_PORT, "%d", global_port_out->id); - pw_properties_setf(props, PW_KEY_LINK_INPUT_PORT, "%d", global_port_in->id); + pw_properties_setf(props, PW_KEY_LINK_OUTPUT_PORT, "%u", global_port_out->id); + pw_properties_setf(props, PW_KEY_LINK_INPUT_PORT, "%u", global_port_in->id); create_link_with_properties(data, props); }