summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-08-18 20:07:32 +0200
committerLennart Poettering <lennart@poettering.net>2008-08-18 20:07:32 +0200
commite65c514542d5eee842fde9eb1eb6186c9f37c45b (patch)
tree42d977833be3e3433a4bae42e02b4c7d5a24998a
parent5cc2187bec5923e13fb3958d57a5243aaa57b982 (diff)
don't unref pa_native_options object twice
-rw-r--r--src/modules/module-native-protocol-fd.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/modules/module-native-protocol-fd.c b/src/modules/module-native-protocol-fd.c
index fa9c0e4f..f17f435a 100644
--- a/src/modules/module-native-protocol-fd.c
+++ b/src/modules/module-native-protocol-fd.c
@@ -48,7 +48,8 @@ static const char* const valid_modargs[] = {
int pa__init(pa_module*m) {
pa_iochannel *io;
pa_modargs *ma;
- int fd, r = -1;
+ int32_t fd;
+ int r = -1;
pa_native_options *options = NULL;
pa_assert(m);
@@ -63,18 +64,16 @@ int pa__init(pa_module*m) {
goto finish;
}
- options = pa_native_options_new();
- options->module = m;
- options->auth_anonymous = TRUE;
+ m->userdata = pa_native_protocol_get(m->core);
io = pa_iochannel_new(m->core->mainloop, fd, fd);
- m->userdata = pa_native_protocol_get(m->core);
+ options = pa_native_options_new();
+ options->module = m;
+ options->auth_anonymous = TRUE;
pa_native_protocol_connect(m->userdata, io, options);
- pa_native_options_unref(options);
-
r = 0;
finish: