commit 0ae738ac0d34dcdcac7b237ccf0fa60456d222c3 Author: Simo Sorce ssorce@redhat.com Date: Wed Jun 29 16:04:08 2011 -0400
Make pointer to function explicit for callback
Signed-off-by: Nathaniel McCallum npmccallum@redhat.com
src/verto.c | 14 +++++++------- src/verto.h | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) --- diff --git a/src/verto.c b/src/verto.c index c529e37..56a84d0 100644 --- a/src/verto.c +++ b/src/verto.c @@ -58,7 +58,7 @@ struct vertoEv { struct vertoEv *next; struct vertoEvCtx *ctx; enum vertoEvType type; - vertoCallback callback; + vertoCallback *callback; void *priv; void *modpriv; enum vertoEvFlag flags; @@ -218,7 +218,7 @@ load_module(const char *impl, void **dll, const struct vertoModule **module) }
static inline struct vertoEv * -make_ev(struct vertoEvCtx *ctx, vertoCallback callback, void *priv, +make_ev(struct vertoEvCtx *ctx, vertoCallback *callback, void *priv, enum vertoEvType type, enum vertoEvFlag flags) { struct vertoEv *ev = NULL; @@ -401,7 +401,7 @@ verto_break(struct vertoEvCtx *ctx)
struct vertoEv * verto_add_io(struct vertoEvCtx *ctx, enum vertoEvFlag flags, - vertoCallback callback, void *priv, int fd) + vertoCallback *callback, void *priv, int fd) { if (fd < 0 || !(flags & (VERTO_EV_FLAG_IO_READ | VERTO_EV_FLAG_IO_WRITE))) return NULL; @@ -410,21 +410,21 @@ verto_add_io(struct vertoEvCtx *ctx, enum vertoEvFlag flags,
struct vertoEv * verto_add_timeout(struct vertoEvCtx *ctx, enum vertoEvFlag flags, - vertoCallback callback, void *priv, time_t interval) + vertoCallback *callback, void *priv, time_t interval) { doadd(ev->option.interval = interval, VERTO_EV_TYPE_TIMEOUT); }
struct vertoEv * verto_add_idle(struct vertoEvCtx *ctx, enum vertoEvFlag flags, - vertoCallback callback, void *priv) + vertoCallback *callback, void *priv) { doadd(, VERTO_EV_TYPE_IDLE); }
struct vertoEv * verto_add_signal(struct vertoEvCtx *ctx, enum vertoEvFlag flags, - vertoCallback callback, void *priv, int signal) + vertoCallback *callback, void *priv, int signal) { if (signal < 0 || signal == SIGCHLD) return NULL; @@ -435,7 +435,7 @@ verto_add_signal(struct vertoEvCtx *ctx, enum vertoEvFlag flags,
struct vertoEv * verto_add_child(struct vertoEvCtx *ctx, enum vertoEvFlag flags, - vertoCallback callback, void *priv, pid_t pid) + vertoCallback *callback, void *priv, pid_t pid) { if (pid < 1 || (flags & VERTO_EV_FLAG_PERSIST)) /* persist makes no sense */ return NULL; diff --git a/src/verto.h b/src/verto.h index f678b48..cfa5f41 100644 --- a/src/verto.h +++ b/src/verto.h @@ -28,7 +28,7 @@ #include <time.h> /* For time_t */ #include <unistd.h> /* For pid_t */
-#define VERTO_SIG_IGN ((vertoCallback) 1) +#define VERTO_SIG_IGN ((vertoCallback *) 1)
struct vertoEvCtx; struct vertoEv; @@ -52,7 +52,7 @@ enum vertoEvFlag { _VERTO_EV_FLAG_MAX = VERTO_EV_FLAG_IO_WRITE };
-typedef void (*vertoCallback)(struct vertoEvCtx *ctx, struct vertoEv *ev); +typedef void (vertoCallback)(struct vertoEvCtx *ctx, struct vertoEv *ev);
/** * Creates a new event context using an optionally specified implementation. @@ -208,7 +208,7 @@ verto_break(struct vertoEvCtx *ctx); */ struct vertoEv * verto_add_io(struct vertoEvCtx *ctx, enum vertoEvFlag flags, - vertoCallback callback, void *priv, int fd); + vertoCallback *callback, void *priv, int fd);
/** * Adds a callback executed after a period of time. @@ -230,7 +230,7 @@ verto_add_io(struct vertoEvCtx *ctx, enum vertoEvFlag flags, */ struct vertoEv * verto_add_timeout(struct vertoEvCtx *ctx, enum vertoEvFlag flags, - vertoCallback callback, void *priv, time_t interval); + vertoCallback *callback, void *priv, time_t interval);
/** * Adds a callback executed when there is nothing else to do. @@ -251,7 +251,7 @@ verto_add_timeout(struct vertoEvCtx *ctx, enum vertoEvFlag flags, */ struct vertoEv * verto_add_idle(struct vertoEvCtx *ctx, enum vertoEvFlag flags, - vertoCallback callback, void *priv); + vertoCallback *callback, void *priv);
/** * Adds a callback executed when a signal is received. @@ -287,7 +287,7 @@ verto_add_idle(struct vertoEvCtx *ctx, enum vertoEvFlag flags, */ struct vertoEv * verto_add_signal(struct vertoEvCtx *ctx, enum vertoEvFlag flags, - vertoCallback callback, void *priv, int signal); + vertoCallback *callback, void *priv, int signal);
/** * Adds a callback executed when a child process exits. @@ -308,7 +308,7 @@ verto_add_signal(struct vertoEvCtx *ctx, enum vertoEvFlag flags, */ struct vertoEv * verto_add_child(struct vertoEvCtx *ctx, enum vertoEvFlag flags, - vertoCallback callback, void *priv, pid_t pid); + vertoCallback *callback, void *priv, pid_t pid);
/** * Gets the private pointer of the vertoEv.
libverto-commits@lists.fedorahosted.org