Whitespace cleanup: Fix broken indentation by hand

This patch fixes wrong indentation introduced by the last patch.

This was mostly done with vim-s retab feature.

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 189dafe3227dbb93faccab98faa860d61c37e417..5775d679b6cfc4b9fbebd61ee8a049c16326f860 100644 (file)
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -2182,11 +2182,11 @@ static int jack_parse_state(pa_config_parser_state *state) {
     }
 
     if (pa_streq(state->rvalue, "yes"))
-    pa = PA_AVAILABLE_YES;
+        pa = PA_AVAILABLE_YES;
     else if (pa_streq(state->rvalue, "no"))
-    pa = PA_AVAILABLE_NO;
+        pa = PA_AVAILABLE_NO;
     else if (pa_streq(state->rvalue, "unknown"))
-    pa = PA_AVAILABLE_UNKNOWN;
+        pa = PA_AVAILABLE_UNKNOWN;
     else {
         pa_log("[%s:%u] state must be 'yes', 'no' or 'unknown' in '%s'", state->filename, state->lineno, state->section);
         return -1;

diff --git a/src/modules/dbus/iface-card.c b/src/modules/dbus/iface-card.c
index fce7e42f7bfee56d9aa13d747b3c64389feb5544..6b5366ac0d61a4fb9f226ccba0d370003efb44c5 100644 (file)
--- a/src/modules/dbus/iface-card.c
+++ b/src/modules/dbus/iface-card.c
@@ -457,8 +457,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
         object_path = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name));
 
         pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
-                              PA_DBUSIFACE_CARD_INTERFACE,
-                              signals[SIGNAL_ACTIVE_PROFILE_UPDATED].name));
+                                                          PA_DBUSIFACE_CARD_INTERFACE,
+                                                          signals[SIGNAL_ACTIVE_PROFILE_UPDATED].name));
         pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
         pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
@@ -472,8 +472,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
         pa_proplist_update(c->proplist, PA_UPDATE_SET, c->card->proplist);
 
         pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
-                              PA_DBUSIFACE_CARD_INTERFACE,
-                              signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+                                                          PA_DBUSIFACE_CARD_INTERFACE,
+                                                          signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
         dbus_message_iter_init_append(signal_msg, &msg_iter);
         pa_dbus_append_proplist(&msg_iter, c->proplist);
 

diff --git a/src/modules/dbus/iface-client.c b/src/modules/dbus/iface-client.c
index 7812c9622c1b172e20bf5bfd1dc16e3136fd002c..a7d2cb4cea2f2f5c0e47b84dda1be7f950bb99f2 100644 (file)
--- a/src/modules/dbus/iface-client.c
+++ b/src/modules/dbus/iface-client.c
@@ -411,8 +411,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
         pa_proplist_update(c->proplist, PA_UPDATE_SET, c->client->proplist);
 
         pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
-                              PA_DBUSIFACE_CLIENT_INTERFACE,
-                              signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+                                                          PA_DBUSIFACE_CLIENT_INTERFACE,
+                                                          signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
         dbus_message_iter_init_append(signal_msg, &msg_iter);
         pa_dbus_append_proplist(&msg_iter, c->proplist);
 

diff --git a/src/modules/dbus/iface-core.c b/src/modules/dbus/iface-core.c
index bf315468deb1ed0165605172b39173555e276cd5..0a38272a26025d060c90d2157631f2ea091c2098 100644 (file)
--- a/src/modules/dbus/iface-core.c
+++ b/src/modules/dbus/iface-core.c
@@ -1600,8 +1600,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                     object_path = pa_dbusiface_device_get_path(device_iface);
 
                     pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                       PA_DBUS_CORE_INTERFACE,
-                                       signals[SIGNAL_FALLBACK_SINK_UPDATED].name)));
+                                                                       PA_DBUS_CORE_INTERFACE,
+                                                                       signals[SIGNAL_FALLBACK_SINK_UPDATED].name)));
                     pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
                     pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
                     dbus_message_unref(signal_msg);
@@ -1627,8 +1627,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                     object_path = pa_dbusiface_device_get_path(device_iface);
 
                     pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                       PA_DBUS_CORE_INTERFACE,
-                                       signals[SIGNAL_FALLBACK_SOURCE_UPDATED].name)));
+                                                                       PA_DBUS_CORE_INTERFACE,
+                                                                       signals[SIGNAL_FALLBACK_SOURCE_UPDATED].name)));
                     pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
                     pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
                     dbus_message_unref(signal_msg);
@@ -1660,8 +1660,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                 object_path = pa_dbusiface_card_get_path(card_iface);
 
                 pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                   PA_DBUS_CORE_INTERFACE,
-                                   signals[SIGNAL_NEW_CARD].name)));
+                                                                   PA_DBUS_CORE_INTERFACE,
+                                                                   signals[SIGNAL_NEW_CARD].name)));
                 pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
             } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1671,8 +1671,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                 object_path = pa_dbusiface_card_get_path(card_iface);
 
                 pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                   PA_DBUS_CORE_INTERFACE,
-                                   signals[SIGNAL_CARD_REMOVED].name)));
+                                                                   PA_DBUS_CORE_INTERFACE,
+                                                                   signals[SIGNAL_CARD_REMOVED].name)));
                 pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
                 pa_dbusiface_card_free(card_iface);
@@ -1694,8 +1694,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                 object_path = pa_dbusiface_stream_get_path(stream_iface);
 
                 pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                   PA_DBUS_CORE_INTERFACE,
-                                   signals[SIGNAL_NEW_PLAYBACK_STREAM].name)));
+                                                                   PA_DBUS_CORE_INTERFACE,
+                                                                   signals[SIGNAL_NEW_PLAYBACK_STREAM].name)));
                 pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
             } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1705,8 +1705,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                 object_path = pa_dbusiface_stream_get_path(stream_iface);
 
                 pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                   PA_DBUS_CORE_INTERFACE,
-                                   signals[SIGNAL_PLAYBACK_STREAM_REMOVED].name)));
+                                                                   PA_DBUS_CORE_INTERFACE,
+                                                                   signals[SIGNAL_PLAYBACK_STREAM_REMOVED].name)));
                 pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
                 pa_dbusiface_stream_free(stream_iface);
@@ -1728,8 +1728,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                 object_path = pa_dbusiface_stream_get_path(stream_iface);
 
                 pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                   PA_DBUS_CORE_INTERFACE,
-                                   signals[SIGNAL_NEW_RECORD_STREAM].name)));
+                                                                   PA_DBUS_CORE_INTERFACE,
+                                                                   signals[SIGNAL_NEW_RECORD_STREAM].name)));
                 pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
             } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1739,8 +1739,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                 object_path = pa_dbusiface_stream_get_path(stream_iface);
 
                 pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                   PA_DBUS_CORE_INTERFACE,
-                                   signals[SIGNAL_RECORD_STREAM_REMOVED].name)));
+                                                                   PA_DBUS_CORE_INTERFACE,
+                                                                   signals[SIGNAL_RECORD_STREAM_REMOVED].name)));
                 pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
                 pa_dbusiface_stream_free(stream_iface);
@@ -1762,8 +1762,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                 object_path = pa_dbusiface_sample_get_path(sample_iface);
 
                 pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                   PA_DBUS_CORE_INTERFACE,
-                                   signals[SIGNAL_NEW_SAMPLE].name)));
+                                                                   PA_DBUS_CORE_INTERFACE,
+                                                                   signals[SIGNAL_NEW_SAMPLE].name)));
                 pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
             } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1773,8 +1773,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                 object_path = pa_dbusiface_sample_get_path(sample_iface);
 
                 pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                   PA_DBUS_CORE_INTERFACE,
-                                   signals[SIGNAL_SAMPLE_REMOVED].name)));
+                                                                   PA_DBUS_CORE_INTERFACE,
+                                                                   signals[SIGNAL_SAMPLE_REMOVED].name)));
                 pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
                 pa_dbusiface_sample_free(sample_iface);
@@ -1796,8 +1796,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                 object_path = pa_dbusiface_module_get_path(module_iface);
 
                 pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                   PA_DBUS_CORE_INTERFACE,
-                                   signals[SIGNAL_NEW_MODULE].name)));
+                                                                   PA_DBUS_CORE_INTERFACE,
+                                                                   signals[SIGNAL_NEW_MODULE].name)));
                 pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
             } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1807,8 +1807,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                 object_path = pa_dbusiface_module_get_path(module_iface);
 
                 pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                   PA_DBUS_CORE_INTERFACE,
-                                   signals[SIGNAL_MODULE_REMOVED].name)));
+                                                                   PA_DBUS_CORE_INTERFACE,
+                                                                   signals[SIGNAL_MODULE_REMOVED].name)));
                 pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
                 pa_dbusiface_module_free(module_iface);
@@ -1830,8 +1830,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                 object_path = pa_dbusiface_client_get_path(client_iface);
 
                 pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                   PA_DBUS_CORE_INTERFACE,
-                                   signals[SIGNAL_NEW_CLIENT].name)));
+                                                                   PA_DBUS_CORE_INTERFACE,
+                                                                   signals[SIGNAL_NEW_CLIENT].name)));
                 pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
             } else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
@@ -1841,8 +1841,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
                 object_path = pa_dbusiface_client_get_path(client_iface);
 
                 pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                                   PA_DBUS_CORE_INTERFACE,
-                                   signals[SIGNAL_CLIENT_REMOVED].name)));
+                                                                   PA_DBUS_CORE_INTERFACE,
+                                                                   signals[SIGNAL_CLIENT_REMOVED].name)));
                 pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
                 pa_dbusiface_client_free(client_iface);
@@ -1973,8 +1973,8 @@ static pa_hook_result_t extension_registered_cb(void *hook_data, void *call_data
     pa_assert(ext_name);
 
     pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                               PA_DBUS_CORE_INTERFACE,
-                               signals[SIGNAL_NEW_EXTENSION].name)));
+                                                       PA_DBUS_CORE_INTERFACE,
+                                                       signals[SIGNAL_NEW_EXTENSION].name)));
     pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_STRING, &ext_name, DBUS_TYPE_INVALID));
 
     pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
@@ -1992,8 +1992,8 @@ static pa_hook_result_t extension_unregistered_cb(void *hook_data, void *call_da
     pa_assert(ext_name);
 
     pa_assert_se((signal_msg = dbus_message_new_signal(PA_DBUS_CORE_OBJECT_PATH,
-                               PA_DBUS_CORE_INTERFACE,
-                               signals[SIGNAL_EXTENSION_REMOVED].name)));
+                                                       PA_DBUS_CORE_INTERFACE,
+                                                       signals[SIGNAL_EXTENSION_REMOVED].name)));
     pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_STRING, &ext_name, DBUS_TYPE_INVALID));
 
     pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);

diff --git a/src/modules/dbus/iface-device.c b/src/modules/dbus/iface-device.c
index a85250a9005ff405add948ed131f09e42ea64787..bedd6b83242e5ed16d9be039ece6c5ea327e31fa 100644 (file)
--- a/src/modules/dbus/iface-device.c
+++ b/src/modules/dbus/iface-device.c
@@ -1109,8 +1109,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
             volume[i] = d->volume.values[i];
 
         pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
-                              PA_DBUSIFACE_DEVICE_INTERFACE,
-                              signals[SIGNAL_VOLUME_UPDATED].name));
+                                                          PA_DBUSIFACE_DEVICE_INTERFACE,
+                                                          signals[SIGNAL_VOLUME_UPDATED].name));
         pa_assert_se(dbus_message_append_args(signal_msg,
                                               DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &volume_ptr, d->volume.channels,
                                               DBUS_TYPE_INVALID));
@@ -1126,8 +1126,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
         d->mute = new_mute;
 
         pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
-                              PA_DBUSIFACE_DEVICE_INTERFACE,
-                              signals[SIGNAL_MUTE_UPDATED].name));
+                                                          PA_DBUSIFACE_DEVICE_INTERFACE,
+                                                          signals[SIGNAL_MUTE_UPDATED].name));
         pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_BOOLEAN, &d->mute, DBUS_TYPE_INVALID));
 
         pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
@@ -1152,8 +1152,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
         state = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink_state : d->source_state;
 
         pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
-                              PA_DBUSIFACE_DEVICE_INTERFACE,
-                              signals[SIGNAL_STATE_UPDATED].name));
+                                                          PA_DBUSIFACE_DEVICE_INTERFACE,
+                                                          signals[SIGNAL_STATE_UPDATED].name));
         pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_UINT32, &state, DBUS_TYPE_INVALID));
 
         pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
@@ -1170,8 +1170,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
         object_path = pa_dbusiface_device_port_get_path(pa_hashmap_get(d->ports, d->active_port->name));
 
         pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
-                              PA_DBUSIFACE_DEVICE_INTERFACE,
-                              signals[SIGNAL_ACTIVE_PORT_UPDATED].name));
+                                                          PA_DBUSIFACE_DEVICE_INTERFACE,
+                                                          signals[SIGNAL_ACTIVE_PORT_UPDATED].name));
         pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
 
         pa_dbus_protocol_send_signal(d->dbus_protocol, signal_msg);
@@ -1187,8 +1187,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
         pa_proplist_update(d->proplist, PA_UPDATE_SET, new_proplist);
 
         pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
-                              PA_DBUSIFACE_DEVICE_INTERFACE,
-                              signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+                                                          PA_DBUSIFACE_DEVICE_INTERFACE,
+                                                          signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
         dbus_message_iter_init_append(signal_msg, &msg_iter);
         pa_dbus_append_proplist(&msg_iter, d->proplist);
 

diff --git a/src/modules/dbus/iface-module.c b/src/modules/dbus/iface-module.c
index ccfbaf3bcab51fc5c6e2772f7882fde5d6a2c770..ab92a73438eabbd63c8005c75ce0b582f223aa25 100644 (file)
--- a/src/modules/dbus/iface-module.c
+++ b/src/modules/dbus/iface-module.c
@@ -288,8 +288,8 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
         pa_proplist_update(m->proplist, PA_UPDATE_SET, m->module->proplist);
 
         pa_assert_se(signal_msg = dbus_message_new_signal(m->path,
-                              PA_DBUSIFACE_MODULE_INTERFACE,
-                              signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+                                                          PA_DBUSIFACE_MODULE_INTERFACE,
+                                                          signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
         dbus_message_iter_init_append(signal_msg, &msg_iter);
         pa_dbus_append_proplist(&msg_iter, m->proplist);
 

diff --git a/src/modules/dbus/iface-sample.c b/src/modules/dbus/iface-sample.c
index fe76fe367dbfe641111d17a6d309640f4b07d1ec..4287f2e68db32dd64d436af4e775f11c45f95602 100644 (file)
--- a/src/modules/dbus/iface-sample.c
+++ b/src/modules/dbus/iface-sample.c
@@ -469,8 +469,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
         pa_proplist_update(s->proplist, PA_UPDATE_SET, s->sample->proplist);
 
         pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-                              PA_DBUSIFACE_SAMPLE_INTERFACE,
-                              signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+                                                          PA_DBUSIFACE_SAMPLE_INTERFACE,
+                                                          signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
         dbus_message_iter_init_append(signal_msg, &msg_iter);
         pa_dbus_append_proplist(&msg_iter, s->proplist);
 

diff --git a/src/modules/dbus/iface-stream.c b/src/modules/dbus/iface-stream.c
index a0157fb5709607459221fb040bd916eb4f774ea4..851d51f85ccc7eb28814d1c71f93de2b18077dbd 100644 (file)
--- a/src/modules/dbus/iface-stream.c
+++ b/src/modules/dbus/iface-stream.c
@@ -692,8 +692,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
             new_device_path = pa_dbusiface_core_get_sink_path(s->core, new_sink);
 
             pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-                                  PA_DBUSIFACE_STREAM_INTERFACE,
-                                  signals[SIGNAL_DEVICE_UPDATED].name));
+                                                              PA_DBUSIFACE_STREAM_INTERFACE,
+                                                              signals[SIGNAL_DEVICE_UPDATED].name));
             pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &new_device_path, DBUS_TYPE_INVALID));
 
             pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
@@ -710,8 +710,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
             new_device_path = pa_dbusiface_core_get_source_path(s->core, new_source);
 
             pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-                                  PA_DBUSIFACE_STREAM_INTERFACE,
-                                  signals[SIGNAL_DEVICE_UPDATED].name));
+                                                              PA_DBUSIFACE_STREAM_INTERFACE,
+                                                              signals[SIGNAL_DEVICE_UPDATED].name));
             pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &new_device_path, DBUS_TYPE_INVALID));
 
             pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
@@ -726,8 +726,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
         s->sample_rate = new_sample_rate;
 
         pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-                              PA_DBUSIFACE_STREAM_INTERFACE,
-                              signals[SIGNAL_SAMPLE_RATE_UPDATED].name));
+                                                          PA_DBUSIFACE_STREAM_INTERFACE,
+                                                          signals[SIGNAL_SAMPLE_RATE_UPDATED].name));
         pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_UINT32, &s->sample_rate, DBUS_TYPE_INVALID));
 
         pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
@@ -771,8 +771,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
             s->mute = new_mute;
 
             pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-                                  PA_DBUSIFACE_STREAM_INTERFACE,
-                                  signals[SIGNAL_MUTE_UPDATED].name));
+                                                              PA_DBUSIFACE_STREAM_INTERFACE,
+                                                              signals[SIGNAL_MUTE_UPDATED].name));
             pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_BOOLEAN, &s->mute, DBUS_TYPE_INVALID));
 
             pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg);
@@ -789,8 +789,8 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t
         pa_proplist_update(s->proplist, PA_UPDATE_SET, new_proplist);
 
         pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-                              PA_DBUSIFACE_STREAM_INTERFACE,
-                              signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
+                                                          PA_DBUSIFACE_STREAM_INTERFACE,
+                                                          signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
         dbus_message_iter_init_append(signal_msg, &msg_iter);
         pa_dbus_append_proplist(&msg_iter, s->proplist);
 
@@ -829,8 +829,8 @@ static pa_hook_result_t send_event_cb(void *hook_data, void *call_data, void *sl
     }
 
     pa_assert_se(signal_msg = dbus_message_new_signal(s->path,
-                              PA_DBUSIFACE_STREAM_INTERFACE,
-                              signals[SIGNAL_STREAM_EVENT].name));
+                                                      PA_DBUSIFACE_STREAM_INTERFACE,
+                                                      signals[SIGNAL_STREAM_EVENT].name));
     dbus_message_iter_init_append(signal_msg, &msg_iter);
     pa_assert_se(dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_STRING, &name));
     pa_dbus_append_proplist(&msg_iter, property_list);

diff --git a/src/modules/dbus/module-dbus-protocol.c b/src/modules/dbus/module-dbus-protocol.c
index a35e122de23d03f4792f5fe932e766d8c6f9fa53..7bd86cfff9002a6a1ac84d52273b21743d45ee16 100644 (file)
--- a/src/modules/dbus/module-dbus-protocol.c
+++ b/src/modules/dbus/module-dbus-protocol.c
@@ -138,8 +138,8 @@ static void client_send_event_cb(pa_client *c, const char *name, pa_proplist *da
     conn = c->userdata;
 
     pa_assert_se(signal_msg = dbus_message_new_signal(pa_dbusiface_core_get_client_path(conn->server->userdata->core_iface, c),
-                              PA_DBUSIFACE_CLIENT_INTERFACE,
-                              "ClientEvent"));
+                                                      PA_DBUSIFACE_CLIENT_INTERFACE,
+                                                      "ClientEvent"));
     dbus_message_iter_init_append(signal_msg, &msg_iter);
     pa_assert_se(dbus_message_iter_append_basic(&msg_iter, DBUS_TYPE_STRING, &name));
     pa_dbus_append_proplist(&msg_iter, data);

diff --git a/src/modules/jack/module-jackdbus-detect.c b/src/modules/jack/module-jackdbus-detect.c
index b3d04b4063ea0a9522dee2f4abf4eb683ad9c4a1..d8b218afbffad4f8382c303f395040e5e57bb781 100644 (file)
--- a/src/modules/jack/module-jackdbus-detect.c
+++ b/src/modules/jack/module-jackdbus-detect.c
@@ -48,18 +48,18 @@ PA_MODULE_USAGE(
 #define JACK_INTERFACE_NAME "org.jackaudio.JackControl"
 #define JACK_INTERFACE_PATH "/org/jackaudio/Controller"
 
-#define SERVICE_FILTER                \
-    "type='signal',"            \
-    "sender='" DBUS_SERVICE_DBUS "',"    \
-    "interface='" DBUS_INTERFACE_DBUS "',"    \
-    "member='NameOwnerChanged',"        \
-    "arg0='" JACK_SERVICE_NAME "'"
-
-#define RUNNING_FILTER(_a)            \
-    "type='signal',"            \
-    "sender='" JACK_SERVICE_NAME "',"    \
-    "interface='" JACK_INTERFACE_NAME "',"    \
-    "member='" _a "'"
+#define SERVICE_FILTER                          \
+        "type='signal',"                        \
+        "sender='" DBUS_SERVICE_DBUS "',"       \
+        "interface='" DBUS_INTERFACE_DBUS "',"  \
+        "member='NameOwnerChanged',"            \
+        "arg0='" JACK_SERVICE_NAME "'"
+
+#define RUNNING_FILTER(_a)                      \
+        "type='signal',"                        \
+        "sender='" JACK_SERVICE_NAME "',"       \
+        "interface='" JACK_INTERFACE_NAME "',"  \
+        "member='" _a "'"
 
 static const char* const valid_modargs[] = {
     "channels",

diff --git a/src/modules/xen/module-xenpv-sink.c b/src/modules/xen/module-xenpv-sink.c
index 8ac764ffa65bf606e1d3ed6083b517c7dd34ed0c..aba1f75d4cbd19bb31985291fb0e19036d6667fa 100644 (file)
--- a/src/modules/xen/module-xenpv-sink.c
+++ b/src/modules/xen/module-xenpv-sink.c
@@ -796,7 +796,7 @@ static int wait_for_backend_state_change() {
             free(buf);
             free(vec);
         }
-        /* else: timeout */
+    /* else: timeout */
     } while (backend_state == STATE_UNDEFINED && \
             (now = time(NULL)) < start + seconds);
 

diff --git a/src/pulsecore/sndfile-util.c b/src/pulsecore/sndfile-util.c
index 61b48844b99f5c82efefd2f239af1021e7463558..365c9b6d7ba4947b9346a76a55f609ccacd151a0 100644 (file)
--- a/src/pulsecore/sndfile-util.c
+++ b/src/pulsecore/sndfile-util.c
@@ -431,15 +431,15 @@ int pa_sndfile_format_from_string(const char *name) {
 
         pa_assert_se(sf_command(NULL, SFC_GET_FORMAT_MAJOR, &fi, sizeof(fi)) == 0);
 
-    /* First try to match via full type string */
+        /* First try to match via full type string */
         if (strcasecmp(name, fi.name) == 0)
             return fi.format;
 
-    /* Then, try to match via the full extension */
+        /* Then, try to match via the full extension */
         if (strcasecmp(name, fi.extension) == 0)
             return fi.format;
 
-    /* Then, try to match via the start of the type string */
+        /* Then, try to match via the start of the type string */
         if (strncasecmp(name, fi.name, strlen(name)) == 0)
             return fi.format;
     }