summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-08-03 16:41:52 +0200
committerLennart Poettering <lennart@poettering.net>2008-08-03 16:41:52 +0200
commit5042284d45b524f1201232f6c09fda65977b70cc (patch)
tree535760663225604273c6c2ea7e96215988b3afe1 /src
parent084f4292f6d1f36ae175b9fd1de070dc942ff29e (diff)
introduce pa_cli_eof_cb_t
Diffstat (limited to 'src')
-rw-r--r--src/pulsecore/cli.c12
-rw-r--r--src/pulsecore/cli.h2
2 files changed, 8 insertions, 6 deletions
diff --git a/src/pulsecore/cli.c b/src/pulsecore/cli.c
index b3c639f8..2057b67a 100644
--- a/src/pulsecore/cli.c
+++ b/src/pulsecore/cli.c
@@ -52,7 +52,7 @@ struct pa_cli {
pa_core *core;
pa_ioline *line;
- void (*eof_callback)(pa_cli *c, void *userdata);
+ pa_cli_eof_cb_t eof_callback;
void *userdata;
pa_client *client;
@@ -107,12 +107,11 @@ static void client_kill(pa_client *client) {
pa_assert_se(c = client->userdata);
pa_log_debug("CLI client killed.");
+
if (c->defer_kill)
c->kill_requested = TRUE;
- else {
- if (c->eof_callback)
- c->eof_callback(c, c->userdata);
- }
+ else if (c->eof_callback)
+ c->eof_callback(c, c->userdata);
}
static void line_callback(pa_ioline *line, const char *s, void *userdata) {
@@ -125,6 +124,7 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
if (!s) {
pa_log_debug("CLI got EOF from user.");
+
if (c->eof_callback)
c->eof_callback(c, c->userdata);
@@ -145,7 +145,7 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
pa_ioline_puts(line, PROMPT);
}
-void pa_cli_set_eof_callback(pa_cli *c, void (*cb)(pa_cli*c, void *userdata), void *userdata) {
+void pa_cli_set_eof_callback(pa_cli *c, pa_cli_eof_cb_t cb, void *userdata) {
pa_assert(c);
c->eof_callback = cb;
diff --git a/src/pulsecore/cli.h b/src/pulsecore/cli.h
index 6077a8e8..3f7a6fa4 100644
--- a/src/pulsecore/cli.h
+++ b/src/pulsecore/cli.h
@@ -28,6 +28,8 @@
typedef struct pa_cli pa_cli;
+typedef void (*pa_cli_eof_cb_t)(pa_cli *c, void *userdata);
+
/* Create a new command line session on the specified io channel owned by the specified module */
pa_cli* pa_cli_new(pa_core *core, pa_iochannel *io, pa_module *m);
void pa_cli_free(pa_cli *cli);