From: Richard Kettlewell Date: Sat, 28 Jun 2008 09:43:36 +0000 (+0100) Subject: Placate over-picky compiler X-Git-Tag: 4.1~4 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/e2717131af000652f9d42145df28575a23af283e?hp=049dec8733c7a5df431c709890a7be00625fc534 Placate over-picky compiler --- diff --git a/disobedience/choose.h b/disobedience/choose.h index 1a9bf10..c101e6b 100644 --- a/disobedience/choose.h +++ b/disobedience/choose.h @@ -62,7 +62,7 @@ gboolean choose_button_event(GtkWidget *widget, GdkEventButton *event, gpointer user_data); void choose_play_completed(void attribute((unused)) *v, - const char *error); + const char *err); char *choose_get_track(GtkTreeIter *iter); char *choose_get_sort(GtkTreeIter *iter); char *choose_get_display(GtkTreeIter *iter); diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h index f709a27..1f63108 100644 --- a/disobedience/disobedience.h +++ b/disobedience/disobedience.h @@ -232,7 +232,7 @@ void choose_update(void); /* Called when we think the choose tree might need updating */ void play_completed(void *v, - const char *error); + const char *err); /* Login details */ diff --git a/disobedience/menu.c b/disobedience/menu.c index 868c9dc..142857c 100644 --- a/disobedience/menu.c +++ b/disobedience/menu.c @@ -31,7 +31,7 @@ static GtkWidget *properties_widget; GtkItemFactory *mainmenufactory; static void about_popup_got_version(void *v, - const char *error, + const char *err, const char *value); /** @brief Called when the quit option is activated diff --git a/disobedience/properties.c b/disobedience/properties.c index 8b46109..16ee97c 100644 --- a/disobedience/properties.c +++ b/disobedience/properties.c @@ -32,7 +32,7 @@ static void completed_namepart(struct prefdata *f); static const char *get_edited_namepart(struct prefdata *f); static void set_edited_namepart(struct prefdata *f, const char *value); static void set_namepart(struct prefdata *f, const char *value); -static void set_namepart_completed(void *v, const char *error); +static void set_namepart_completed(void *v, const char *err); static void kickoff_string(struct prefdata *f); static void completed_string(struct prefdata *f); @@ -46,7 +46,7 @@ static const char *get_edited_boolean(struct prefdata *f); static void set_edited_boolean(struct prefdata *f, const char *value); static void set_boolean(struct prefdata *f, const char *value); -static void prefdata_completed(void *v, const char *error, const char *value); +static void prefdata_completed(void *v, const char *err, const char *value); static void prefdata_onerror(struct callbackdata *cbd, int code, const char *msg); diff --git a/disobedience/queue.c b/disobedience/queue.c index 7dbe563..d69b34d 100644 --- a/disobedience/queue.c +++ b/disobedience/queue.c @@ -32,10 +32,10 @@ struct queue_entry *playing_track; time_t last_playing; static void queue_completed(void *v, - const char *error, + const char *err, struct queue_entry *q); static void playing_completed(void *v, - const char *error, + const char *err, struct queue_entry *q); /** @brief Called when either the actual queue or the playing track change */ diff --git a/lib/eclient.h b/lib/eclient.h index be5730c..efb6b2d 100644 --- a/lib/eclient.h +++ b/lib/eclient.h @@ -209,14 +209,14 @@ struct sink; /** @brief Trivial completion callback * @param v User data - * @param error Error string or NULL on succes + * @param err Error string or NULL on succes */ typedef void disorder_eclient_no_response(void *v, - const char *error); + const char *err); /** @brief String result completion callback * @param v User data - * @param error Error string or NULL on succes + * @param err Error string or NULL on succes * @param value Result or NULL * * @p error will be NULL on success. In this case @p value will be the result @@ -226,12 +226,12 @@ typedef void disorder_eclient_no_response(void *v, * @p error will be non-NULL on failure. In this case @p value is always NULL. */ typedef void disorder_eclient_string_response(void *v, - const char *error, + const char *err, const char *value); /** @brief String result completion callback * @param v User data - * @param error Error string or NULL on succes + * @param err Error string or NULL on succes * @param value Result or 0 * * @p error will be NULL on success. In this case @p value will be the result. @@ -239,11 +239,11 @@ typedef void disorder_eclient_string_response(void *v, * @p error will be non-NULL on failure. In this case @p value is always 0. */ typedef void disorder_eclient_integer_response(void *v, - const char *error, + const char *err, long value); /** @brief Volume completion callback * @param v User data - * @param error Error string or NULL on success + * @param err Error string or NULL on success * @param l Left channel volume * @param r Right channel volume * @@ -254,12 +254,12 @@ typedef void disorder_eclient_integer_response(void *v, * 0. */ typedef void disorder_eclient_volume_response(void *v, - const char *error, + const char *err, int l, int r); /** @brief Queue request completion callback * @param v User data - * @param error Error string or NULL on success + * @param err Error string or NULL on success * @param q Head of queue data list * * @p error will be NULL on success. In this case @p q will be the (head of @@ -270,12 +270,12 @@ typedef void disorder_eclient_volume_response(void *v, * be ignored in the error case. */ typedef void disorder_eclient_queue_response(void *v, - const char *error, + const char *err, struct queue_entry *q); /** @brief List request completion callback * @param v User data - * @param error Error string or NULL on success + * @param err Error string or NULL on success * @param nvec Number of elements in response list * @param vec Pointer to response list * @@ -286,7 +286,7 @@ typedef void disorder_eclient_queue_response(void *v, * be 0 and NULL. */ typedef void disorder_eclient_list_response(void *v, - const char *error, + const char *err, int nvec, char **vec); disorder_eclient *disorder_eclient_new(const disorder_eclient_callbacks *cb,