* remove a lot of compiler warnings introduced by using some new GCC flags

[pulseaudio] / polyp / protocol-native.c

diff --git a/polyp/protocol-native.c b/polyp/protocol-native.c
index 90dbdaf5b68576d543d11693bd3849a9f43645da..b19d30d93907df699508687e93a51932be374007 100644 (file)
--- a/polyp/protocol-native.c
+++ b/polyp/protocol-native.c
@@ -64,8 +64,8 @@ struct pa_protocol_native;
 struct record_stream {
     struct connection *connection;
     uint32_t index;
-    struct pa_source_output *source_output;
-    struct pa_memblockq *memblockq;
+    pa_source_output *source_output;
+    pa_memblockq *memblockq;
     size_t fragment_size;
 };
 
@@ -73,8 +73,8 @@ struct playback_stream {
     int type;
     struct connection *connection;
     uint32_t index;
-    struct pa_sink_input *sink_input;
-    struct pa_memblockq *memblockq;
+    pa_sink_input *sink_input;
+    pa_memblockq *memblockq;
     size_t requested_bytes;
     int drain_request;
     uint32_t drain_tag;
@@ -84,10 +84,10 @@ struct upload_stream {
     int type;
     struct connection *connection;
     uint32_t index;
-    struct pa_memchunk memchunk;
+    pa_memchunk memchunk;
     size_t length;
     char *name;
-    struct pa_sample_spec sample_spec;
+    pa_sample_spec sample_spec;
 };
 
 struct output_stream {
@@ -101,141 +101,141 @@ enum {
 
 struct connection {
     int authorized;
-    struct pa_protocol_native *protocol;
-    struct pa_client *client;
-    struct pa_pstream *pstream;
-    struct pa_pdispatch *pdispatch;
-    struct pa_idxset *record_streams, *output_streams;
+    pa_protocol_native *protocol;
+    pa_client *client;
+    pa_pstream *pstream;
+    pa_pdispatch *pdispatch;
+    pa_idxset *record_streams, *output_streams;
     uint32_t rrobin_index;
-    struct pa_subscription *subscription;
-    struct pa_time_event *auth_timeout_event;
+    pa_subscription *subscription;
+    pa_time_event *auth_timeout_event;
 };
 
 struct pa_protocol_native {
-    struct pa_module *module;
+    pa_module *module;
     int public;
-    struct pa_core *core;
-    struct pa_socket_server *server;
-    struct pa_idxset *connections;
+    pa_core *core;
+    pa_socket_server *server;
+    pa_idxset *connections;
     uint8_t auth_cookie[PA_NATIVE_COOKIE_LENGTH];
     int auth_cookie_in_property;
 };
 
-static int sink_input_peek_cb(struct pa_sink_input *i, struct pa_memchunk *chunk);
-static void sink_input_drop_cb(struct pa_sink_input *i, const struct pa_memchunk *chunk, size_t length);
-static void sink_input_kill_cb(struct pa_sink_input *i);
-static pa_usec_t sink_input_get_latency_cb(struct pa_sink_input *i);
+static int sink_input_peek_cb(pa_sink_input *i, pa_memchunk *chunk);
+static void sink_input_drop_cb(pa_sink_input *i, const pa_memchunk *chunk, size_t length);
+static void sink_input_kill_cb(pa_sink_input *i);
+static pa_usec_t sink_input_get_latency_cb(pa_sink_input *i);
 
 static void request_bytes(struct playback_stream*s);
 
-static void source_output_kill_cb(struct pa_source_output *o);
-static void source_output_push_cb(struct pa_source_output *o, const struct pa_memchunk *chunk);
-static pa_usec_t source_output_get_latency_cb(struct pa_source_output *o);
-
-static void command_exit(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_create_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_drain_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_create_record_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_delete_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_auth(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_set_client_name(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_lookup(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_stat(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_get_playback_latency(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_get_record_latency(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_create_upload_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_finish_upload_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_play_sample(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_remove_sample(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_get_info(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_get_info_list(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_get_server_info(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_subscribe(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_set_volume(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_cork_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_flush_or_trigger_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_set_default_sink_or_source(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_set_stream_name(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_kill(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_load_module(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_unload_module(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_add_autoload(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_remove_autoload(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_get_autoload_info(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_get_autoload_info_list(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_cork_record_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-static void command_flush_record_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata);
-
-static const struct pa_pdispatch_command command_table[PA_COMMAND_MAX] = {
-    [PA_COMMAND_ERROR] = { NULL },
-    [PA_COMMAND_TIMEOUT] = { NULL },
-    [PA_COMMAND_REPLY] = { NULL },
-    [PA_COMMAND_CREATE_PLAYBACK_STREAM] = { command_create_playback_stream },
-    [PA_COMMAND_DELETE_PLAYBACK_STREAM] = { command_delete_stream },
-    [PA_COMMAND_DRAIN_PLAYBACK_STREAM] = { command_drain_playback_stream },
-    [PA_COMMAND_CREATE_RECORD_STREAM] = { command_create_record_stream },
-    [PA_COMMAND_DELETE_RECORD_STREAM] = { command_delete_stream },
-    [PA_COMMAND_AUTH] = { command_auth },
-    [PA_COMMAND_REQUEST] = { NULL },
-    [PA_COMMAND_EXIT] = { command_exit },
-    [PA_COMMAND_SET_CLIENT_NAME] = { command_set_client_name },
-    [PA_COMMAND_LOOKUP_SINK] = { command_lookup },
-    [PA_COMMAND_LOOKUP_SOURCE] = { command_lookup },
-    [PA_COMMAND_STAT] = { command_stat },
-    [PA_COMMAND_GET_PLAYBACK_LATENCY] = { command_get_playback_latency },
-    [PA_COMMAND_GET_RECORD_LATENCY] = { command_get_record_latency },
-    [PA_COMMAND_CREATE_UPLOAD_STREAM] = { command_create_upload_stream },
-    [PA_COMMAND_DELETE_UPLOAD_STREAM] = { command_delete_stream },
-    [PA_COMMAND_FINISH_UPLOAD_STREAM] = { command_finish_upload_stream },
-    [PA_COMMAND_PLAY_SAMPLE] = { command_play_sample },
-    [PA_COMMAND_REMOVE_SAMPLE] = { command_remove_sample },
-    [PA_COMMAND_GET_SINK_INFO] = { command_get_info },
-    [PA_COMMAND_GET_SOURCE_INFO] = { command_get_info },
-    [PA_COMMAND_GET_CLIENT_INFO] = { command_get_info },
-    [PA_COMMAND_GET_MODULE_INFO] = { command_get_info },
-    [PA_COMMAND_GET_SINK_INPUT_INFO] = { command_get_info },
-    [PA_COMMAND_GET_SOURCE_OUTPUT_INFO] = { command_get_info },
-    [PA_COMMAND_GET_SAMPLE_INFO] = { command_get_info },
-    [PA_COMMAND_GET_SINK_INFO_LIST] = { command_get_info_list },
-    [PA_COMMAND_GET_SOURCE_INFO_LIST] = { command_get_info_list },
-    [PA_COMMAND_GET_MODULE_INFO_LIST] = { command_get_info_list },
-    [PA_COMMAND_GET_CLIENT_INFO_LIST] = { command_get_info_list },
-    [PA_COMMAND_GET_SINK_INPUT_INFO_LIST] = { command_get_info_list },
-    [PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST] = { command_get_info_list },
-    [PA_COMMAND_GET_SAMPLE_INFO_LIST] = { command_get_info_list },
-    [PA_COMMAND_GET_SERVER_INFO] = { command_get_server_info },
-    [PA_COMMAND_SUBSCRIBE] = { command_subscribe },
-
-    [PA_COMMAND_SET_SINK_VOLUME] = { command_set_volume },
-    [PA_COMMAND_SET_SINK_INPUT_VOLUME] = { command_set_volume },
+static void source_output_kill_cb(pa_source_output *o);
+static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk);
+static pa_usec_t source_output_get_latency_cb(pa_source_output *o);
+
+static void command_exit(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_drain_playback_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_delete_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_set_client_name(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_lookup(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_stat(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_get_playback_latency(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_get_record_latency(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_create_upload_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_finish_upload_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_play_sample(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_remove_sample(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_get_info(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_get_info_list(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_get_server_info(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_subscribe(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_set_volume(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_cork_playback_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_flush_or_trigger_playback_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_set_default_sink_or_source(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_set_stream_name(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_kill(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_load_module(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_unload_module(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_add_autoload(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_remove_autoload(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_get_autoload_info(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_get_autoload_info_list(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_cork_record_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+static void command_flush_record_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
+
+static const pa_pdispatch_callback command_table[PA_COMMAND_MAX] = {
+    [PA_COMMAND_ERROR] = NULL,
+    [PA_COMMAND_TIMEOUT] = NULL,
+    [PA_COMMAND_REPLY] = NULL,
+    [PA_COMMAND_CREATE_PLAYBACK_STREAM] = command_create_playback_stream,
+    [PA_COMMAND_DELETE_PLAYBACK_STREAM] = command_delete_stream,
+    [PA_COMMAND_DRAIN_PLAYBACK_STREAM] = command_drain_playback_stream,
+    [PA_COMMAND_CREATE_RECORD_STREAM] = command_create_record_stream,
+    [PA_COMMAND_DELETE_RECORD_STREAM] = command_delete_stream,
+    [PA_COMMAND_AUTH] = command_auth,
+    [PA_COMMAND_REQUEST] = NULL,
+    [PA_COMMAND_EXIT] = command_exit,
+    [PA_COMMAND_SET_CLIENT_NAME] = command_set_client_name,
+    [PA_COMMAND_LOOKUP_SINK] = command_lookup,
+    [PA_COMMAND_LOOKUP_SOURCE] = command_lookup,
+    [PA_COMMAND_STAT] = command_stat,
+    [PA_COMMAND_GET_PLAYBACK_LATENCY] = command_get_playback_latency,
+    [PA_COMMAND_GET_RECORD_LATENCY] = command_get_record_latency,
+    [PA_COMMAND_CREATE_UPLOAD_STREAM] = command_create_upload_stream,
+    [PA_COMMAND_DELETE_UPLOAD_STREAM] = command_delete_stream,
+    [PA_COMMAND_FINISH_UPLOAD_STREAM] = command_finish_upload_stream,
+    [PA_COMMAND_PLAY_SAMPLE] = command_play_sample,
+    [PA_COMMAND_REMOVE_SAMPLE] = command_remove_sample,
+    [PA_COMMAND_GET_SINK_INFO] = command_get_info,
+    [PA_COMMAND_GET_SOURCE_INFO] = command_get_info,
+    [PA_COMMAND_GET_CLIENT_INFO] = command_get_info,
+    [PA_COMMAND_GET_MODULE_INFO] = command_get_info,
+    [PA_COMMAND_GET_SINK_INPUT_INFO] = command_get_info,
+    [PA_COMMAND_GET_SOURCE_OUTPUT_INFO] = command_get_info,
+    [PA_COMMAND_GET_SAMPLE_INFO] = command_get_info,
+    [PA_COMMAND_GET_SINK_INFO_LIST] = command_get_info_list,
+    [PA_COMMAND_GET_SOURCE_INFO_LIST] = command_get_info_list,
+    [PA_COMMAND_GET_MODULE_INFO_LIST] = command_get_info_list,
+    [PA_COMMAND_GET_CLIENT_INFO_LIST] = command_get_info_list,
+    [PA_COMMAND_GET_SINK_INPUT_INFO_LIST] = command_get_info_list,
+    [PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST] = command_get_info_list,
+    [PA_COMMAND_GET_SAMPLE_INFO_LIST] = command_get_info_list,
+    [PA_COMMAND_GET_SERVER_INFO] = command_get_server_info,
+    [PA_COMMAND_SUBSCRIBE] = command_subscribe,
+
+    [PA_COMMAND_SET_SINK_VOLUME] = command_set_volume,
+    [PA_COMMAND_SET_SINK_INPUT_VOLUME] = command_set_volume,
     
-    [PA_COMMAND_CORK_PLAYBACK_STREAM] = { command_cork_playback_stream },
-    [PA_COMMAND_FLUSH_PLAYBACK_STREAM] = { command_flush_or_trigger_playback_stream },
-    [PA_COMMAND_TRIGGER_PLAYBACK_STREAM] = { command_flush_or_trigger_playback_stream },
-    [PA_COMMAND_PREBUF_PLAYBACK_STREAM] = { command_flush_or_trigger_playback_stream },
+    [PA_COMMAND_CORK_PLAYBACK_STREAM] = command_cork_playback_stream,
+    [PA_COMMAND_FLUSH_PLAYBACK_STREAM] = command_flush_or_trigger_playback_stream,
+    [PA_COMMAND_TRIGGER_PLAYBACK_STREAM] = command_flush_or_trigger_playback_stream,
+    [PA_COMMAND_PREBUF_PLAYBACK_STREAM] = command_flush_or_trigger_playback_stream,
     
-    [PA_COMMAND_CORK_RECORD_STREAM] = { command_cork_record_stream },
-    [PA_COMMAND_FLUSH_RECORD_STREAM] = { command_flush_record_stream },
+    [PA_COMMAND_CORK_RECORD_STREAM] = command_cork_record_stream,
+    [PA_COMMAND_FLUSH_RECORD_STREAM] = command_flush_record_stream,
     
-    [PA_COMMAND_SET_DEFAULT_SINK] = { command_set_default_sink_or_source },
-    [PA_COMMAND_SET_DEFAULT_SOURCE] = { command_set_default_sink_or_source },
-    [PA_COMMAND_SET_PLAYBACK_STREAM_NAME] = { command_set_stream_name }, 
-    [PA_COMMAND_SET_RECORD_STREAM_NAME] = { command_set_stream_name },
-    [PA_COMMAND_KILL_CLIENT] = { command_kill },
-    [PA_COMMAND_KILL_SINK_INPUT] = { command_kill },
-    [PA_COMMAND_KILL_SOURCE_OUTPUT] = { command_kill },
-    [PA_COMMAND_LOAD_MODULE] = { command_load_module },
-    [PA_COMMAND_UNLOAD_MODULE] = { command_unload_module },
-    [PA_COMMAND_GET_AUTOLOAD_INFO] = { command_get_autoload_info },
-    [PA_COMMAND_GET_AUTOLOAD_INFO_LIST] = { command_get_autoload_info_list },
-    [PA_COMMAND_ADD_AUTOLOAD] = { command_add_autoload },
-    [PA_COMMAND_REMOVE_AUTOLOAD] = { command_remove_autoload },
+    [PA_COMMAND_SET_DEFAULT_SINK] = command_set_default_sink_or_source,
+    [PA_COMMAND_SET_DEFAULT_SOURCE] = command_set_default_sink_or_source,
+    [PA_COMMAND_SET_PLAYBACK_STREAM_NAME] = command_set_stream_name, 
+    [PA_COMMAND_SET_RECORD_STREAM_NAME] = command_set_stream_name,
+    [PA_COMMAND_KILL_CLIENT] = command_kill,
+    [PA_COMMAND_KILL_SINK_INPUT] = command_kill,
+    [PA_COMMAND_KILL_SOURCE_OUTPUT] = command_kill,
+    [PA_COMMAND_LOAD_MODULE] = command_load_module,
+    [PA_COMMAND_UNLOAD_MODULE] = command_unload_module,
+    [PA_COMMAND_GET_AUTOLOAD_INFO] = command_get_autoload_info,
+    [PA_COMMAND_GET_AUTOLOAD_INFO_LIST] = command_get_autoload_info_list,
+    [PA_COMMAND_ADD_AUTOLOAD] = command_add_autoload,
+    [PA_COMMAND_REMOVE_AUTOLOAD] = command_remove_autoload,
 
 };
 
 /* structure management */
 
-static struct upload_stream* upload_stream_new(struct connection *c, const struct pa_sample_spec *ss, const char *name, size_t length) {
+static struct upload_stream* upload_stream_new(struct connection *c, const pa_sample_spec *ss, const char *name, size_t length) {
     struct upload_stream *s;
     assert(c && ss && name && length);
     
@@ -268,9 +268,9 @@ static void upload_stream_free(struct upload_stream *o) {
     pa_xfree(o);
 }
 
-static struct record_stream* record_stream_new(struct connection *c, struct pa_source *source, const struct pa_sample_spec *ss, const char *name, size_t maxlength, size_t fragment_size) {
+static struct record_stream* record_stream_new(struct connection *c, pa_source *source, const pa_sample_spec *ss, const char *name, size_t maxlength, size_t fragment_size) {
     struct record_stream *s;
-    struct pa_source_output *source_output;
+    pa_source_output *source_output;
     size_t base;
     assert(c && source && ss && name && maxlength);
 
@@ -308,14 +308,14 @@ static void record_stream_free(struct record_stream* r) {
     pa_xfree(r);
 }
 
-static struct playback_stream* playback_stream_new(struct connection *c, struct pa_sink *sink, const struct pa_sample_spec *ss, const char *name,
+static struct playback_stream* playback_stream_new(struct connection *c, pa_sink *sink, const pa_sample_spec *ss, const char *name,
                                                    size_t maxlength,
                                                    size_t tlength,
                                                    size_t prebuf,
                                                    size_t minreq,
                                                    pa_volume_t volume) {
     struct playback_stream *s;
-    struct pa_sink_input *sink_input;
+    pa_sink_input *sink_input;
     assert(c && sink && ss && name && maxlength);
 
     if (!(sink_input = pa_sink_input_new(sink, PA_TYPEID_NATIVE, name, ss, 0, -1)))
@@ -391,7 +391,7 @@ static void connection_free(struct connection *c) {
 }
 
 static void request_bytes(struct playback_stream *s) {
-    struct pa_tagstruct *t;
+    pa_tagstruct *t;
     size_t l;
     assert(s);
 
@@ -425,7 +425,7 @@ static void send_memblock(struct connection *c) {
 
     start = PA_IDXSET_INVALID;
     for (;;) {
-        struct pa_memchunk chunk;
+        pa_memchunk chunk;
         
         if (!(r = pa_idxset_rrobin(c->record_streams, &c->rrobin_index)))
             return;
@@ -436,7 +436,7 @@ static void send_memblock(struct connection *c) {
             return;
 
         if (pa_memblockq_peek(r->memblockq,  &chunk) >= 0) {
-            struct pa_memchunk schunk = chunk;
+            pa_memchunk schunk = chunk;
             
             if (schunk.length > r->fragment_size)
                 schunk.length = r->fragment_size;
@@ -451,7 +451,7 @@ static void send_memblock(struct connection *c) {
 }
 
 static void send_playback_stream_killed(struct playback_stream *p) {
-    struct pa_tagstruct *t;
+    pa_tagstruct *t;
     assert(p);
 
     t = pa_tagstruct_new(NULL, 0);
@@ -463,7 +463,7 @@ static void send_playback_stream_killed(struct playback_stream *p) {
 }
 
 static void send_record_stream_killed(struct record_stream *r) {
-    struct pa_tagstruct *t;
+    pa_tagstruct *t;
     assert(r);
 
     t = pa_tagstruct_new(NULL, 0);
@@ -476,7 +476,7 @@ static void send_record_stream_killed(struct record_stream *r) {
 
 /*** sinkinput callbacks ***/
 
-static int sink_input_peek_cb(struct pa_sink_input *i, struct pa_memchunk *chunk) {
+static int sink_input_peek_cb(pa_sink_input *i, pa_memchunk *chunk) {
     struct playback_stream *s;
     assert(i && i->userdata && chunk);
     s = i->userdata;
@@ -487,7 +487,7 @@ static int sink_input_peek_cb(struct pa_sink_input *i, struct pa_memchunk *chunk
     return 0;
 }
 
-static void sink_input_drop_cb(struct pa_sink_input *i, const struct pa_memchunk *chunk, size_t length) {
+static void sink_input_drop_cb(pa_sink_input *i, const pa_memchunk *chunk, size_t length) {
     struct playback_stream *s;
     assert(i && i->userdata && length);
     s = i->userdata;
@@ -503,13 +503,13 @@ static void sink_input_drop_cb(struct pa_sink_input *i, const struct pa_memchunk
 /*     pa_log(__FILE__": after_drop: %u\n", pa_memblockq_get_length(s->memblockq)); */
 }
 
-static void sink_input_kill_cb(struct pa_sink_input *i) {
+static void sink_input_kill_cb(pa_sink_input *i) {
     assert(i && i->userdata);
     send_playback_stream_killed((struct playback_stream *) i->userdata);
     playback_stream_free((struct playback_stream *) i->userdata);
 }
 
-static pa_usec_t sink_input_get_latency_cb(struct pa_sink_input *i) {
+static pa_usec_t sink_input_get_latency_cb(pa_sink_input *i) {
     struct playback_stream *s;
     assert(i && i->userdata);
     s = i->userdata;
@@ -521,7 +521,7 @@ static pa_usec_t sink_input_get_latency_cb(struct pa_sink_input *i) {
 
 /*** source_output callbacks ***/
 
-static void source_output_push_cb(struct pa_source_output *o, const struct pa_memchunk *chunk) {
+static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) {
     struct record_stream *s;
     assert(o && o->userdata && chunk);
     s = o->userdata;
@@ -531,13 +531,13 @@ static void source_output_push_cb(struct pa_source_output *o, const struct pa_me
         send_memblock(s->connection);
 }
 
-static void source_output_kill_cb(struct pa_source_output *o) {
+static void source_output_kill_cb(pa_source_output *o) {
     assert(o && o->userdata);
     send_record_stream_killed((struct record_stream *) o->userdata);
     record_stream_free((struct record_stream *) o->userdata);
 }
 
-static pa_usec_t source_output_get_latency_cb(struct pa_source_output *o) {
+static pa_usec_t source_output_get_latency_cb(pa_source_output *o) {
     struct record_stream *s;
     assert(o && o->userdata);
     s = o->userdata;
@@ -554,15 +554,15 @@ static void protocol_error(struct connection *c) {
     connection_free(c);
 }
 
-static void command_create_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_create_playback_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     struct playback_stream *s;
     size_t maxlength, tlength, prebuf, minreq;
     uint32_t sink_index;
     const char *name, *sink_name;
-    struct pa_sample_spec ss;
-    struct pa_tagstruct *reply;
-    struct pa_sink *sink;
+    pa_sample_spec ss;
+    pa_tagstruct *reply;
+    pa_sink *sink;
     pa_volume_t volume;
     int corked;
     assert(c && t && c->protocol && c->protocol->core);
@@ -618,7 +618,7 @@ static void command_create_playback_stream(struct pa_pdispatch *pd, uint32_t com
     request_bytes(s);
 }
 
-static void command_delete_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_delete_stream(PA_GCC_UNUSED pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     uint32_t channel;
     assert(c && t);
@@ -664,15 +664,15 @@ static void command_delete_stream(struct pa_pdispatch *pd, uint32_t command, uin
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void command_create_record_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_create_record_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     struct record_stream *s;
     size_t maxlength, fragment_size;
     uint32_t source_index;
     const char *name, *source_name;
-    struct pa_sample_spec ss;
-    struct pa_tagstruct *reply;
-    struct pa_source *source;
+    pa_sample_spec ss;
+    pa_tagstruct *reply;
+    pa_source *source;
     int corked;
     assert(c && t && c->protocol && c->protocol->core);
     
@@ -720,7 +720,7 @@ static void command_create_record_stream(struct pa_pdispatch *pd, uint32_t comma
     pa_pstream_send_tagstruct(c->pstream, reply);
 }
 
-static void command_exit(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_exit(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     assert(c && t);
     
@@ -740,7 +740,7 @@ static void command_exit(struct pa_pdispatch *pd, uint32_t command, uint32_t tag
     return;
 }
 
-static void command_auth(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_auth(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     const void*cookie;
     assert(c && t);
@@ -769,7 +769,7 @@ static void command_auth(struct pa_pdispatch *pd, uint32_t command, uint32_t tag
     return;
 }
 
-static void command_set_client_name(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_set_client_name(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     const char *name;
     assert(c && t);
@@ -785,10 +785,10 @@ static void command_set_client_name(struct pa_pdispatch *pd, uint32_t command, u
     return;
 }
 
-static void command_lookup(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_lookup(PA_GCC_UNUSED pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     const char *name;
-    uint32_t index = PA_IDXSET_INVALID;
+    uint32_t idx = PA_IDXSET_INVALID;
     assert(c && t);
 
     if (pa_tagstruct_gets(t, &name) < 0 || !name ||
@@ -803,36 +803,36 @@ static void command_lookup(struct pa_pdispatch *pd, uint32_t command, uint32_t t
     }
 
     if (command == PA_COMMAND_LOOKUP_SINK) {
-        struct pa_sink *sink;
+        pa_sink *sink;
         if ((sink = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SINK, 1)))
-            index = sink->index;
+            idx = sink->index;
     } else {
-        struct pa_source *source;
+        pa_source *source;
         assert(command == PA_COMMAND_LOOKUP_SOURCE);
         if ((source = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SOURCE, 1)))
-            index = source->index;
+            idx = source->index;
     }
 
-    if (index == PA_IDXSET_INVALID)
+    if (idx == PA_IDXSET_INVALID)
         pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
     else {
-        struct pa_tagstruct *reply;
+        pa_tagstruct *reply;
         reply = pa_tagstruct_new(NULL, 0);
         assert(reply);
         pa_tagstruct_putu32(reply, PA_COMMAND_REPLY);
         pa_tagstruct_putu32(reply, tag);
-        pa_tagstruct_putu32(reply, index);
+        pa_tagstruct_putu32(reply, idx);
         pa_pstream_send_tagstruct(c->pstream, reply);
     }
 }
 
-static void command_drain_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_drain_playback_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    uint32_t index;
+    uint32_t idx;
     struct playback_stream *s;
     assert(c && t);
 
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         !pa_tagstruct_eof(t)) {
         protocol_error(c);
         return;
@@ -843,7 +843,7 @@ static void command_drain_playback_stream(struct pa_pdispatch *pd, uint32_t comm
         return;
     }
 
-    if (!(s = pa_idxset_get_by_index(c->output_streams, index)) || s->type != PLAYBACK_STREAM) {
+    if (!(s = pa_idxset_get_by_index(c->output_streams, idx)) || s->type != PLAYBACK_STREAM) {
         pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
         return;
     }
@@ -864,9 +864,9 @@ static void command_drain_playback_stream(struct pa_pdispatch *pd, uint32_t comm
     }
 } 
 
-static void command_stat(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_stat(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    struct pa_tagstruct *reply;
+    pa_tagstruct *reply;
     assert(c && t);
 
     if (!pa_tagstruct_eof(t)) {
@@ -891,16 +891,16 @@ static void command_stat(struct pa_pdispatch *pd, uint32_t command, uint32_t tag
     pa_pstream_send_tagstruct(c->pstream, reply);
 }
 
-static void command_get_playback_latency(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_get_playback_latency(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    struct pa_tagstruct *reply;
+    pa_tagstruct *reply;
     struct playback_stream *s;
     struct timeval tv, now;
     uint64_t counter;
-    uint32_t index;
+    uint32_t idx;
     assert(c && t);
     
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         pa_tagstruct_get_timeval(t, &tv) < 0 ||
         pa_tagstruct_getu64(t, &counter) < 0 ||
         !pa_tagstruct_eof(t)) {
@@ -913,7 +913,7 @@ static void command_get_playback_latency(struct pa_pdispatch *pd, uint32_t comma
         return;
     }
 
-    if (!(s = pa_idxset_get_by_index(c->output_streams, index)) || s->type != PLAYBACK_STREAM) {
+    if (!(s = pa_idxset_get_by_index(c->output_streams, idx)) || s->type != PLAYBACK_STREAM) {
         pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
         return;
     }
@@ -934,16 +934,16 @@ static void command_get_playback_latency(struct pa_pdispatch *pd, uint32_t comma
     pa_pstream_send_tagstruct(c->pstream, reply);
 }
 
-static void command_get_record_latency(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_get_record_latency(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    struct pa_tagstruct *reply;
+    pa_tagstruct *reply;
     struct record_stream *s;
     struct timeval tv, now;
     uint64_t counter;
-    uint32_t index;
+    uint32_t idx;
     assert(c && t);
 
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         pa_tagstruct_get_timeval(t, &tv) < 0 ||
         pa_tagstruct_getu64(t, &counter) < 0 ||
         !pa_tagstruct_eof(t)) {
@@ -956,7 +956,7 @@ static void command_get_record_latency(struct pa_pdispatch *pd, uint32_t command
         return;
     }
 
-    if (!(s = pa_idxset_get_by_index(c->record_streams, index))) {
+    if (!(s = pa_idxset_get_by_index(c->record_streams, idx))) {
         pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
         return;
     }
@@ -978,13 +978,13 @@ static void command_get_record_latency(struct pa_pdispatch *pd, uint32_t command
 }
 
 
-static void command_create_upload_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_create_upload_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     struct upload_stream *s;
     size_t length;
     const char *name;
-    struct pa_sample_spec ss;
-    struct pa_tagstruct *reply;
+    pa_sample_spec ss;
+    pa_tagstruct *reply;
     assert(c && t && c->protocol && c->protocol->core);
     
     if (pa_tagstruct_gets(t, &name) < 0 || !name ||
@@ -1019,11 +1019,11 @@ static void command_create_upload_stream(struct pa_pdispatch *pd, uint32_t comma
     pa_pstream_send_tagstruct(c->pstream, reply);
 }
 
-static void command_finish_upload_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_finish_upload_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     uint32_t channel;
     struct upload_stream *s;
-    uint32_t index;
+    uint32_t idx;
     assert(c && t);
     
     if (pa_tagstruct_getu32(t, &channel) < 0 ||
@@ -1042,15 +1042,15 @@ static void command_finish_upload_stream(struct pa_pdispatch *pd, uint32_t comma
         return;
     }
 
-    pa_scache_add_item(c->protocol->core, s->name, &s->sample_spec, &s->memchunk, &index);
+    pa_scache_add_item(c->protocol->core, s->name, &s->sample_spec, &s->memchunk, &idx);
     pa_pstream_send_simple_ack(c->pstream, tag);
     upload_stream_free(s);
 }
 
-static void command_play_sample(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_play_sample(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     uint32_t sink_index, volume;
-    struct pa_sink *sink;
+    pa_sink *sink;
     const char *name, *sink_name;
     assert(c && t);
 
@@ -1086,7 +1086,7 @@ static void command_play_sample(struct pa_pdispatch *pd, uint32_t command, uint3
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void command_remove_sample(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_remove_sample(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     const char *name;
     assert(c && t);
@@ -1110,7 +1110,7 @@ static void command_remove_sample(struct pa_pdispatch *pd, uint32_t command, uin
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void sink_fill_tagstruct(struct pa_tagstruct *t, struct pa_sink *sink) {
+static void sink_fill_tagstruct(pa_tagstruct *t, pa_sink *sink) {
     assert(t && sink);
     pa_tagstruct_putu32(t, sink->index);
     pa_tagstruct_puts(t, sink->name);
@@ -1124,7 +1124,7 @@ static void sink_fill_tagstruct(struct pa_tagstruct *t, struct pa_sink *sink) {
     pa_tagstruct_putu32(t, sink->typeid);
 }
 
-static void source_fill_tagstruct(struct pa_tagstruct *t, struct pa_source *source) {
+static void source_fill_tagstruct(pa_tagstruct *t, pa_source *source) {
     assert(t && source);
     pa_tagstruct_putu32(t, source->index);
     pa_tagstruct_puts(t, source->name);
@@ -1137,7 +1137,7 @@ static void source_fill_tagstruct(struct pa_tagstruct *t, struct pa_source *sour
     pa_tagstruct_putu32(t, source->typeid);
 }
 
-static void client_fill_tagstruct(struct pa_tagstruct *t, struct pa_client *client) {
+static void client_fill_tagstruct(pa_tagstruct *t, pa_client *client) {
     assert(t && client);
     pa_tagstruct_putu32(t, client->index);
     pa_tagstruct_puts(t, client->name);
@@ -1145,7 +1145,7 @@ static void client_fill_tagstruct(struct pa_tagstruct *t, struct pa_client *clie
     pa_tagstruct_putu32(t, client->typeid);
 }
 
-static void module_fill_tagstruct(struct pa_tagstruct *t, struct pa_module *module) {
+static void module_fill_tagstruct(pa_tagstruct *t, pa_module *module) {
     assert(t && module);
     pa_tagstruct_putu32(t, module->index);
     pa_tagstruct_puts(t, module->name);
@@ -1154,7 +1154,7 @@ static void module_fill_tagstruct(struct pa_tagstruct *t, struct pa_module *modu
     pa_tagstruct_put_boolean(t, module->auto_unload);
 }
 
-static void sink_input_fill_tagstruct(struct pa_tagstruct *t, struct pa_sink_input *s) {
+static void sink_input_fill_tagstruct(pa_tagstruct *t, pa_sink_input *s) {
     assert(t && s);
     pa_tagstruct_putu32(t, s->index);
     pa_tagstruct_puts(t, s->name);
@@ -1169,7 +1169,7 @@ static void sink_input_fill_tagstruct(struct pa_tagstruct *t, struct pa_sink_inp
     pa_tagstruct_putu32(t, s->typeid);
 }
 
-static void source_output_fill_tagstruct(struct pa_tagstruct *t, struct pa_source_output *s) {
+static void source_output_fill_tagstruct(pa_tagstruct *t, pa_source_output *s) {
     assert(t && s);
     pa_tagstruct_putu32(t, s->index);
     pa_tagstruct_puts(t, s->name);
@@ -1183,7 +1183,7 @@ static void source_output_fill_tagstruct(struct pa_tagstruct *t, struct pa_sourc
     pa_tagstruct_putu32(t, s->typeid);
 }
 
-static void scache_fill_tagstruct(struct pa_tagstruct *t, struct pa_scache_entry *e) {
+static void scache_fill_tagstruct(pa_tagstruct *t, pa_scache_entry *e) {
     assert(t && e);
     pa_tagstruct_putu32(t, e->index);
     pa_tagstruct_puts(t, e->name);
@@ -1195,22 +1195,22 @@ static void scache_fill_tagstruct(struct pa_tagstruct *t, struct pa_scache_entry
     pa_tagstruct_puts(t, e->filename);
 }
 
-static void command_get_info(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_get_info(PA_GCC_UNUSED pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    uint32_t index;
-    struct pa_sink *sink = NULL;
-    struct pa_source *source = NULL;
-    struct pa_client *client = NULL;
-    struct pa_module *module = NULL;
-    struct pa_sink_input *si = NULL;
-    struct pa_source_output *so = NULL;
-    struct pa_scache_entry *sce = NULL;
+    uint32_t idx;
+    pa_sink *sink = NULL;
+    pa_source *source = NULL;
+    pa_client *client = NULL;
+    pa_module *module = NULL;
+    pa_sink_input *si = NULL;
+    pa_source_output *so = NULL;
+    pa_scache_entry *sce = NULL;
     const char *name;
-    struct pa_tagstruct *reply;
+    pa_tagstruct *reply;
     assert(c && t);
 
     
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         (command != PA_COMMAND_GET_CLIENT_INFO &&
          command != PA_COMMAND_GET_MODULE_INFO &&
          command != PA_COMMAND_GET_SINK_INPUT_INFO &&
@@ -1227,27 +1227,27 @@ static void command_get_info(struct pa_pdispatch *pd, uint32_t command, uint32_t
     }
 
     if (command == PA_COMMAND_GET_SINK_INFO) {
-        if (index != (uint32_t) -1)
-            sink = pa_idxset_get_by_index(c->protocol->core->sinks, index);
+        if (idx != (uint32_t) -1)
+            sink = pa_idxset_get_by_index(c->protocol->core->sinks, idx);
         else
             sink = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SINK, 1);
     } else if (command == PA_COMMAND_GET_SOURCE_INFO) {
-        if (index != (uint32_t) -1)
-            source = pa_idxset_get_by_index(c->protocol->core->sources, index);
+        if (idx != (uint32_t) -1)
+            source = pa_idxset_get_by_index(c->protocol->core->sources, idx);
         else
             source = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SOURCE, 1);
     } else if (command == PA_COMMAND_GET_CLIENT_INFO)
-        client = pa_idxset_get_by_index(c->protocol->core->clients, index);
+        client = pa_idxset_get_by_index(c->protocol->core->clients, idx);
     else if (command == PA_COMMAND_GET_MODULE_INFO) 
-        module = pa_idxset_get_by_index(c->protocol->core->modules, index);
+        module = pa_idxset_get_by_index(c->protocol->core->modules, idx);
     else if (command == PA_COMMAND_GET_SINK_INPUT_INFO)
-        si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, index);
+        si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx);
     else if (command == PA_COMMAND_GET_SOURCE_OUTPUT_INFO)
-        so = pa_idxset_get_by_index(c->protocol->core->source_outputs, index);
+        so = pa_idxset_get_by_index(c->protocol->core->source_outputs, idx);
     else {
         assert(command == PA_COMMAND_GET_SAMPLE_INFO);
-        if (index != (uint32_t) -1)
-            sce = pa_idxset_get_by_index(c->protocol->core->scache, index);
+        if (idx != (uint32_t) -1)
+            sce = pa_idxset_get_by_index(c->protocol->core->scache, idx);
         else
             sce = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SAMPLE, 0);
     }
@@ -1278,12 +1278,12 @@ static void command_get_info(struct pa_pdispatch *pd, uint32_t command, uint32_t
     pa_pstream_send_tagstruct(c->pstream, reply);
 }
 
-static void command_get_info_list(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_get_info_list(PA_GCC_UNUSED pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    struct pa_idxset *i;
-    uint32_t index;
+    pa_idxset *i;
+    uint32_t idx;
     void *p;
-    struct pa_tagstruct *reply;
+    pa_tagstruct *reply;
     assert(c && t);
 
     if (!pa_tagstruct_eof(t)) {
@@ -1319,7 +1319,7 @@ static void command_get_info_list(struct pa_pdispatch *pd, uint32_t command, uin
     }
 
     if (i) {
-        for (p = pa_idxset_first(i, &index); p; p = pa_idxset_next(i, &index)) {
+        for (p = pa_idxset_first(i, &idx); p; p = pa_idxset_next(i, &idx)) {
             if (command == PA_COMMAND_GET_SINK_INFO_LIST)
                 sink_fill_tagstruct(reply, p);
             else if (command == PA_COMMAND_GET_SOURCE_INFO_LIST)
@@ -1342,9 +1342,9 @@ static void command_get_info_list(struct pa_pdispatch *pd, uint32_t command, uin
     pa_pstream_send_tagstruct(c->pstream, reply);
 }
 
-static void command_get_server_info(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_get_server_info(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    struct pa_tagstruct *reply;
+    pa_tagstruct *reply;
     char txt[256];
     const char *n;
     assert(c && t);
@@ -1379,8 +1379,8 @@ static void command_get_server_info(struct pa_pdispatch *pd, uint32_t command, u
     pa_pstream_send_tagstruct(c->pstream, reply);
 }
 
-static void subscription_cb(struct pa_core *core, enum pa_subscription_event_type e, uint32_t index, void *userdata) {
-    struct pa_tagstruct *t;
+static void subscription_cb(pa_core *core, pa_subscription_event_type e, uint32_t idx, void *userdata) {
+    pa_tagstruct *t;
     struct connection *c = userdata;
     assert(c && core);
 
@@ -1389,13 +1389,13 @@ static void subscription_cb(struct pa_core *core, enum pa_subscription_event_typ
     pa_tagstruct_putu32(t, PA_COMMAND_SUBSCRIBE_EVENT);
     pa_tagstruct_putu32(t, (uint32_t) -1);
     pa_tagstruct_putu32(t, e);
-    pa_tagstruct_putu32(t, index);
+    pa_tagstruct_putu32(t, idx);
     pa_pstream_send_tagstruct(c->pstream, t);
 }
 
-static void command_subscribe(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_subscribe(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    enum pa_subscription_mask m;
+    pa_subscription_mask m;
     assert(c && t);
 
     if (pa_tagstruct_getu32(t, &m) < 0 ||
@@ -1421,15 +1421,15 @@ static void command_subscribe(struct pa_pdispatch *pd, uint32_t command, uint32_
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void command_set_volume(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_set_volume(PA_GCC_UNUSED pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    uint32_t index, volume;
-    struct pa_sink *sink = NULL;
-    struct pa_sink_input *si = NULL;
+    uint32_t idx, volume;
+    pa_sink *sink = NULL;
+    pa_sink_input *si = NULL;
     const char *name = NULL;
     assert(c && t);
 
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         (command == PA_COMMAND_SET_SINK_VOLUME && pa_tagstruct_gets(t, &name) < 0) ||
         pa_tagstruct_getu32(t, &volume) ||
         !pa_tagstruct_eof(t)) {
@@ -1443,13 +1443,13 @@ static void command_set_volume(struct pa_pdispatch *pd, uint32_t command, uint32
     }
 
     if (command == PA_COMMAND_SET_SINK_VOLUME) {
-        if (index != (uint32_t) -1)
-            sink = pa_idxset_get_by_index(c->protocol->core->sinks, index);
+        if (idx != (uint32_t) -1)
+            sink = pa_idxset_get_by_index(c->protocol->core->sinks, idx);
         else
             sink = pa_namereg_get(c->protocol->core, name, PA_NAMEREG_SINK, 1);
     }  else {
         assert(command == PA_COMMAND_SET_SINK_INPUT_VOLUME);
-        si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, index);
+        si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx);
     }
 
     if (!si && !sink) {
@@ -1465,14 +1465,14 @@ static void command_set_volume(struct pa_pdispatch *pd, uint32_t command, uint32
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void command_cork_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_cork_playback_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    uint32_t index;
+    uint32_t idx;
     int b;
     struct playback_stream *s;
     assert(c && t);
 
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         pa_tagstruct_get_boolean(t, &b) < 0 ||
         !pa_tagstruct_eof(t)) {
         protocol_error(c);
@@ -1484,7 +1484,7 @@ static void command_cork_playback_stream(struct pa_pdispatch *pd, uint32_t comma
         return;
     }
 
-    if (!(s = pa_idxset_get_by_index(c->output_streams, index)) || s->type != PLAYBACK_STREAM) {
+    if (!(s = pa_idxset_get_by_index(c->output_streams, idx)) || s->type != PLAYBACK_STREAM) {
         pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
         return;
     }
@@ -1493,13 +1493,13 @@ static void command_cork_playback_stream(struct pa_pdispatch *pd, uint32_t comma
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void command_flush_or_trigger_playback_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_flush_or_trigger_playback_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    uint32_t index;
+    uint32_t idx;
     struct playback_stream *s;
     assert(c && t);
 
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         !pa_tagstruct_eof(t)) {
         protocol_error(c);
         return;
@@ -1510,7 +1510,7 @@ static void command_flush_or_trigger_playback_stream(struct pa_pdispatch *pd, ui
         return;
     }
 
-    if (!(s = pa_idxset_get_by_index(c->output_streams, index)) || s->type != PLAYBACK_STREAM) {
+    if (!(s = pa_idxset_get_by_index(c->output_streams, idx)) || s->type != PLAYBACK_STREAM) {
         pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
         return;
     }
@@ -1530,14 +1530,14 @@ static void command_flush_or_trigger_playback_stream(struct pa_pdispatch *pd, ui
     request_bytes(s);
 }
 
-static void command_cork_record_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_cork_record_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    uint32_t index;
+    uint32_t idx;
     struct record_stream *s;
     int b;
     assert(c && t);
 
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         pa_tagstruct_get_boolean(t, &b) < 0 ||
         !pa_tagstruct_eof(t)) {
         protocol_error(c);
@@ -1549,7 +1549,7 @@ static void command_cork_record_stream(struct pa_pdispatch *pd, uint32_t command
         return;
     }
 
-    if (!(s = pa_idxset_get_by_index(c->record_streams, index))) {
+    if (!(s = pa_idxset_get_by_index(c->record_streams, idx))) {
         pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
         return;
     }
@@ -1558,13 +1558,13 @@ static void command_cork_record_stream(struct pa_pdispatch *pd, uint32_t command
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void command_flush_record_stream(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_flush_record_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    uint32_t index;
+    uint32_t idx;
     struct record_stream *s;
     assert(c && t);
 
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         !pa_tagstruct_eof(t)) {
         protocol_error(c);
         return;
@@ -1575,7 +1575,7 @@ static void command_flush_record_stream(struct pa_pdispatch *pd, uint32_t comman
         return;
     }
 
-    if (!(s = pa_idxset_get_by_index(c->record_streams, index))) {
+    if (!(s = pa_idxset_get_by_index(c->record_streams, idx))) {
         pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
         return;
     }
@@ -1584,13 +1584,13 @@ static void command_flush_record_stream(struct pa_pdispatch *pd, uint32_t comman
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void command_set_default_sink_or_source(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_set_default_sink_or_source(PA_GCC_UNUSED pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    uint32_t index;
+    uint32_t idx;
     const char *s;
     assert(c && t);
 
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         pa_tagstruct_gets(t, &s) < 0 || !s ||
         !pa_tagstruct_eof(t)) {
         protocol_error(c);
@@ -1606,13 +1606,13 @@ static void command_set_default_sink_or_source(struct pa_pdispatch *pd, uint32_t
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void command_set_stream_name(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_set_stream_name(PA_GCC_UNUSED pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    uint32_t index;
+    uint32_t idx;
     const char *name;
     assert(c && t);
 
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         pa_tagstruct_gets(t, &name) < 0 || !name || 
         !pa_tagstruct_eof(t)) {
         protocol_error(c);
@@ -1627,7 +1627,7 @@ static void command_set_stream_name(struct pa_pdispatch *pd, uint32_t command, u
     if (command == PA_COMMAND_SET_PLAYBACK_STREAM_NAME) {
         struct playback_stream *s;
         
-        if (!(s = pa_idxset_get_by_index(c->output_streams, index)) || s->type != PLAYBACK_STREAM) {
+        if (!(s = pa_idxset_get_by_index(c->output_streams, idx)) || s->type != PLAYBACK_STREAM) {
             pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
             return;
         }
@@ -1637,7 +1637,7 @@ static void command_set_stream_name(struct pa_pdispatch *pd, uint32_t command, u
     } else {
         struct record_stream *s;
         
-        if (!(s = pa_idxset_get_by_index(c->record_streams, index))) {
+        if (!(s = pa_idxset_get_by_index(c->record_streams, idx))) {
             pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
             return;
         }
@@ -1648,12 +1648,12 @@ static void command_set_stream_name(struct pa_pdispatch *pd, uint32_t command, u
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void command_kill(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_kill(PA_GCC_UNUSED pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    uint32_t index;
+    uint32_t idx;
     assert(c && t);
 
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         !pa_tagstruct_eof(t)) {
         protocol_error(c);
         return;
@@ -1665,29 +1665,29 @@ static void command_kill(struct pa_pdispatch *pd, uint32_t command, uint32_t tag
     }
 
     if (command == PA_COMMAND_KILL_CLIENT) {
-        struct pa_client *client;
+        pa_client *client;
         
-        if (!(client = pa_idxset_get_by_index(c->protocol->core->clients, index))) {
+        if (!(client = pa_idxset_get_by_index(c->protocol->core->clients, idx))) {
             pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
             return;
         }
 
         pa_client_kill(client);
     } else if (command == PA_COMMAND_KILL_SINK_INPUT) {
-        struct pa_sink_input *s;
+        pa_sink_input *s;
         
-        if (!(s = pa_idxset_get_by_index(c->protocol->core->sink_inputs, index))) {
+        if (!(s = pa_idxset_get_by_index(c->protocol->core->sink_inputs, idx))) {
             pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
             return;
         }
 
         pa_sink_input_kill(s);
     } else {
-        struct pa_source_output *s;
+        pa_source_output *s;
 
         assert(command == PA_COMMAND_KILL_SOURCE_OUTPUT);
         
-        if (!(s = pa_idxset_get_by_index(c->protocol->core->source_outputs, index))) {
+        if (!(s = pa_idxset_get_by_index(c->protocol->core->source_outputs, idx))) {
             pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
             return;
         }
@@ -1698,11 +1698,11 @@ static void command_kill(struct pa_pdispatch *pd, uint32_t command, uint32_t tag
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void command_load_module(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_load_module(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    struct pa_module *m;
+    pa_module *m;
     const char *name, *argument;
-    struct pa_tagstruct *reply;
+    pa_tagstruct *reply;
     assert(c && t);
 
     if (pa_tagstruct_gets(t, &name) < 0 || !name ||
@@ -1729,13 +1729,13 @@ static void command_load_module(struct pa_pdispatch *pd, uint32_t command, uint3
     pa_pstream_send_tagstruct(c->pstream, reply);
 }
 
-static void command_unload_module(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_unload_module(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    uint32_t index;
-    struct pa_module *m;
+    uint32_t idx;
+    pa_module *m;
     assert(c && t);
 
-    if (pa_tagstruct_getu32(t, &index) < 0 ||
+    if (pa_tagstruct_getu32(t, &idx) < 0 ||
         !pa_tagstruct_eof(t)) {
         protocol_error(c);
         return;
@@ -1746,7 +1746,7 @@ static void command_unload_module(struct pa_pdispatch *pd, uint32_t command, uin
         return;
     }
 
-    if (!(m = pa_idxset_get_by_index(c->protocol->core->modules, index))) {
+    if (!(m = pa_idxset_get_by_index(c->protocol->core->modules, idx))) {
         pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
         return;
     }
@@ -1755,12 +1755,12 @@ static void command_unload_module(struct pa_pdispatch *pd, uint32_t command, uin
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void command_add_autoload(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_add_autoload(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     const char *name, *module, *argument;
     uint32_t type;
-    uint32_t index;
-    struct pa_tagstruct *reply;
+    uint32_t idx;
+    pa_tagstruct *reply;
     assert(c && t);
 
     if (pa_tagstruct_gets(t, &name) < 0 || !name ||
@@ -1777,7 +1777,7 @@ static void command_add_autoload(struct pa_pdispatch *pd, uint32_t command, uint
         return;
     }
 
-    if (pa_autoload_add(c->protocol->core, name, type == 0 ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE, module, argument, &index) < 0) {
+    if (pa_autoload_add(c->protocol->core, name, type == 0 ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE, module, argument, &idx) < 0) {
         pa_pstream_send_error(c->pstream, tag, PA_ERROR_EXIST);
         return;
     }
@@ -1785,21 +1785,21 @@ static void command_add_autoload(struct pa_pdispatch *pd, uint32_t command, uint
     reply = pa_tagstruct_new(NULL, 0);
     pa_tagstruct_putu32(reply, PA_COMMAND_REPLY);
     pa_tagstruct_putu32(reply, tag);
-    pa_tagstruct_putu32(reply, index);
+    pa_tagstruct_putu32(reply, idx);
     pa_pstream_send_tagstruct(c->pstream, reply);
 }
 
-static void command_remove_autoload(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_remove_autoload(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     const char *name = NULL;
-    uint32_t type, index = PA_IDXSET_INVALID;
+    uint32_t type, idx = PA_IDXSET_INVALID;
     int r;
     assert(c && t);
 
-    if ((pa_tagstruct_getu32(t, &index) < 0 &&
+    if ((pa_tagstruct_getu32(t, &idx) < 0 &&
         (pa_tagstruct_gets(t, &name) < 0 ||
          pa_tagstruct_getu32(t, &type) < 0)) ||
-        (!name && index == PA_IDXSET_INVALID) ||
+        (!name && idx == PA_IDXSET_INVALID) ||
         (name && type > 1) ||
         !pa_tagstruct_eof(t)) {
         protocol_error(c);
@@ -1814,7 +1814,7 @@ static void command_remove_autoload(struct pa_pdispatch *pd, uint32_t command, u
     if (name) 
         r = pa_autoload_remove_by_name(c->protocol->core, name, type == 0 ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE);
     else
-        r = pa_autoload_remove_by_index(c->protocol->core, index);
+        r = pa_autoload_remove_by_index(c->protocol->core, idx);
 
     if (r < 0) {
         pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
@@ -1824,7 +1824,7 @@ static void command_remove_autoload(struct pa_pdispatch *pd, uint32_t command, u
     pa_pstream_send_simple_ack(c->pstream, tag);
 }
 
-static void autoload_fill_tagstruct(struct pa_tagstruct *t, const struct pa_autoload_entry *e) {
+static void autoload_fill_tagstruct(pa_tagstruct *t, const pa_autoload_entry *e) {
     assert(t && e);
 
     pa_tagstruct_putu32(t, e->index);
@@ -1834,18 +1834,18 @@ static void autoload_fill_tagstruct(struct pa_tagstruct *t, const struct pa_auto
     pa_tagstruct_puts(t, e->argument);
 }
 
-static void command_get_autoload_info(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_get_autoload_info(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    const struct pa_autoload_entry *a = NULL;
-    uint32_t type, index;
+    const pa_autoload_entry *a = NULL;
+    uint32_t type, idx;
     const char *name;
-    struct pa_tagstruct *reply;
+    pa_tagstruct *reply;
     assert(c && t);
 
-    if ((pa_tagstruct_getu32(t, &index) < 0 &&
+    if ((pa_tagstruct_getu32(t, &idx) < 0 &&
         (pa_tagstruct_gets(t, &name) < 0 ||
          pa_tagstruct_getu32(t, &type) < 0)) ||
-        (!name && index == PA_IDXSET_INVALID) ||
+        (!name && idx == PA_IDXSET_INVALID) ||
         (name && type > 1) ||
         !pa_tagstruct_eof(t)) {
         protocol_error(c);
@@ -1861,7 +1861,7 @@ static void command_get_autoload_info(struct pa_pdispatch *pd, uint32_t command,
     if (name)
         a = pa_autoload_get_by_name(c->protocol->core, name, type == 0 ? PA_NAMEREG_SINK : PA_NAMEREG_SOURCE);
     else
-        a = pa_autoload_get_by_index(c->protocol->core, index);
+        a = pa_autoload_get_by_index(c->protocol->core, idx);
 
     if (!a) {
         pa_pstream_send_error(c->pstream, tag, PA_ERROR_NOENTITY);
@@ -1876,9 +1876,9 @@ static void command_get_autoload_info(struct pa_pdispatch *pd, uint32_t command,
     pa_pstream_send_tagstruct(c->pstream, reply);
 }
 
-static void command_get_autoload_info_list(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) {
+static void command_get_autoload_info_list(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
-    struct pa_tagstruct *reply;
+    pa_tagstruct *reply;
     assert(c && t);
 
     if (!pa_tagstruct_eof(t)) {
@@ -1896,7 +1896,7 @@ static void command_get_autoload_info_list(struct pa_pdispatch *pd, uint32_t com
     pa_tagstruct_putu32(reply, tag);
 
     if (c->protocol->core->autoload_hashmap) {
-        struct pa_autoload_entry *a;
+        pa_autoload_entry *a;
         void *state = NULL;
 
         while ((a = pa_hashmap_iterate(c->protocol->core->autoload_hashmap, &state, NULL)))
@@ -1908,7 +1908,7 @@ static void command_get_autoload_info_list(struct pa_pdispatch *pd, uint32_t com
 
 /*** pstream callbacks ***/
 
-static void pstream_packet_callback(struct pa_pstream *p, struct pa_packet *packet, void *userdata) {
+static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, void *userdata) {
     struct connection *c = userdata;
     assert(p && packet && packet->data && c);
 
@@ -1918,7 +1918,7 @@ static void pstream_packet_callback(struct pa_pstream *p, struct pa_packet *pack
     }
 }
 
-static void pstream_memblock_callback(struct pa_pstream *p, uint32_t channel, uint32_t delta, const struct pa_memchunk *chunk, void *userdata) {
+static void pstream_memblock_callback(pa_pstream *p, uint32_t channel, uint32_t delta, const pa_memchunk *chunk, void *userdata) {
     struct connection *c = userdata;
     struct output_stream *stream;
     assert(p && chunk && userdata);
@@ -1930,17 +1930,17 @@ static void pstream_memblock_callback(struct pa_pstream *p, uint32_t channel, ui
     }
 
     if (stream->type == PLAYBACK_STREAM) {
-        struct playback_stream *p = (struct playback_stream*) stream;
-        if (chunk->length >= p->requested_bytes)
-            p->requested_bytes = 0;
+        struct playback_stream *ps = (struct playback_stream*) stream;
+        if (chunk->length >= ps->requested_bytes)
+            ps->requested_bytes = 0;
         else
-            p->requested_bytes -= chunk->length;
+            ps->requested_bytes -= chunk->length;
         
-        pa_memblockq_push_align(p->memblockq, chunk, delta);
-        assert(p->sink_input);
+        pa_memblockq_push_align(ps->memblockq, chunk, delta);
+        assert(ps->sink_input);
 /*         pa_log(__FILE__": after_recv: %u\n", pa_memblockq_get_length(p->memblockq)); */
 
-        pa_sink_notify(p->sink_input->sink);
+        pa_sink_notify(ps->sink_input->sink);
 /*          pa_log(__FILE__": Recieved %u bytes.\n", chunk->length);  */
 
     } else {
@@ -1974,7 +1974,7 @@ static void pstream_memblock_callback(struct pa_pstream *p, uint32_t channel, ui
     }
 }
 
-static void pstream_die_callback(struct pa_pstream *p, void *userdata) {
+static void pstream_die_callback(pa_pstream *p, void *userdata) {
     struct connection *c = userdata;
     assert(p && c);
     connection_free(c);
@@ -1983,7 +1983,7 @@ static void pstream_die_callback(struct pa_pstream *p, void *userdata) {
 }
 
 
-static void pstream_drain_callback(struct pa_pstream *p, void *userdata) {
+static void pstream_drain_callback(pa_pstream *p, void *userdata) {
     struct connection *c = userdata;
     assert(p && c);
 
@@ -1992,14 +1992,14 @@ static void pstream_drain_callback(struct pa_pstream *p, void *userdata) {
 
 /*** client callbacks ***/
 
-static void client_kill_cb(struct pa_client *c) {
+static void client_kill_cb(pa_client *c) {
     assert(c && c->userdata);
     connection_free(c->userdata);
 }
 
 /*** socket server callbacks ***/
 
-static void auth_timeout(struct pa_mainloop_api*m, struct pa_time_event *e, const struct timeval *tv, void *userdata) {
+static void auth_timeout(pa_mainloop_api*m, pa_time_event *e, const struct timeval *tv, void *userdata) {
     struct connection *c = userdata;
     assert(m && tv && c && c->auth_timeout_event == e);
 
@@ -2007,12 +2007,12 @@ static void auth_timeout(struct pa_mainloop_api*m, struct pa_time_event *e, cons
         connection_free(c);
 }
 
-static void on_connection(struct pa_socket_server*s, struct pa_iochannel *io, void *userdata) {
-    struct pa_protocol_native *p = userdata;
+static void on_connection(PA_GCC_UNUSED pa_socket_server*s, pa_iochannel *io, void *userdata) {
+    pa_protocol_native *p = userdata;
     struct connection *c;
     assert(io && p);
 
-    if (pa_idxset_ncontents(p->connections)+1 > MAX_CONNECTIONS) {
+    if (pa_idxset_size(p->connections)+1 > MAX_CONNECTIONS) {
         pa_log_warn(__FILE__": Warning! Too many connections (%u), dropping incoming connection.\n", MAX_CONNECTIONS);
         pa_iochannel_free(io);
         return;
@@ -2061,7 +2061,7 @@ static void on_connection(struct pa_socket_server*s, struct pa_iochannel *io, vo
 
 /*** module entry points ***/
 
-static int load_key(struct pa_protocol_native*p, const char*fn) {
+static int load_key(pa_protocol_native*p, const char*fn) {
     assert(p);
 
     p->auth_cookie_in_property = 0;
@@ -2087,8 +2087,8 @@ static int load_key(struct pa_protocol_native*p, const char*fn) {
     return 0;
 }
 
-static struct pa_protocol_native* protocol_new_internal(struct pa_core *c, struct pa_module *m, struct pa_modargs *ma) {
-    struct pa_protocol_native *p;
+static pa_protocol_native* protocol_new_internal(pa_core *c, pa_module *m, pa_modargs *ma) {
+    pa_protocol_native *p;
     int public = 0;
     assert(c && ma);
 
@@ -2097,7 +2097,7 @@ static struct pa_protocol_native* protocol_new_internal(struct pa_core *c, struc
         return NULL;
     }
     
-    p = pa_xmalloc(sizeof(struct pa_protocol_native));
+    p = pa_xmalloc(sizeof(pa_protocol_native));
     p->core = c;
     p->module = m;
     p->public = public;
@@ -2114,9 +2114,9 @@ static struct pa_protocol_native* protocol_new_internal(struct pa_core *c, struc
     return p;
 }
 
-struct pa_protocol_native* pa_protocol_native_new(struct pa_core *core, struct pa_socket_server *server, struct pa_module *m, struct pa_modargs *ma) {
+pa_protocol_native* pa_protocol_native_new(pa_core *core, pa_socket_server *server, pa_module *m, pa_modargs *ma) {
     char t[256];
-    struct pa_protocol_native *p;
+    pa_protocol_native *p;
 
     if (!(p = protocol_new_internal(core, m, ma)))
         return NULL;
@@ -2125,7 +2125,7 @@ struct pa_protocol_native* pa_protocol_native_new(struct pa_core *core, struct p
     pa_socket_server_set_callback(p->server, on_connection, p);
 
     if (pa_socket_server_get_address(p->server, t, sizeof(t))) {
-        struct pa_strlist *l;
+        pa_strlist *l;
         l = pa_property_get(core, PA_NATIVE_SERVER_PROPERTY_NAME);
         l = pa_strlist_prepend(l, t);
         pa_property_replace(core, PA_NATIVE_SERVER_PROPERTY_NAME, l);
@@ -2134,7 +2134,7 @@ struct pa_protocol_native* pa_protocol_native_new(struct pa_core *core, struct p
     return p;
 }
 
-void pa_protocol_native_free(struct pa_protocol_native *p) {
+void pa_protocol_native_free(pa_protocol_native *p) {
     struct connection *c;
     assert(p);
 
@@ -2146,7 +2146,7 @@ void pa_protocol_native_free(struct pa_protocol_native *p) {
         char t[256];
         
         if (pa_socket_server_get_address(p->server, t, sizeof(t))) {
-            struct pa_strlist *l;
+            pa_strlist *l;
             l = pa_property_get(p->core, PA_NATIVE_SERVER_PROPERTY_NAME);
             l = pa_strlist_remove(l, t);
 
@@ -2165,8 +2165,8 @@ void pa_protocol_native_free(struct pa_protocol_native *p) {
     pa_xfree(p);
 }
 
-struct pa_protocol_native* pa_protocol_native_new_iochannel(struct pa_core*core, struct pa_iochannel *io, struct pa_module *m, struct pa_modargs *ma) {
-    struct pa_protocol_native *p;
+pa_protocol_native* pa_protocol_native_new_iochannel(pa_core*core, pa_iochannel *io, pa_module *m, pa_modargs *ma) {
+    pa_protocol_native *p;
 
     if (!(p = protocol_new_internal(core, m, ma)))
         return NULL;