summaryrefslogtreecommitdiffstats
path: root/src/modules/module-tunnel.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-08-18 21:38:40 +0000
committerLennart Poettering <lennart@poettering.net>2006-08-18 21:38:40 +0000
commite385d93e5aad6a6fce754c00c804ff1d6a6746d4 (patch)
tree0abe352f3228513a912c209f62b0d3e857e62104 /src/modules/module-tunnel.c
parent1bc62d5ec671bf3edab5263fdc8015c0a701ce81 (diff)
remove all occurences of
pa_logXXX(__FILE__": and replace them by pa_logXXX(" git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1272 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/module-tunnel.c')
-rw-r--r--src/modules/module-tunnel.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index 53bffd3b..de1a12c9 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -206,7 +206,7 @@ static void command_stream_killed(pa_pdispatch *pd, PA_GCC_UNUSED uint32_t comma
struct userdata *u = userdata;
assert(pd && t && u && u->pdispatch == pd);
- pa_log(__FILE__": stream killed");
+ pa_log("stream killed");
die(u);
}
@@ -223,7 +223,7 @@ static void command_subscribe_event(pa_pdispatch *pd, PA_GCC_UNUSED uint32_t com
if (pa_tagstruct_getu32(t, &e) < 0 ||
pa_tagstruct_getu32(t, &idx) < 0 ||
!pa_tagstruct_eof(t)) {
- pa_log(__FILE__": invalid protocol reply");
+ pa_log("invalid protocol reply");
die(u);
return;
}
@@ -284,13 +284,13 @@ static void command_request(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED ui
if (pa_tagstruct_getu32(t, &channel) < 0 ||
pa_tagstruct_getu32(t, &bytes) < 0 ||
!pa_tagstruct_eof(t)) {
- pa_log(__FILE__": invalid protocol reply");
+ pa_log("invalid protocol reply");
die(u);
return;
}
if (channel != u->channel) {
- pa_log(__FILE__": recieved data for invalid channel");
+ pa_log("recieved data for invalid channel");
die(u);
return;
}
@@ -311,9 +311,9 @@ static void stream_get_latency_callback(pa_pdispatch *pd, uint32_t command, PA_G
if (command != PA_COMMAND_REPLY) {
if (command == PA_COMMAND_ERROR)
- pa_log(__FILE__": failed to get latency.");
+ pa_log("failed to get latency.");
else
- pa_log(__FILE__": protocol error.");
+ pa_log("protocol error.");
die(u);
return;
}
@@ -326,7 +326,7 @@ static void stream_get_latency_callback(pa_pdispatch *pd, uint32_t command, PA_G
pa_tagstruct_gets64(t, &write_index) < 0 ||
pa_tagstruct_gets64(t, &read_index) < 0 ||
!pa_tagstruct_eof(t)) {
- pa_log(__FILE__": invalid reply. (latency)");
+ pa_log("invalid reply. (latency)");
die(u);
return;
}
@@ -353,7 +353,7 @@ static void stream_get_latency_callback(pa_pdispatch *pd, uint32_t command, PA_G
u->host_latency = 0;
#endif
-/* pa_log(__FILE__": estimated host latency: %0.0f usec", (double) u->host_latency); */
+/* pa_log("estimated host latency: %0.0f usec", (double) u->host_latency); */
}
static void request_latency(struct userdata *u) {
@@ -392,9 +392,9 @@ static void stream_get_info_callback(pa_pdispatch *pd, uint32_t command, PA_GCC_
if (command != PA_COMMAND_REPLY) {
if (command == PA_COMMAND_ERROR)
- pa_log(__FILE__": failed to get info.");
+ pa_log("failed to get info.");
else
- pa_log(__FILE__": protocol error.");
+ pa_log("protocol error.");
die(u);
return;
}
@@ -413,7 +413,7 @@ static void stream_get_info_callback(pa_pdispatch *pd, uint32_t command, PA_GCC_
pa_tagstruct_gets(t, &driver) < 0 ||
pa_tagstruct_getu32(t, &flags) < 0 ||
!pa_tagstruct_eof(t)) {
- pa_log(__FILE__": invalid reply. (get_info)");
+ pa_log("invalid reply. (get_info)");
die(u);
return;
}
@@ -495,9 +495,9 @@ static void create_stream_callback(pa_pdispatch *pd, uint32_t command, PA_GCC_UN
if (command != PA_COMMAND_REPLY) {
if (command == PA_COMMAND_ERROR)
- pa_log(__FILE__": failed to create stream.");
+ pa_log("failed to create stream.");
else
- pa_log(__FILE__": protocol error.");
+ pa_log("protocol error.");
die(u);
return;
}
@@ -508,7 +508,7 @@ static void create_stream_callback(pa_pdispatch *pd, uint32_t command, PA_GCC_UN
pa_tagstruct_getu32(t, &u->requested_bytes) < 0 ||
#endif
!pa_tagstruct_eof(t)) {
- pa_log(__FILE__": invalid reply. (create stream)");
+ pa_log("invalid reply. (create stream)");
die(u);
return;
}
@@ -535,16 +535,16 @@ static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, uint32_t
pa_tagstruct_getu32(t, &u->version) < 0 ||
!pa_tagstruct_eof(t)) {
if (command == PA_COMMAND_ERROR)
- pa_log(__FILE__": failed to authenticate");
+ pa_log("failed to authenticate");
else
- pa_log(__FILE__": protocol error.");
+ pa_log("protocol error.");
die(u);
return;
}
/* Minimum supported protocol version */
if (u->version < 8) {
- pa_log(__FILE__": incompatible protocol version");
+ pa_log("incompatible protocol version");
die(u);
return;
}
@@ -606,7 +606,7 @@ static void pstream_die_callback(pa_pstream *p, void *userdata) {
struct userdata *u = userdata;
assert(p && u);
- pa_log(__FILE__": stream died.");
+ pa_log("stream died.");
die(u);
}
@@ -616,7 +616,7 @@ static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const pa_c
assert(p && packet && u);
if (pa_pdispatch_run(u->pdispatch, packet, creds, u) < 0) {
- pa_log(__FILE__": invalid packet");
+ pa_log("invalid packet");
die(u);
}
}
@@ -627,7 +627,7 @@ static void pstream_memblock_callback(pa_pstream *p, uint32_t channel, PA_GCC_UN
assert(p && chunk && u);
if (channel != u->channel) {
- pa_log(__FILE__": recieved memory block on bad channel.");
+ pa_log("recieved memory block on bad channel.");
die(u);
return;
}
@@ -646,7 +646,7 @@ static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata
u->client = NULL;
if (!io) {
- pa_log(__FILE__": connection failed.");
+ pa_log("connection failed.");
pa_module_unload_request(u->module);
return;
}
@@ -833,7 +833,7 @@ static int load_key(struct userdata *u, const char*fn) {
u->auth_cookie_in_property = 0;
if (!fn && pa_authkey_prop_get(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME, u->auth_cookie, sizeof(u->auth_cookie)) >= 0) {
- pa_log_debug(__FILE__": using already loaded auth cookie.");
+ pa_log_debug("using already loaded auth cookie.");
pa_authkey_prop_ref(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME);
u->auth_cookie_in_property = 1;
return 0;
@@ -845,7 +845,7 @@ static int load_key(struct userdata *u, const char*fn) {
if (pa_authkey_load_auto(fn, u->auth_cookie, sizeof(u->auth_cookie)) < 0)
return -1;
- pa_log_debug(__FILE__": loading cookie from disk.");
+ pa_log_debug("loading cookie from disk.");
if (pa_authkey_prop_put(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME, u->auth_cookie, sizeof(u->auth_cookie)) >= 0)
u->auth_cookie_in_property = 1;
@@ -864,7 +864,7 @@ int pa__init(pa_core *c, pa_module*m) {
assert(c && m);
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": failed to parse module arguments");
+ pa_log("failed to parse module arguments");
goto fail;
}
@@ -894,18 +894,18 @@ int pa__init(pa_core *c, pa_module*m) {
goto fail;
if (!(u->server_name = pa_xstrdup(pa_modargs_get_value(ma, "server", NULL)))) {
- pa_log(__FILE__": no server specified.");
+ pa_log("no server specified.");
goto fail;
}
ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_DEFAULT) < 0) {
- pa_log(__FILE__": invalid sample format specification");
+ pa_log("invalid sample format specification");
goto fail;
}
if (!(u->client = pa_socket_client_new_string(c->mainloop, u->server_name, PA_NATIVE_DEFAULT_PORT))) {
- pa_log(__FILE__": failed to connect to server '%s'", u->server_name);
+ pa_log("failed to connect to server '%s'", u->server_name);
goto fail;
}
@@ -916,7 +916,7 @@ int pa__init(pa_core *c, pa_module*m) {
#ifdef TUNNEL_SINK
if (!(u->sink = pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss, &map))) {
- pa_log(__FILE__": failed to create sink.");
+ pa_log("failed to create sink.");
goto fail;
}
@@ -933,7 +933,7 @@ int pa__init(pa_core *c, pa_module*m) {
pa_sink_set_owner(u->sink, m);
#else
if (!(u->source = pa_source_new(c, __FILE__, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, &map))) {
- pa_log(__FILE__": failed to create source.");
+ pa_log("failed to create source.");
goto fail;
}