From 27dbbd40c9cedeb78c15bb5ed89ad047af7ecb67 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 9 Feb 2024 10:24:34 +0100 Subject: [PATCH] tools: improve indentation --- src/tools/pw-cat.c | 30 +++++++------- src/tools/pw-cli.c | 48 +++++++++++----------- src/tools/pw-config.c | 4 +- src/tools/pw-dot.c | 90 ++++++++++++++++++++--------------------- src/tools/pw-dump.c | 14 +++---- src/tools/pw-link.c | 2 +- src/tools/pw-loopback.c | 4 +- src/tools/pw-metadata.c | 2 +- src/tools/pw-mididump.c | 2 +- src/tools/pw-mon.c | 46 ++++++++++----------- src/tools/pw-profiler.c | 6 +-- src/tools/pw-reserve.c | 18 ++++----- src/tools/pw-top.c | 6 +-- 13 files changed, 136 insertions(+), 136 deletions(-) diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c index a81652cbe..8d3387915 100644 --- a/src/tools/pw-cat.c +++ b/src/tools/pw-cat.c @@ -987,21 +987,21 @@ static void show_usage(const char *name, bool is_error) fp = is_error ? stderr : stdout; - fprintf(fp, + fprintf(fp, _("%s [options] [|-]\n" - " -h, --help Show this help\n" - " --version Show version\n" - " -v, --verbose Enable verbose operations\n" + " -h, --help Show this help\n" + " --version Show version\n" + " -v, --verbose Enable verbose operations\n" "\n"), name); fprintf(fp, - _(" -R, --remote Remote daemon name\n" - " --media-type Set media type (default %s)\n" - " --media-category Set media category (default %s)\n" - " --media-role Set media role (default %s)\n" - " --target Set node target serial or name (default %s)\n" + _(" -R, --remote Remote daemon name\n" + " --media-type Set media type (default %s)\n" + " --media-category Set media category (default %s)\n" + " --media-role Set media role (default %s)\n" + " --target Set node target serial or name (default %s)\n" " 0 means don't link\n" - " --latency Set node latency (default %s)\n" + " --latency Set node latency (default %s)\n" " Xunit (unit = s, ms, us, ns)\n" " or direct samples (256)\n" " the rate is the one of the source file\n" @@ -1013,12 +1013,12 @@ static void show_usage(const char *name, bool is_error) DEFAULT_TARGET, DEFAULT_LATENCY_PLAY); fprintf(fp, - _(" --rate Sample rate (req. for rec) (default %u)\n" - " --channels Number of channels (req. for rec) (default %u)\n" - " --channel-map Channel map\n" + _(" --rate Sample rate (req. for rec) (default %u)\n" + " --channels Number of channels (req. for rec) (default %u)\n" + " --channel-map Channel map\n" " one of: \"stereo\", \"surround-51\",... or\n" " comma separated list of channel names: eg. \"FL,FR\"\n" - " --format Sample format %s (req. for rec) (default %s)\n" + " --format Sample format %s (req. for rec) (default %s)\n" " --volume Stream volume 0-1.0 (default %.3f)\n" " -q --quality Resampler quality (0 - 15) (default %d)\n" "\n"), @@ -1052,7 +1052,7 @@ static int midi_play(struct data *d, void *src, unsigned int n_frames, bool *nul spa_zero(b); spa_pod_builder_init(&b, src, n_frames); - spa_pod_builder_push_sequence(&b, &f, 0); + spa_pod_builder_push_sequence(&b, &f, 0); first_frame = d->clock_time; last_frame = first_frame + d->position->clock.duration; diff --git a/src/tools/pw-cli.c b/src/tools/pw-cli.c index 2b1d6c8ac..b025f4811 100644 --- a/src/tools/pw-cli.c +++ b/src/tools/pw-cli.c @@ -164,7 +164,7 @@ static void print_params(struct spa_param_info *params, uint32_t n_params, char static bool do_not_implemented(struct data *data, const char *cmd, char *args, char **error) { - *error = spa_aprintf("Command \"%s\" not yet implemented", cmd); + *error = spa_aprintf("Command \"%s\" not yet implemented", cmd); return false; } @@ -438,7 +438,7 @@ static struct global *find_global(struct remote_data *rd, const char *pattern) continue; if (global_matches(g, pattern)) return g; - } + } return NULL; } @@ -495,7 +495,7 @@ static void remote_data_free(struct remote_data *rd) static bool do_connect(struct data *data, const char *cmd, char *args, char **error) { char *a[1]; - int n; + int n; struct pw_properties *props = NULL; struct pw_core *core; struct remote_data *rd; @@ -540,7 +540,7 @@ static bool do_connect(struct data *data, const char *cmd, char *args, char **er static bool do_disconnect(struct data *data, const char *cmd, char *args, char **error) { char *a[1]; - int n; + int n; uint32_t idx; struct remote_data *rd = data->current; @@ -564,8 +564,8 @@ static bool do_disconnect(struct data *data, const char *cmd, char *args, char * return true; - no_remote: - *error = spa_aprintf("Remote %d does not exist", idx); +no_remote: + *error = spa_aprintf("Remote %d does not exist", idx); return false; } @@ -582,7 +582,7 @@ static bool do_list_remotes(struct data *data, const char *cmd, char *args, char static bool do_switch_remote(struct data *data, const char *cmd, char *args, char **error) { char *a[1]; - int n, idx = 0; + int n, idx = 0; struct remote_data *rd; n = pw_split_ip(args, WHITESPACE, 1, a); @@ -599,8 +599,8 @@ static bool do_switch_remote(struct data *data, const char *cmd, char *args, cha return true; - no_remote: - *error = spa_aprintf("Remote %d does not exist", idx); +no_remote: + *error = spa_aprintf("Remote %d does not exist", idx); return false; } @@ -863,7 +863,7 @@ static void node_event_info(void *data, const struct pw_node_info *info) static void event_param(void *_data, int seq, uint32_t id, uint32_t index, uint32_t next, const struct spa_pod *param) { - struct proxy_data *data = _data; + struct proxy_data *data = _data; struct remote_data *rd = data->rd; if (rd->data->interactive) @@ -939,7 +939,7 @@ static void client_event_info(void *data, const struct pw_client_info *info) static void client_event_permissions(void *_data, uint32_t index, uint32_t n_permissions, const struct pw_permission *permissions) { - struct proxy_data *data = _data; + struct proxy_data *data = _data; struct remote_data *rd = data->rd; uint32_t i; @@ -1181,9 +1181,9 @@ destroy_proxy (void *data) } static const struct pw_proxy_events proxy_events = { - PW_VERSION_PROXY_EVENTS, - .removed = removed_proxy, - .destroy = destroy_proxy, + PW_VERSION_PROXY_EVENTS, + .removed = removed_proxy, + .destroy = destroy_proxy, }; static bool do_list_objects(struct data *data, const char *cmd, char *args, char **error) @@ -1380,7 +1380,7 @@ static bool do_info(struct data *data, const char *cmd, char *args, char **error { struct remote_data *rd = data->current; char *a[1]; - int n; + int n; struct global *global; n = pw_split_ip(args, WHITESPACE, 1, a); @@ -1446,7 +1446,7 @@ static bool do_create_node(struct data *data, const char *cmd, char *args, char { struct remote_data *rd = data->current; char *a[2]; - int n; + int n; uint32_t id; struct pw_proxy *proxy; struct pw_properties *props = NULL; @@ -1471,9 +1471,9 @@ static bool do_create_node(struct data *data, const char *cmd, char *args, char pd = pw_proxy_get_user_data(proxy); pd->rd = rd; pd->proxy = proxy; - pd->class = &node_class; - pw_proxy_add_object_listener(proxy, &pd->object_listener, &node_events, pd); - pw_proxy_add_listener(proxy, &pd->proxy_listener, &proxy_events, pd); + pd->class = &node_class; + pw_proxy_add_object_listener(proxy, &pd->object_listener, &node_events, pd); + pw_proxy_add_listener(proxy, &pd->proxy_listener, &proxy_events, pd); id = pw_map_insert_new(&data->vars, proxy); if (rd->data->interactive) @@ -1486,7 +1486,7 @@ static bool do_destroy(struct data *data, const char *cmd, char *args, char **er { struct remote_data *rd = data->current; char *a[1]; - int n; + int n; struct global *global; n = pw_split_ip(args, WHITESPACE, 1, a); @@ -1683,8 +1683,8 @@ static bool do_export_node(struct data *data, const char *cmd, char *args, char return true; - no_remote: - *error = spa_aprintf("Remote %d does not exist", idx); +no_remote: + *error = spa_aprintf("Remote %d does not exist", idx); return false; } @@ -1847,7 +1847,7 @@ static bool do_get_permissions(struct data *data, const char *cmd, char *args, c { struct remote_data *rd = data->current; char *a[3]; - int n; + int n; struct global *global; n = pw_split_ip(args, WHITESPACE, 1, a); @@ -2132,7 +2132,7 @@ static bool parse(struct data *data, char *buf, char **error) return c->func(data, cmd, args, error); } } - *error = spa_aprintf("Command \"%s\" does not exist. Type 'help' for usage.", cmd); + *error = spa_aprintf("Command \"%s\" does not exist. Type 'help' for usage.", cmd); return false; } diff --git a/src/tools/pw-config.c b/src/tools/pw-config.c index abdb656e5..8315b32b2 100644 --- a/src/tools/pw-config.c +++ b/src/tools/pw-config.c @@ -66,7 +66,7 @@ static int do_merge_section(void *data, const char *location, const char *sectio int l; const char *value; - spa_json_init(&it[0], str, len); + spa_json_init(&it[0], str, len); if ((l = spa_json_next(&it[0], &value)) <= 0) return 0; @@ -116,7 +116,7 @@ static void section_for_each(struct data *d, const char *section, static void show_help(const char *name, bool error) { - fprintf(error ? stderr : stdout, "%1$s : PipeWire config manager.\n" + fprintf(error ? stderr : stdout, "%1$s : PipeWire config manager.\n" "Usage:\n" " %1$s [options] paths List config paths (default action)\n" " %1$s [options] list [SECTION] List config section\n" diff --git a/src/tools/pw-dot.c b/src/tools/pw-dot.c index 4303e9a75..a2fd2a18e 100644 --- a/src/tools/pw-dot.c +++ b/src/tools/pw-dot.c @@ -74,7 +74,7 @@ struct global { static char *dot_str_new(void) { - return strdup(""); + return strdup(""); } static void dot_str_clear(char **str) @@ -388,36 +388,36 @@ static void draw_module(struct global *g) static bool is_node_id_link_referenced(uint32_t id, struct spa_list *globals) { - struct global *g; - struct pw_link_info *info; - spa_list_for_each(g, globals, link) { - if (g->info == NULL) - continue; - if (g->type != INTERFACE_Link) - continue; - info = g->info; - if (info->input_node_id == id || info->output_node_id == id) - return true; - } - return false; + struct global *g; + struct pw_link_info *info; + spa_list_for_each(g, globals, link) { + if (g->info == NULL) + continue; + if (g->type != INTERFACE_Link) + continue; + info = g->info; + if (info->input_node_id == id || info->output_node_id == id) + return true; + } + return false; } static bool is_module_id_factory_referenced(uint32_t id, struct spa_list *globals) { - struct global *g; - struct pw_factory_info *info; - const char *module_id_str; - spa_list_for_each(g, globals, link) { - if (g->info == NULL) - continue; - if (g->type != INTERFACE_Factory) - continue; - info = g->info; - module_id_str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID); - if (module_id_str && (uint32_t)atoi(module_id_str) == id) - return true; - } - return false; + struct global *g; + struct pw_factory_info *info; + const char *module_id_str; + spa_list_for_each(g, globals, link) { + if (g->info == NULL) + continue; + if (g->type != INTERFACE_Factory) + continue; + info = g->info; + module_id_str = spa_dict_lookup(info->props, PW_KEY_MODULE_ID); + if (module_id_str && (uint32_t)atoi(module_id_str) == id) + return true; + } + return false; } static bool is_global_referenced(struct global *g) @@ -507,18 +507,18 @@ static int draw_graph(struct data *d, const char *path) static void global_event_info(struct global *g, const void *info) { - if (g->info_update) - g->info = g->info_update(g->info, info); + if (g->info_update) + g->info = g->info_update(g->info, info); } static void port_event_info(void *data, const struct pw_port_info *info) { - global_event_info(data, info); + global_event_info(data, info); } static const struct pw_port_events port_events = { - PW_VERSION_PORT_EVENTS, - .info = port_event_info, + PW_VERSION_PORT_EVENTS, + .info = port_event_info, }; static void node_event_info(void *data, const struct pw_node_info *info) @@ -604,15 +604,15 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions, const char *type, uint32_t version, const struct spa_dict *props) { - struct data *d = data; - struct pw_proxy *proxy; - uint32_t client_version; + struct data *d = data; + struct pw_proxy *proxy; + uint32_t client_version; uint32_t object_type; - const void *events; - pw_destroy_t info_destroy; - info_update_t info_update; - draw_t draw; - struct global *g; + const void *events; + pw_destroy_t info_destroy; + info_update_t info_update; + draw_t draw; + struct global *g; if (spa_streq(type, PW_TYPE_INTERFACE_Port)) { events = &port_events; @@ -696,11 +696,11 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions, g->info_update = info_update; g->draw = draw; - pw_proxy_add_object_listener(proxy, &g->object_listener, events, g); - pw_proxy_add_listener(proxy, &g->proxy_listener, &proxy_events, g); + pw_proxy_add_object_listener(proxy, &g->object_listener, events, g); + pw_proxy_add_listener(proxy, &g->proxy_listener, &proxy_events, g); - /* add the global to the list */ - spa_list_insert(&d->globals, &g->link); + /* add the global to the list */ + spa_list_insert(&d->globals, &g->link); } static const struct pw_registry_events registry_events = { @@ -1033,7 +1033,7 @@ static int get_data_from_json(struct data *data, const char *json_path) static void show_help(const char *name, bool error) { - fprintf(error ? stderr : stdout, "%s [options]\n" + fprintf(error ? stderr : stdout, "%s [options]\n" " -h, --help Show this help\n" " --version Show version\n" " -a, --all Show all object types\n" diff --git a/src/tools/pw-dump.c b/src/tools/pw-dump.c index f2b7b3ba5..0fe9143f7 100644 --- a/src/tools/pw-dump.c +++ b/src/tools/pw-dump.c @@ -349,7 +349,7 @@ static void put_pod_value(struct data *d, const char *key, const struct spa_type break; case SPA_TYPE_Rectangle: { - struct spa_rectangle *r = (struct spa_rectangle *)body; + struct spa_rectangle *r = (struct spa_rectangle *)body; put_begin(d, NULL, "{", STATE_SIMPLE); put_int(d, "width", r->width); put_int(d, "height", r->height); @@ -358,7 +358,7 @@ static void put_pod_value(struct data *d, const char *key, const struct spa_type } case SPA_TYPE_Fraction: { - struct spa_fraction *f = (struct spa_fraction *)body; + struct spa_fraction *f = (struct spa_fraction *)body; put_begin(d, NULL, "{", STATE_SIMPLE); put_int(d, "num", f->num); put_int(d, "denom", f->denom); @@ -436,7 +436,7 @@ static void put_pod_value(struct data *d, const char *key, const struct spa_type break; } case SPA_TYPE_Object: - { + { put_begin(d, NULL, "{", 0); struct spa_pod_object_body *b = (struct spa_pod_object_body *)body; struct spa_pod_prop *p; @@ -1299,13 +1299,13 @@ destroy_proxy(void *data) if (o->class->destroy) o->class->destroy(o); } - o->proxy = NULL; + o->proxy = NULL; } static const struct pw_proxy_events proxy_events = { - PW_VERSION_PROXY_EVENTS, - .removed = destroy_removed, - .destroy = destroy_proxy, + PW_VERSION_PROXY_EVENTS, + .removed = destroy_removed, + .destroy = destroy_proxy, }; static void registry_event_global(void *data, uint32_t id, diff --git a/src/tools/pw-link.c b/src/tools/pw-link.c index 852514154..e9af2331c 100644 --- a/src/tools/pw-link.c +++ b/src/tools/pw-link.c @@ -757,7 +757,7 @@ static void do_quit(void *userdata, int signal_number) static void show_help(struct data *data, const char *name, bool error) { - fprintf(error ? stderr : stdout, "%1$s : PipeWire port and link manager.\n" + fprintf(error ? stderr : stdout, "%1$s : PipeWire port and link manager.\n" "Generic: %1$s [options]\n" " -h, --help Show this help\n" " --version Show version\n" diff --git a/src/tools/pw-loopback.c b/src/tools/pw-loopback.c index bbb26294e..a6cd0c1a6 100644 --- a/src/tools/pw-loopback.c +++ b/src/tools/pw-loopback.c @@ -65,7 +65,7 @@ static const struct pw_impl_module_events module_events = { static void show_help(struct data *data, const char *name, bool error) { - fprintf(error ? stderr : stdout, "%s [options]\n" + fprintf(error ? stderr : stdout, "%s [options]\n" " -h, --help Show this help\n" " --version Show version\n" " -r, --remote Remote daemon name\n" @@ -198,7 +198,7 @@ int main(int argc, char *argv[]) } - if ((f = open_memstream(&args, &size)) == NULL) { + if ((f = open_memstream(&args, &size)) == NULL) { fprintf(stderr, "can't open memstream: %m\n"); goto exit; } diff --git a/src/tools/pw-metadata.c b/src/tools/pw-metadata.c index d321dde45..15236cc91 100644 --- a/src/tools/pw-metadata.c +++ b/src/tools/pw-metadata.c @@ -165,7 +165,7 @@ static void do_quit(void *userdata, int signal_number) static void show_help(struct data *data, const char *name, bool error) { - fprintf(error ? stderr : stdout, "%s [options] [ id [ key [ value [ type ] ] ] ]\n" + fprintf(error ? stderr : stdout, "%s [options] [ id [ key [ value [ type ] ] ] ]\n" " -h, --help Show this help\n" " --version Show version\n" " -r, --remote Remote daemon name\n" diff --git a/src/tools/pw-mididump.c b/src/tools/pw-mididump.c index 6612569bb..f72e804f9 100644 --- a/src/tools/pw-mididump.c +++ b/src/tools/pw-mididump.c @@ -158,7 +158,7 @@ static int dump_filter(struct data *data) static void show_help(const char *name, bool error) { - fprintf(error ? stderr : stdout, "%s [options] [FILE]\n" + fprintf(error ? stderr : stdout, "%s [options] [FILE]\n" " -h, --help Show this help\n" " --version Show version\n" " -r, --remote Remote daemon name\n", diff --git a/src/tools/pw-mon.c b/src/tools/pw-mon.c index 9fa9e6c13..a4b246e4d 100644 --- a/src/tools/pw-mon.c +++ b/src/tools/pw-mon.c @@ -30,9 +30,9 @@ static struct pprefix { }; #define with_prefix(use_prefix_) \ - for (bool once_ = !!printf("%s", (pprefix[!!(use_prefix_)]).prefix); \ - once_; \ - once_ = false, printf("%s", (pprefix[!!(use_prefix_)]).suffix)) + for (bool once_ = !!printf("%s", (pprefix[!!(use_prefix_)]).prefix); \ + once_; \ + once_ = false, printf("%s", (pprefix[!!(use_prefix_)]).suffix)) struct param { @@ -134,7 +134,7 @@ static void remove_params(struct proxy_data *data, uint32_t id, int seq) static void event_param(void *_data, int seq, uint32_t id, uint32_t index, uint32_t next, const struct spa_pod *param) { - struct proxy_data *data = _data; + struct proxy_data *data = _data; struct param *p; /* remove all params with the same id and older seq */ @@ -250,7 +250,7 @@ static void module_event_info(void *_data, const struct pw_module_info *info) static const struct pw_module_events module_events = { PW_VERSION_MODULE_EVENTS, - .info = module_event_info, + .info = module_event_info, }; static void print_node(struct proxy_data *data) @@ -302,7 +302,7 @@ static void print_node(struct proxy_data *data) static void node_event_info(void *_data, const struct pw_node_info *info) { - struct proxy_data *data = _data; + struct proxy_data *data = _data; uint32_t i; info = data->info = pw_node_info_update(data->info, info); @@ -327,8 +327,8 @@ static void node_event_info(void *_data, const struct pw_node_info *info) static const struct pw_node_events node_events = { PW_VERSION_NODE_EVENTS, - .info = node_event_info, - .param = event_param + .info = node_event_info, + .param = event_param }; static void print_port(struct proxy_data *data) @@ -367,7 +367,7 @@ static void print_port(struct proxy_data *data) static void port_event_info(void *_data, const struct pw_port_info *info) { - struct proxy_data *data = _data; + struct proxy_data *data = _data; uint32_t i; info = data->info = pw_port_info_update(data->info, info); @@ -392,13 +392,13 @@ static void port_event_info(void *_data, const struct pw_port_info *info) static const struct pw_port_events port_events = { PW_VERSION_PORT_EVENTS, - .info = port_event_info, - .param = event_param + .info = port_event_info, + .param = event_param }; static void factory_event_info(void *_data, const struct pw_factory_info *info) { - struct proxy_data *data = _data; + struct proxy_data *data = _data; bool hide_props, print_mark; hide_props = data->data->hide_props; @@ -412,7 +412,7 @@ static void factory_event_info(void *_data, const struct pw_factory_info *info) print_mark = true; } - info = data->info = pw_factory_info_update(data->info, info); + info = data->info = pw_factory_info_update(data->info, info); printf("\tid: %d\n", data->id); printf("\tpermissions: "PW_PERMISSION_FORMAT"\n", @@ -428,12 +428,12 @@ static void factory_event_info(void *_data, const struct pw_factory_info *info) static const struct pw_factory_events factory_events = { PW_VERSION_FACTORY_EVENTS, - .info = factory_event_info + .info = factory_event_info }; static void client_event_info(void *_data, const struct pw_client_info *info) { - struct proxy_data *data = _data; + struct proxy_data *data = _data; bool hide_props, print_mark; hide_props = data->data->hide_props; @@ -447,7 +447,7 @@ static void client_event_info(void *_data, const struct pw_client_info *info) print_mark = true; } - info = data->info = pw_client_info_update(data->info, info); + info = data->info = pw_client_info_update(data->info, info); printf("\tid: %d\n", data->id); printf("\tpermissions: "PW_PERMISSION_FORMAT"\n", @@ -461,12 +461,12 @@ static void client_event_info(void *_data, const struct pw_client_info *info) static const struct pw_client_events client_events = { PW_VERSION_CLIENT_EVENTS, - .info = client_event_info + .info = client_event_info }; static void link_event_info(void *_data, const struct pw_link_info *info) { - struct proxy_data *data = _data; + struct proxy_data *data = _data; bool hide_props, print_mark; hide_props = data->data->hide_props; @@ -480,7 +480,7 @@ static void link_event_info(void *_data, const struct pw_link_info *info) print_mark = true; } - info = data->info = pw_link_info_update(data->info, info); + info = data->info = pw_link_info_update(data->info, info); printf("\tid: %d\n", data->id); printf("\tpermissions: "PW_PERMISSION_FORMAT"\n", @@ -551,7 +551,7 @@ static void print_device(struct proxy_data *data) static void device_event_info(void *_data, const struct pw_device_info *info) { - struct proxy_data *data = _data; + struct proxy_data *data = _data; uint32_t i; info = data->info = pw_device_info_update(data->info, info); @@ -576,13 +576,13 @@ static void device_event_info(void *_data, const struct pw_device_info *info) static const struct pw_device_events device_events = { PW_VERSION_DEVICE_EVENTS, .info = device_event_info, - .param = event_param + .param = event_param }; static void removed_proxy (void *data) { - struct proxy_data *pd = data; + struct proxy_data *pd = data; pw_proxy_destroy(pd->proxy); } @@ -752,7 +752,7 @@ static void do_quit(void *data, int signal_number) static void show_help(const char *name, bool error) { - fprintf(error ? stderr : stdout, "%s [options]\n" + fprintf(error ? stderr : stdout, "%s [options]\n" " -h, --help Show this help\n" " --version Show version\n" " -r, --remote Remote daemon name\n" diff --git a/src/tools/pw-profiler.c b/src/tools/pw-profiler.c index 3f855544e..f46681be5 100644 --- a/src/tools/pw-profiler.c +++ b/src/tools/pw-profiler.c @@ -406,7 +406,7 @@ static void dump_scripts(struct data *d) static void profiler_profile(void *data, const struct spa_pod *pod) { - struct data *d = data; + struct data *d = data; struct spa_pod *o; struct spa_pod_prop *p; struct point point; @@ -446,7 +446,7 @@ static void profiler_profile(void *data, const struct spa_pod *pod) static const struct pw_profiler_events profiler_events = { PW_VERSION_PROFILER_EVENTS, - .profile = profiler_profile, + .profile = profiler_profile, }; static void registry_event_global(void *data, uint32_t id, @@ -522,7 +522,7 @@ static void do_quit(void *data, int signal_number) static void show_help(const char *name, bool error) { - fprintf(error ? stderr : stdout, "%s [options]\n" + fprintf(error ? stderr : stdout, "%s [options]\n" " -h, --help Show this help\n" " --version Show version\n" " -r, --remote Remote daemon name\n" diff --git a/src/tools/pw-reserve.c b/src/tools/pw-reserve.c index 180afa446..acb8c1d63 100644 --- a/src/tools/pw-reserve.c +++ b/src/tools/pw-reserve.c @@ -70,15 +70,15 @@ static void do_quit(void *data, int signal_number) static void show_help(const char *name, bool error) { - fprintf(error ? stderr : stdout, "%s [options]\n" - " -h, --help Show this help\n" - " --version Show version\n" - " -n, --name Name to reserve (Audio0, Midi0, Video0, ..)\n" - " -a, --appname Application Name (default %s)\n" - " -p, --priority Priority (default %d)\n" - " -m, --monitor Monitor only, don't try to acquire\n" - " -r, --release Request release when busy\n", - name, DEFAULT_APPNAME, DEFAULT_PRIORITY); + fprintf(error ? stderr : stdout, "%s [options]\n" + " -h, --help Show this help\n" + " --version Show version\n" + " -n, --name Name to reserve (Audio0, Midi0, Video0, ..)\n" + " -a, --appname Application Name (default %s)\n" + " -p, --priority Priority (default %d)\n" + " -m, --monitor Monitor only, don't try to acquire\n" + " -r, --release Request release when busy\n", + name, DEFAULT_APPNAME, DEFAULT_PRIORITY); } int main(int argc, char *argv[]) diff --git a/src/tools/pw-top.c b/src/tools/pw-top.c index 7a550ff94..ea88678ba 100644 --- a/src/tools/pw-top.c +++ b/src/tools/pw-top.c @@ -600,7 +600,7 @@ static void do_timeout(void *data, uint64_t expirations) static void profiler_profile(void *data, const struct spa_pod *pod) { - struct data *d = data; + struct data *d = data; struct spa_pod *o; struct spa_pod_prop *p; struct point point; @@ -640,7 +640,7 @@ static void profiler_profile(void *data, const struct spa_pod *pod) static const struct pw_profiler_events profiler_events = { PW_VERSION_PROFILER_EVENTS, - .profile = profiler_profile, + .profile = profiler_profile, }; static void registry_event_global(void *data, uint32_t id, @@ -739,7 +739,7 @@ static void do_quit(void *data, int signal_number) static void show_help(const char *name, bool error) { - fprintf(error ? stderr : stdout, "Usage:\n%s [options]\n\n" + fprintf(error ? stderr : stdout, "Usage:\n%s [options]\n\n" "Options:\n" " -b, --batch-mode run in non-interactive batch mode\n" " -n, --iterations = NUMBER exit after NUMBER batch iterations\n"