summaryrefslogtreecommitdiffstats
path: root/polyp/mainloop-api.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-01-11 01:17:39 +0000
committerLennart Poettering <lennart@poettering.net>2006-01-11 01:17:39 +0000
commit1f0961368f58a9fec319d86c79a86a9f0d008cf5 (patch)
treec712a897bb34ade3c03a06ba754264153ac3bc16 /polyp/mainloop-api.c
parent6c512fb5a3fdb578179be79672c5096de1a1d25b (diff)
* remove a lot of compiler warnings introduced by using some new GCC flags
* add typedefs for public structs and enums and drop the struct/enum prefixs from all uses where it makes sense git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@447 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/mainloop-api.c')
-rw-r--r--polyp/mainloop-api.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/polyp/mainloop-api.c b/polyp/mainloop-api.c
index 7b80e4fe..3229ec20 100644
--- a/polyp/mainloop-api.c
+++ b/polyp/mainloop-api.c
@@ -28,13 +28,14 @@
#include "mainloop-api.h"
#include "xmalloc.h"
+#include "gccmacro.h"
struct once_info {
- void (*callback)(struct pa_mainloop_api*m, void *userdata);
+ void (*callback)(pa_mainloop_api*m, void *userdata);
void *userdata;
};
-static void once_callback(struct pa_mainloop_api *m, struct pa_defer_event *e, void *userdata) {
+static void once_callback(pa_mainloop_api *m, pa_defer_event *e, void *userdata) {
struct once_info *i = userdata;
assert(m && i && i->callback);
@@ -44,18 +45,18 @@ static void once_callback(struct pa_mainloop_api *m, struct pa_defer_event *e, v
m->defer_free(e);
}
-static void free_callback(struct pa_mainloop_api *m, struct pa_defer_event *e, void *userdata) {
+static void free_callback(pa_mainloop_api *m, PA_GCC_UNUSED pa_defer_event *e, void *userdata) {
struct once_info *i = userdata;
assert(m && i);
pa_xfree(i);
}
-void pa_mainloop_api_once(struct pa_mainloop_api* m, void (*callback)(struct pa_mainloop_api *m, void *userdata), void *userdata) {
+void pa_mainloop_api_once(pa_mainloop_api* m, void (*callback)(pa_mainloop_api *m, void *userdata), void *userdata) {
struct once_info *i;
- struct pa_defer_event *e;
+ pa_defer_event *e;
assert(m && callback);
- i = pa_xmalloc(sizeof(struct once_info));
+ i = pa_xnew(struct once_info, 1);
i->callback = callback;
i->userdata = userdata;