(gtk) SHUTUP cleanup

This commit is contained in:
Charles Kerr
2008-01-19 05:04:38 +00:00
parent 3a47dfdb23
commit 9423e89aec
6 changed files with 31 additions and 32 deletions
+2 -2
View File
@@ -144,7 +144,7 @@ makeaddwind( GtkWindow * parent, TrCore * core )
}
void
addwindnocore( gpointer gdata, GObject * core SHUTUP )
addwindnocore( gpointer gdata, GObject * core UNUSED )
{
struct addcb * data = gdata;
@@ -279,7 +279,7 @@ promptfordir( GtkWindow * parent, TrCore * core, GList * files, uint8_t * data,
}
void
promptdirnocore( gpointer gdata, GObject * core SHUTUP )
promptdirnocore( gpointer gdata, GObject * core UNUSED )
{
struct dirdata * stuff = gdata;
+4 -4
View File
@@ -216,7 +216,7 @@ freeoutbuf(struct iooutbuf *buf) {
}
static gboolean
io_prepare(GSource *source SHUTUP, gint *timeout_) {
io_prepare(GSource *source UNUSED, gint *timeout_) {
*timeout_ = -1;
return FALSE;
}
@@ -234,8 +234,8 @@ io_check(GSource *source) {
}
static gboolean
io_dispatch(GSource *source, GSourceFunc callback SHUTUP,
gpointer gdata SHUTUP) {
io_dispatch(GSource *source, GSourceFunc callback UNUSED,
gpointer gdata UNUSED) {
struct iosource *io = (struct iosource*)source;
if(io->infd.revents & (G_IO_ERR | G_IO_HUP) ||
@@ -253,7 +253,7 @@ io_dispatch(GSource *source, GSourceFunc callback SHUTUP,
static void
io_finalize(GSource *source SHUTUP) {
io_finalize(GSource *source UNUSED) {
struct iosource *io = (struct iosource*)source;
if(NULL != io->outbufs) {
+16 -16
View File
@@ -363,8 +363,8 @@ client_connect(char *path, struct constate *con) {
}
static void
srv_io_accept(GSource *source SHUTUP, int fd, struct sockaddr *sa SHUTUP,
socklen_t len SHUTUP, void *vdata) {
srv_io_accept(GSource *source UNUSED, int fd, struct sockaddr *sa UNUSED,
socklen_t len UNUSED, void *vdata) {
struct constate *con = vdata;
struct constate *newcon;
uint8_t * buf;
@@ -404,7 +404,7 @@ srv_io_accept(GSource *source SHUTUP, int fd, struct sockaddr *sa SHUTUP,
}
static size_t
srv_io_received( GSource * source SHUTUP, void * data, size_t len,
srv_io_received( GSource * source UNUSED, void * data, size_t len,
void * vdata )
{
struct constate * con = vdata;
@@ -445,7 +445,7 @@ srv_io_received( GSource * source SHUTUP, void * data, size_t len,
}
static size_t
cli_io_received( GSource * source SHUTUP, void * data, size_t len,
cli_io_received( GSource * source UNUSED, void * data, size_t len,
void * vdata )
{
struct constate * con = vdata;
@@ -557,14 +557,14 @@ destroycon(struct constate *con) {
}
static void
all_io_closed(GSource *source SHUTUP, void *vdata) {
all_io_closed(GSource *source UNUSED, void *vdata) {
struct constate *con = vdata;
destroycon(con);
}
static void
cli_io_sent( GSource * source SHUTUP, size_t id, void *vdata )
cli_io_sent( GSource * source UNUSED, size_t id, void *vdata )
{
struct constate_client *cli = &((struct constate*)vdata)->u.client;
@@ -575,7 +575,7 @@ cli_io_sent( GSource * source SHUTUP, size_t id, void *vdata )
}
static void
smsg_add( enum ipc_msg id SHUTUP, benc_val_t * val, int64_t tag, void * arg )
smsg_add( enum ipc_msg id UNUSED, benc_val_t * val, int64_t tag, void * arg )
{
struct constate * con = arg;
struct constate_serv * srv = &con->u.serv;
@@ -607,7 +607,7 @@ smsg_add( enum ipc_msg id SHUTUP, benc_val_t * val, int64_t tag, void * arg )
}
static void
smsg_addone( enum ipc_msg id SHUTUP, benc_val_t * val, int64_t tag,
smsg_addone( enum ipc_msg id UNUSED, benc_val_t * val, int64_t tag,
void * arg )
{
struct constate * con = arg;
@@ -670,8 +670,8 @@ smsg_addone( enum ipc_msg id SHUTUP, benc_val_t * val, int64_t tag,
}
static void
smsg_quit( enum ipc_msg id SHUTUP, benc_val_t * val SHUTUP, int64_t tag SHUTUP,
void * arg SHUTUP )
smsg_quit( enum ipc_msg id UNUSED, benc_val_t * val UNUSED, int64_t tag UNUSED,
void * arg UNUSED )
{
struct constate * con = arg;
struct constate_serv * srv = &con->u.serv;
@@ -680,7 +680,7 @@ smsg_quit( enum ipc_msg id SHUTUP, benc_val_t * val SHUTUP, int64_t tag SHUTUP,
}
static void
smsg_noop( enum ipc_msg id SHUTUP, benc_val_t * val SHUTUP, int64_t tag,
smsg_noop( enum ipc_msg id UNUSED, benc_val_t * val UNUSED, int64_t tag,
void * arg )
{
simpleresp( arg, tag, IPC_MSG_OK );
@@ -827,7 +827,7 @@ addinfo( TrTorrent * tor, enum ipc_msg msgid, int torid, int types,
}
static void
smsg_look( enum ipc_msg id SHUTUP, benc_val_t * val, int64_t tag,
smsg_look( enum ipc_msg id UNUSED, benc_val_t * val, int64_t tag,
void * arg )
{
struct constate * con = arg;
@@ -930,7 +930,7 @@ smsg_tor( enum ipc_msg id, benc_val_t * val, int64_t tag, void * arg )
}
static void
smsg_torall( enum ipc_msg id, benc_val_t * val SHUTUP, int64_t tag,
smsg_torall( enum ipc_msg id, benc_val_t * val UNUSED, int64_t tag,
void * arg )
{
struct constate * con = arg;
@@ -975,7 +975,7 @@ smsg_torall( enum ipc_msg id, benc_val_t * val SHUTUP, int64_t tag,
( TR_NAT_TRAVERSAL_UNMAPPED == (st) || TR_NAT_TRAVERSAL_UNMAPPING == (st) )
static void
smsg_pref( enum ipc_msg id, benc_val_t * val SHUTUP, int64_t tag, void * arg )
smsg_pref( enum ipc_msg id, benc_val_t * val UNUSED, int64_t tag, void * arg )
{
struct constate * con = arg;
struct constate_serv * srv = &con->u.serv;
@@ -1110,7 +1110,7 @@ smsg_str( enum ipc_msg id, benc_val_t * val, int64_t tag, void * arg )
}
static void
smsg_sup( enum ipc_msg id SHUTUP, benc_val_t * val, int64_t tag, void * arg )
smsg_sup( enum ipc_msg id UNUSED, benc_val_t * val, int64_t tag, void * arg )
{
struct constate * con = arg;
benc_val_t packet, * pkval, * name;
@@ -1167,7 +1167,7 @@ smsg_sup( enum ipc_msg id SHUTUP, benc_val_t * val, int64_t tag, void * arg )
}
static void
all_default( enum ipc_msg id, benc_val_t * val SHUTUP, int64_t tag, void * arg )
all_default( enum ipc_msg id, benc_val_t * val UNUSED, int64_t tag, void * arg )
{
switch( id )
{
+8 -8
View File
@@ -39,8 +39,8 @@
#include "util.h"
static void
tr_core_marshal_err( GClosure * closure, GValue * ret SHUTUP, guint count,
const GValue * vals, gpointer hint SHUTUP,
tr_core_marshal_err( GClosure * closure, GValue * ret UNUSED, guint count,
const GValue * vals, gpointer hint UNUSED,
gpointer marshal )
{
typedef void (*TRMarshalErr)
@@ -64,8 +64,8 @@ tr_core_marshal_err( GClosure * closure, GValue * ret SHUTUP, guint count,
}
static void
tr_core_marshal_prompt( GClosure * closure, GValue * ret SHUTUP, guint count,
const GValue * vals, gpointer hint SHUTUP,
tr_core_marshal_prompt( GClosure * closure, GValue * ret UNUSED, guint count,
const GValue * vals, gpointer hint UNUSED,
gpointer marshal )
{
typedef void (*TRMarshalPrompt)
@@ -91,8 +91,8 @@ tr_core_marshal_prompt( GClosure * closure, GValue * ret SHUTUP, guint count,
}
static void
tr_core_marshal_data( GClosure * closure, GValue * ret SHUTUP, guint count,
const GValue * vals, gpointer hint SHUTUP,
tr_core_marshal_data( GClosure * closure, GValue * ret UNUSED, guint count,
const GValue * vals, gpointer hint UNUSED,
gpointer marshal )
{
typedef void (*TRMarshalPrompt)
@@ -134,7 +134,7 @@ tr_core_dispose( GObject * obj )
static void
tr_core_class_init( gpointer g_class, gpointer g_class_data SHUTUP )
tr_core_class_init( gpointer g_class, gpointer g_class_data UNUSED )
{
GObjectClass * gobject_class;
TrCoreClass * core_class;
@@ -321,7 +321,7 @@ prefsChanged( TrCore * core, const char * key, gpointer data UNUSED )
}
static void
tr_core_init( GTypeInstance * instance, gpointer g_class SHUTUP )
tr_core_init( GTypeInstance * instance, gpointer g_class UNUSED )
{
tr_handle * h;
TrCore * self = (TrCore *) instance;
+1 -1
View File
@@ -402,7 +402,7 @@ verrmsg_full( GtkWindow * wind, callbackfunc_t func, void * data,
}
static void
errcb(GtkWidget *widget, int resp SHUTUP, gpointer data) {
errcb(GtkWidget *widget, int resp UNUSED, gpointer data) {
GList *funcdata;
callbackfunc_t func;
-1
View File
@@ -29,7 +29,6 @@
#include <stdarg.h>
/* macro to shut up "unused parameter" warnings */
#define SHUTUP G_GNUC_UNUSED
#define UNUSED G_GNUC_UNUSED
/* NULL-safe version of strcmp */