From 684b89c639e89cd411dad802c975fc5784951f3b Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Sat, 12 Mar 2011 19:45:02 +0100 Subject: Fix up some double spaces --- src/pulsecore/core-util.c | 10 +++++----- src/pulsecore/cpu-arm.c | 2 +- src/pulsecore/ipacl.c | 2 +- src/pulsecore/memblock.c | 2 +- src/pulsecore/modargs.c | 2 +- src/pulsecore/module.c | 2 +- src/pulsecore/protocol-native.c | 38 +++++++++++++++++++------------------- src/pulsecore/resampler.c | 6 +++--- src/pulsecore/rtpoll.c | 2 +- src/pulsecore/sink-input.c | 4 ++-- src/pulsecore/strlist.c | 2 +- src/pulsecore/time-smoother.c | 4 ++-- 12 files changed, 38 insertions(+), 38 deletions(-) (limited to 'src/pulsecore') diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index bb0f5601..a713cae0 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -544,7 +544,7 @@ void pa_check_signal_is_blocked(int sig) { /* The following function is based on an example from the GNU libc * documentation. This function is similar to GNU's asprintf(). */ char *pa_sprintf_malloc(const char *format, ...) { - size_t size = 100; + size_t size = 100; char *c = NULL; pa_assert(format); @@ -574,7 +574,7 @@ char *pa_sprintf_malloc(const char *format, ...) { /* Same as the previous function, but use a va_list instead of an * ellipsis */ char *pa_vsprintf_malloc(const char *format, va_list ap) { - size_t size = 100; + size_t size = 100; char *c = NULL; pa_assert(format); @@ -1392,7 +1392,7 @@ char *pa_get_state_dir(void) { /* If PULSE_STATE_PATH and PULSE_RUNTIME_PATH point to the same * dir then this will break. */ - if (pa_make_secure_dir(d, 0700U, (uid_t) -1, (gid_t) -1) < 0) { + if (pa_make_secure_dir(d, 0700U, (uid_t) -1, (gid_t) -1) < 0) { pa_log_error("Failed to create secure directory: %s", pa_cstrerror(errno)); pa_xfree(d); return NULL; @@ -1532,7 +1532,7 @@ char *pa_get_runtime_dir(void) { if ((d = getenv("PULSE_RUNTIME_PATH"))) { - if (pa_make_secure_dir(d, m, (uid_t) -1, (gid_t) -1) < 0) { + if (pa_make_secure_dir(d, m, (uid_t) -1, (gid_t) -1) < 0) { pa_log_error("Failed to create secure directory: %s", pa_cstrerror(errno)); goto fail; } @@ -1543,7 +1543,7 @@ char *pa_get_runtime_dir(void) { if (!(d = get_pulse_home())) goto fail; - if (pa_make_secure_dir(d, m, (uid_t) -1, (gid_t) -1) < 0) { + if (pa_make_secure_dir(d, m, (uid_t) -1, (gid_t) -1) < 0) { pa_log_error("Failed to create secure directory: %s", pa_cstrerror(errno)); pa_xfree(d); goto fail; diff --git a/src/pulsecore/cpu-arm.c b/src/pulsecore/cpu-arm.c index 781ad37a..0287043e 100644 --- a/src/pulsecore/cpu-arm.c +++ b/src/pulsecore/cpu-arm.c @@ -37,7 +37,7 @@ #if defined (__arm__) && defined (__linux__) -#define MAX_BUFFER 4096 +#define MAX_BUFFER 4096 static char * get_cpuinfo_line(char *cpuinfo, const char *tag) { char *line, *end, *colon; diff --git a/src/pulsecore/ipacl.c b/src/pulsecore/ipacl.c index ba35640d..b9289386 100644 --- a/src/pulsecore/ipacl.c +++ b/src/pulsecore/ipacl.c @@ -175,7 +175,7 @@ void pa_ip_acl_free(pa_ip_acl *acl) { int pa_ip_acl_check(pa_ip_acl *acl, int fd) { struct sockaddr_storage sa; struct acl_entry *e; - socklen_t salen; + socklen_t salen; pa_assert(acl); pa_assert(fd >= 0); diff --git a/src/pulsecore/memblock.c b/src/pulsecore/memblock.c index ce8b2540..bc804577 100644 --- a/src/pulsecore/memblock.c +++ b/src/pulsecore/memblock.c @@ -82,7 +82,7 @@ struct pa_memblock { pa_free_cb_t free_cb; } user; - struct { + struct { uint32_t id; pa_memimport_segment *segment; } imported; diff --git a/src/pulsecore/modargs.c b/src/pulsecore/modargs.c index e78cdb9a..3106775f 100644 --- a/src/pulsecore/modargs.c +++ b/src/pulsecore/modargs.c @@ -124,7 +124,7 @@ pa_modargs *pa_modargs_new(const char *args, const char* const* valid_keys) { key_len++; break; - case VALUE_START: + case VALUE_START: if (*p == '\'') { state = VALUE_TICKS; value = p+1; diff --git a/src/pulsecore/module.c b/src/pulsecore/module.c index 74e94da4..1b1e1126 100644 --- a/src/pulsecore/module.c +++ b/src/pulsecore/module.c @@ -110,7 +110,7 @@ pa_module* pa_module_load(pa_core *c, const char *name, const char *argument) { m->unload_requested = FALSE; if (m->init(m) < 0) { - pa_log_error("Failed to load module \"%s\" (argument: \"%s\"): initialization failed.", name, argument ? argument : ""); + pa_log_error("Failed to load module \"%s\" (argument: \"%s\"): initialization failed.", name, argument ? argument : ""); goto fail; } diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 82007e83..bb4be726 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -1293,7 +1293,7 @@ static void native_connection_send_memblock(pa_native_connection *c) { else if (start == c->rrobin_index) return; - if (pa_memblockq_peek(r->memblockq, &chunk) >= 0) { + if (pa_memblockq_peek(r->memblockq, &chunk) >= 0) { pa_memchunk schunk = chunk; if (schunk.length > r->buffer_attr.fragsize) @@ -1918,7 +1918,7 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u if (name) pa_proplist_sets(p, PA_PROP_MEDIA_NAME, name); - if (c->version >= 12) { + if (c->version >= 12) { /* Since 0.9.8 the user can ask for a couple of additional flags */ if (pa_tagstruct_get_boolean(t, &no_remap) < 0 || @@ -2009,14 +2009,14 @@ static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, u } flags = - (corked ? PA_SINK_INPUT_START_CORKED : 0) | - (no_remap ? PA_SINK_INPUT_NO_REMAP : 0) | - (no_remix ? PA_SINK_INPUT_NO_REMIX : 0) | - (fix_format ? PA_SINK_INPUT_FIX_FORMAT : 0) | - (fix_rate ? PA_SINK_INPUT_FIX_RATE : 0) | - (fix_channels ? PA_SINK_INPUT_FIX_CHANNELS : 0) | - (no_move ? PA_SINK_INPUT_DONT_MOVE : 0) | - (variable_rate ? PA_SINK_INPUT_VARIABLE_RATE : 0) | + (corked ? PA_SINK_INPUT_START_CORKED : 0) | + (no_remap ? PA_SINK_INPUT_NO_REMAP : 0) | + (no_remix ? PA_SINK_INPUT_NO_REMIX : 0) | + (fix_format ? PA_SINK_INPUT_FIX_FORMAT : 0) | + (fix_rate ? PA_SINK_INPUT_FIX_RATE : 0) | + (fix_channels ? PA_SINK_INPUT_FIX_CHANNELS : 0) | + (no_move ? PA_SINK_INPUT_DONT_MOVE : 0) | + (variable_rate ? PA_SINK_INPUT_VARIABLE_RATE : 0) | (dont_inhibit_auto_suspend ? PA_SINK_INPUT_DONT_INHIBIT_AUTO_SUSPEND : 0) | (fail_on_suspend ? PA_SINK_INPUT_NO_CREATE_ON_SUSPEND|PA_SINK_INPUT_KILL_ON_SUSPEND : 0) | (passthrough ? PA_SINK_INPUT_PASSTHROUGH : 0); @@ -2185,7 +2185,7 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin if (name) pa_proplist_sets(p, PA_PROP_MEDIA_NAME, name); - if (c->version >= 12) { + if (c->version >= 12) { /* Since 0.9.8 the user can ask for a couple of additional flags */ if (pa_tagstruct_get_boolean(t, &no_remap) < 0 || @@ -2266,14 +2266,14 @@ static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uin } flags = - (corked ? PA_SOURCE_OUTPUT_START_CORKED : 0) | - (no_remap ? PA_SOURCE_OUTPUT_NO_REMAP : 0) | - (no_remix ? PA_SOURCE_OUTPUT_NO_REMIX : 0) | - (fix_format ? PA_SOURCE_OUTPUT_FIX_FORMAT : 0) | - (fix_rate ? PA_SOURCE_OUTPUT_FIX_RATE : 0) | - (fix_channels ? PA_SOURCE_OUTPUT_FIX_CHANNELS : 0) | - (no_move ? PA_SOURCE_OUTPUT_DONT_MOVE : 0) | - (variable_rate ? PA_SOURCE_OUTPUT_VARIABLE_RATE : 0) | + (corked ? PA_SOURCE_OUTPUT_START_CORKED : 0) | + (no_remap ? PA_SOURCE_OUTPUT_NO_REMAP : 0) | + (no_remix ? PA_SOURCE_OUTPUT_NO_REMIX : 0) | + (fix_format ? PA_SOURCE_OUTPUT_FIX_FORMAT : 0) | + (fix_rate ? PA_SOURCE_OUTPUT_FIX_RATE : 0) | + (fix_channels ? PA_SOURCE_OUTPUT_FIX_CHANNELS : 0) | + (no_move ? PA_SOURCE_OUTPUT_DONT_MOVE : 0) | + (variable_rate ? PA_SOURCE_OUTPUT_VARIABLE_RATE : 0) | (dont_inhibit_auto_suspend ? PA_SOURCE_OUTPUT_DONT_INHIBIT_AUTO_SUSPEND : 0) | (fail_on_suspend ? PA_SOURCE_OUTPUT_NO_CREATE_ON_SUSPEND|PA_SOURCE_OUTPUT_KILL_ON_SUSPEND : 0); diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c index 312e75e5..b5c1611c 100644 --- a/src/pulsecore/resampler.c +++ b/src/pulsecore/resampler.c @@ -898,7 +898,7 @@ static void calc_map_table(pa_resampler *r) { if (!on_center(r->o_cm.map[oc])) continue; - for (ic = 0; ic < n_ic; ic++) { + for (ic = 0; ic < n_ic; ic++) { if (ic_connected[ic]) { m->map_table_f[oc][ic] *= .9f; @@ -961,7 +961,7 @@ static void calc_map_table(pa_resampler *r) { if (ncenter[oc] <= 0) continue; - for (ic = 0; ic < n_ic; ic++) { + for (ic = 0; ic < n_ic; ic++) { if (ic_connected[ic]) { m->map_table_f[oc][ic] *= .75f; @@ -983,7 +983,7 @@ static void calc_map_table(pa_resampler *r) { /* OK, so there is an unconnected LFE channel. Let's mix * it into all channels, with factor 0.375 */ - for (ic = 0; ic < n_ic; ic++) { + for (ic = 0; ic < n_ic; ic++) { if (!on_lfe(r->i_cm.map[ic])) continue; diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c index 98d7d625..a5e990f6 100644 --- a/src/pulsecore/rtpoll.c +++ b/src/pulsecore/rtpoll.c @@ -124,7 +124,7 @@ static void rtpoll_rebuild(pa_rtpoll *p) { for (i = p->items; i; i = i->next) { - if (i->n_pollfd > 0) { + if (i->n_pollfd > 0) { size_t l = i->n_pollfd * sizeof(struct pollfd); if (i->pollfd) diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index 2bcf112e..e0e81be4 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -480,7 +480,7 @@ static void sink_input_set_state(pa_sink_input *i, pa_sink_input_state_t state) /* Called from main context */ void pa_sink_input_unlink(pa_sink_input *i) { pa_bool_t linked; - pa_source_output *o, *p = NULL; + pa_source_output *o, *p = NULL; pa_assert(i); pa_assert_ctl_context(); @@ -990,7 +990,7 @@ pa_usec_t pa_sink_input_set_requested_latency(pa_sink_input *i, pa_usec_t usec) if (usec != (pa_usec_t) -1) { pa_usec_t min_latency, max_latency; pa_sink_get_latency_range(i->sink, &min_latency, &max_latency); - usec = PA_CLAMP(usec, min_latency, max_latency); + usec = PA_CLAMP(usec, min_latency, max_latency); } } diff --git a/src/pulsecore/strlist.c b/src/pulsecore/strlist.c index 0f4ca867..b2ba12ba 100644 --- a/src/pulsecore/strlist.c +++ b/src/pulsecore/strlist.c @@ -49,7 +49,7 @@ pa_strlist* pa_strlist_prepend(pa_strlist *l, const char *s) { memcpy(ITEM_TO_TEXT(n), s, size + 1); n->next = l; - return n; + return n; } char *pa_strlist_tostring(pa_strlist *l) { diff --git a/src/pulsecore/time-smoother.c b/src/pulsecore/time-smoother.c index 0696cabc..a8dd333f 100644 --- a/src/pulsecore/time-smoother.c +++ b/src/pulsecore/time-smoother.c @@ -385,7 +385,7 @@ void pa_smoother_put(pa_smoother *s, pa_usec_t x, pa_usec_t y) { s->abc_valid = FALSE; #ifdef DEBUG_DATA - pa_log_debug("%p, put(%llu | %llu) = %llu", s, (unsigned long long) (x + s->time_offset), (unsigned long long) x, (unsigned long long) y); + pa_log_debug("%p, put(%llu | %llu) = %llu", s, (unsigned long long) (x + s->time_offset), (unsigned long long) x, (unsigned long long) y); #endif } @@ -441,7 +441,7 @@ void pa_smoother_pause(pa_smoother *s, pa_usec_t x) { return; #ifdef DEBUG_DATA - pa_log_debug("pause(%llu)", (unsigned long long) x); + pa_log_debug("pause(%llu)", (unsigned long long) x); #endif s->paused = TRUE; -- cgit