mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow a formatted string in the validation warning.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1428 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2007-02-14 09:27:19 +00:00
parent 3016c7561d
commit 8bf7943e8e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pulsecore/protocol-esound.c
View file

@ -280,9 +280,9 @@ static int format_native2esd(pa_sample_spec *ss) {
return format; return format;
} }
#define CHECK_VALIDITY(expression, string) do { \ #define CHECK_VALIDITY(expression, ...) do { \
if (!(expression)) { \ if (!(expression)) { \
pa_log_warn(__FILE__ ": " string); \ pa_log_warn(__FILE__ ": " __VA_ARGS__); \
return -1; \ return -1; \
} \ } \
} while(0); } while(0);
@ -350,7 +350,7 @@ static int esd_proto_stream_play(struct connection *c, PA_GCC_UNUSED esd_proto_t
if (c->protocol->sink_name) { if (c->protocol->sink_name) {
sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1); sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1);
CHECK_VALIDITY(sink, "No such sink"); CHECK_VALIDITY(sink, "No such sink: %s", c->protocol->sink_name);
} }
strncpy(name, data, sizeof(name)); strncpy(name, data, sizeof(name));
@ -719,7 +719,7 @@ static int esd_proto_sample_cache(struct connection *c, PA_GCC_UNUSED esd_proto_
sc_length = MAYBE_INT32_SWAP(c->swap_byte_order, sc_length); sc_length = MAYBE_INT32_SWAP(c->swap_byte_order, sc_length);
data = (const char*)data + sizeof(int32_t); data = (const char*)data + sizeof(int32_t);
CHECK_VALIDITY(sc_length <= MAX_CACHE_SAMPLE_SIZE, "Sample too large."); CHECK_VALIDITY(sc_length <= MAX_CACHE_SAMPLE_SIZE, "Sample too large (%d bytes).", (int)sc_length);
strcpy(name, SCACHE_PREFIX); strcpy(name, SCACHE_PREFIX);
strncpy(name+sizeof(SCACHE_PREFIX)-1, data, ESD_NAME_MAX); strncpy(name+sizeof(SCACHE_PREFIX)-1, data, ESD_NAME_MAX);