rename macro UNSET on UNSED

17 files changed, 87 insertions, 87 deletions

diff --git a/src/base/arena.c b/src/base/arena.c
index 4f9f51f..a692830 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -222,24 +222,24 @@ static void drawBackground(arena_t * arena, int screen_x, int screen_y)
 
 static void action_tux_draw(space_t * space, tux_t * tux, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	tux_draw(tux);
 }
 
 static void action_item_draw(space_t * space, item_t * item, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	item_draw(item);
 }
 
 static void action_shot_draw(space_t * space, shot_t * shot, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	shot_draw(shot);
 }
@@ -381,8 +381,8 @@ void arena_draw(arena_t * arena)
 
 static void action_tux(space_t * space, tux_t * tux, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	tux_event(tux);
 }
diff --git a/src/base/item.c b/src/base/item.c
index 8de0e37..f7539ad 100644
--- a/src/base/item.c
+++ b/src/base/item.c
@@ -280,7 +280,7 @@ static void action_itemevent(space_t * space, item_t * item, void *p)
 {
 	my_time_t currentTime;
 
-	UNUSET(p);
+	UNUSED(p);
 
 	currentTime = timer_get_current_time();
 	item->count++;
diff --git a/src/base/main.h b/src/base/main.h
index f935972..8ea3afa 100644
--- a/src/base/main.h
+++ b/src/base/main.h
@@ -28,7 +28,7 @@
 #define DEBUG_MSG(msg,arg...) 
 #endif
 
-#define UNUSET(var)	if( 0 && var ){}
+#define UNUSED(var)	if( 0 && var ){}
 
 
 extern char *getParam(char *s);
diff --git a/src/base/proto.c b/src/base/proto.c
index b1a6799..f4a1972 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -100,7 +100,7 @@ void proto_send_hello_client(char *name)
 
 static void action_sendItem(space_t * space, item_t * item, client_t * client)
 {
-	UNUSET(space);
+	UNUSED(space);
 
 	proto_send_additem_server(PROTO_SEND_ONE, client, item);
 }
@@ -244,7 +244,7 @@ void proto_send_status_server(int type, client_t * client)
 
 void proto_recv_status_server(client_t * client, char *msg)
 {
-	UNUSET(msg);
+	UNUSED(msg);
 
 	proto_send_status_server(PROTO_SEND_ONE, client);
 }
@@ -882,7 +882,7 @@ void proto_send_module_client(char *msg)
 
 void proto_recv_module_server(client_t * client, char *msg)
 {
-	UNUSET(client);
+	UNUSED(client);
 
 	module_recv_msg(msg + 7);
 }
@@ -923,8 +923,8 @@ void proto_send_ping_client()
 
 void proto_recv_ping_server(client_t * client, char *msg)
 {
-	UNUSET(client);
-	UNUSET(msg);
+	UNUSED(client);
+	UNUSED(msg);
 }
 
 void proto_send_ping_server(int type, client_t * client)
@@ -939,7 +939,7 @@ void proto_send_ping_server(int type, client_t * client)
 
 void proto_recv_ping_client(char *msg)
 {
-	UNUSET(msg);
+	UNUSED(msg);
 }
 
 #endif
diff --git a/src/base/server.c b/src/base/server.c
index 6eeab70..472d71c 100644
--- a/src/base/server.c
+++ b/src/base/server.c
@@ -162,7 +162,7 @@ static void delZombieCLient(void *p_nothink)
 	my_time_t currentTime;
 	int i;
 
-	UNUSET(p_nothink);
+	UNUSED(p_nothink);
 
 	currentTime = timer_get_current_time();
 
@@ -192,7 +192,7 @@ static void eventPeriodicSyncClient(void *p_nothink)
 	tux_t *thisTux;
 	int i;
 
-	UNUSET(p_nothink);
+	UNUSED(p_nothink);
 
 #ifndef PUBLIC_SERVER
 	proto_send_newtux_server(PROTO_SEND_ALL_SEES_TUX, NULL, world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT));
@@ -213,7 +213,7 @@ static void eventPeriodicSyncClient(void *p_nothink)
 
 static void eventSendPingClients(void *p_nothink)
 {
-	UNUSET(p_nothink);
+	UNUSED(p_nothink);
 	
 	proto_send_ping_server(PROTO_SEND_ALL, NULL);
 }
diff --git a/src/base/shot.c b/src/base/shot.c
index b19877a..564f458 100644
--- a/src/base/shot.c
+++ b/src/base/shot.c
@@ -262,7 +262,7 @@ static void action_moveShot(space_t * space, shot_t * shot, void *p)
 	int new_x, new_y;
 	arena_t *arena;
 
-	UNUSET(p);
+	UNUSED(p);
 
 	arena = arena_get_current();
 
@@ -297,7 +297,7 @@ static int isValueInList(list_t * list, int x)
 
 static void action_check(space_t * space, shot_t * shot, client_t * client)
 {
-	UNUSET(space);
+	UNUSED(space);
 
 	if (isValueInList(client->listSeesShot, shot->id) == 0) {
 	    list_add(client->listSeesShot, newInt(shot->id));
diff --git a/src/base/tux.c b/src/base/tux.c
index d8fff10..baf185a 100644
--- a/src/base/tux.c
+++ b/src/base/tux.c
@@ -409,7 +409,7 @@ static void action_tux(space_t * space, tux_t * tux, shot_t * shot)
 {
 	arena_t *arena;
 
-	UNUSET(space);
+	UNUSED(space);
 	
 	arena = arena_get_current();
 
@@ -445,7 +445,7 @@ static void action_tux(space_t * space, tux_t * tux, shot_t * shot)
 
 static void action_shot(space_t * space, shot_t * shot, space_t * spaceTux)
 {
-	UNUSET(space);
+	UNUSED(space);
 
 	space_action_from_location(spaceTux, action_tux, shot, shot->x, shot->y, shot->w, shot->h);
 }
@@ -725,8 +725,8 @@ void tux_set_status(void *p, int x, int y, int w, int h)
 {
 	tux_t *tux;
 
-	UNUSET(w);
-	UNUSET(h);
+	UNUSED(w);
+	UNUSED(h);
 
 	tux = p;
 	tux_set_proportion(tux, x, y);
@@ -734,7 +734,7 @@ void tux_set_status(void *p, int x, int y, int w, int h)
 
 static void action_checkMine(space_t * space, item_t * item, tux_t * tux)
 {
-	UNUSET(space);
+	UNUSED(space);
 
 	if (item->type == ITEM_MINE && item->author_id == tux->id) {
 		item->author_id = ID_UNKNOWN;
diff --git a/src/client/interface.c b/src/client/interface.c
index 52c368b..53119e4 100644
--- a/src/client/interface.c
+++ b/src/client/interface.c
@@ -39,7 +39,7 @@ static Uint32 TimerCallback(Uint32 interval, void *param)
 {
 	SDL_Event event;
 
-	UNUSET(param);
+	UNUSED(param);
 
 	event.type = SDL_USEREVENT;
 	event.user.code = USR_EVT_TIMER;
diff --git a/src/client/saveLoad.c b/src/client/saveLoad.c
index 5d1685a..ccb589a 100644
--- a/src/client/saveLoad.c
+++ b/src/client/saveLoad.c
@@ -23,7 +23,7 @@ static void action_saveTux(space_t * space, tux_t * tux, textFile_t * textFile)
 {
 	char str[STR_PROTO_SIZE];
 
-	UNUSET(space);
+	UNUSED(space);
 
 	snprintf(str, STR_PROTO_SIZE,
 			 "TUX %d %d %d %d %d %d %d %d %s %d %d %d %d %d %d %d %d %d %d %d",
@@ -41,7 +41,7 @@ static void action_saveShot(space_t * space, shot_t * shot, textFile_t * textFil
 {
 	char str[STR_PROTO_SIZE];
 
-	UNUSET(space);
+	UNUSED(space);
 
 	snprintf(str, STR_PROTO_SIZE, "SHOT %d %d %d %d %d %d %d %d %d",
 			 shot->id, shot->x, shot->y, shot->px, shot->py,
@@ -55,7 +55,7 @@ static void action_saveItem(space_t * space, item_t * item, textFile_t * textFil
 {
 	char str[STR_PROTO_SIZE];
 
-	UNUSET(space);
+	UNUSED(space);
 
 	snprintf(str, STR_PROTO_SIZE, "ITEM %d %d %d %d %d %d %d",
 			 item->id, item->type, item->x, item->y,
diff --git a/src/client/term.c b/src/client/term.c
index 50a7580..2dd6ea5 100644
--- a/src/client/term.c
+++ b/src/client/term.c
@@ -77,8 +77,8 @@ static void action_refreshTerm(space_t * space, tux_t * tux, void *p)
 {
 	char str[STR_SIZE];
 
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	sprintf(str,
 			"name: %s "
diff --git a/src/modules/modAI.c b/src/modules/modAI.c
index 63b94c8..b987f20 100644
--- a/src/modules/modAI.c
+++ b/src/modules/modAI.c
@@ -48,8 +48,8 @@ alternative_t *cloneAlternative(alternative_t * p, int route, int x, int y)
 
 	assert(p != NULL);
 
-	UNUSET(x);
-	UNUSET(y);
+	UNUSED(x);
+	UNUSED(y);
 
 	new = newAlternative(route, p->x, p->y);
 	new->first = p->first;
@@ -121,7 +121,7 @@ void destroyAlternative(alternative_t * p)
 
 static void cmd_ai(char *line)
 {
-	UNUSET(line);
+	UNUSED(line);
 }
 
 int init(export_fce_t * p)
@@ -134,10 +134,10 @@ int init(export_fce_t * p)
 #ifndef PUBLIC_SERVER
 int draw(int x, int y, int w, int h)
 {
-	UNUSET(x);
-	UNUSET(y);
-	UNUSET(w);
-	UNUSET(h);
+	UNUSED(x);
+	UNUSED(y);
+	UNUSED(w);
+	UNUSED(h);
 
 	return 0;
 }
@@ -167,7 +167,7 @@ static void shotTux(arena_t * arena, tux_t * tux_ai, tux_t * tux_rival)
 	int x_rival, y_rival;
 	int w, h;
 
-	UNUSET(arena);
+	UNUSED(arena);
 
 	export_fce->fce_tux_get_proportion(tux_ai, &x_ai, &y_ai, &w, &h);
 	export_fce->fce_tux_get_proportion(tux_rival, &x_rival, &y_rival, &w, &h);
@@ -336,8 +336,8 @@ static void tux_eventAI(tux_t * tux)
 
 static void action_tuxAI(space_t * space, tux_t * tux, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	if (tux->control == TUX_CONTROL_AI && tux->status == TUX_STATUS_ALIVE) {
 		tux_eventAI(tux);
@@ -394,10 +394,10 @@ int event()
 
 int isConflict(int x, int y, int w, int h)
 {
-	UNUSET(x);
-	UNUSET(y);
-	UNUSET(w);
-	UNUSET(h);
+	UNUSED(x);
+	UNUSED(y);
+	UNUSED(w);
+	UNUSED(h);
 
 	return 0;
 }
@@ -410,7 +410,7 @@ void cmdArena(char *line)
 
 void recvMsg(char *msg)
 {
-	UNUSET(msg);
+	UNUSED(msg);
 }
 
 int destroy()
diff --git a/src/modules/modBasic.c b/src/modules/modBasic.c
index 012466e..3b0f9b3 100644
--- a/src/modules/modBasic.c
+++ b/src/modules/modBasic.c
@@ -35,10 +35,10 @@ int init(export_fce_t * p)
 
 int draw(int x, int y, int w, int h)
 {
-	UNUSET(x);
-	UNUSET(y);
-	UNUSET(w);
-	UNUSET(h);
+	UNUSED(x);
+	UNUSED(y);
+	UNUSED(w);
+	UNUSED(h);
 
 	printf("Drawing Basic module.\n");
 	return 0;
diff --git a/src/modules/modMove.c b/src/modules/modMove.c
index 231a827..fc616a7 100644
--- a/src/modules/modMove.c
+++ b/src/modules/modMove.c
@@ -226,10 +226,10 @@ static void proto_moveshot(char *msg)
 
 int draw(int x, int y, int w, int h)
 {
-	UNUSET(x);
-	UNUSET(y);
-	UNUSET(w);
-	UNUSET(h);
+	UNUSED(x);
+	UNUSED(y);
+	UNUSED(w);
+	UNUSED(h);
 
 	return 0;
 }
@@ -243,17 +243,17 @@ int event()
 
 int isConflict(int x, int y, int w, int h)
 {
-	UNUSET(x);
-	UNUSET(y);
-	UNUSET(w);
-	UNUSET(h);
+	UNUSED(x);
+	UNUSED(y);
+	UNUSED(w);
+	UNUSED(h);
 
 	return 0;
 }
 
 void cmdArena(char *line)
 {
-	UNUSET(line);
+	UNUSED(line);
 }
 
 void recvMsg(char *msg)
diff --git a/src/modules/modPipe.c b/src/modules/modPipe.c
index 19c840d..ee7e10d 100644
--- a/src/modules/modPipe.c
+++ b/src/modules/modPipe.c
@@ -221,8 +221,8 @@ int init(export_fce_t * p)
 
 static void action_drawpipe(space_t * space, pipe_t * pipe, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	drawPipe(pipe);
 }
@@ -299,7 +299,7 @@ static void action_eventpipe(space_t * space, pipe_t * pipe, shot_t * shot)
 	arena_t *arena;
 	tux_t *author;
 
-	UNUSET(space);
+	UNUSED(space);
 
 	arena = export_fce->fce_arena_get_current();
 
@@ -370,7 +370,7 @@ void cmdArena(char *line)
 
 void recvMsg(char *msg)
 {
-	UNUSET(msg);
+	UNUSED(msg);
 }
 
 int destroy()
diff --git a/src/modules/modTeleport.c b/src/modules/modTeleport.c
index 301a368..c8cfda4 100644
--- a/src/modules/modTeleport.c
+++ b/src/modules/modTeleport.c
@@ -251,8 +251,8 @@ int init(export_fce_t * p)
 
 static void action_drawteleport(space_t * space, teleport_t * teleport, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	drawTeleport(teleport);
 }
@@ -275,7 +275,7 @@ static void action_eventteleportshot(space_t * space, teleport_t * teleport, sho
 	arena_t *arena;
 	tux_t *author;
 
-	UNUSET(space);
+	UNUSED(space);
 
 	arena = export_fce->fce_arena_get_current();
 
@@ -291,7 +291,7 @@ static void action_eventteleportshot(space_t * space, teleport_t * teleport, sho
 
 static void action_eventshot(space_t * space, shot_t * shot, space_t * p_spaceTeleport)
 {
-	UNUSET(space);
+	UNUSED(space);
 
 	space_action_from_location(p_spaceTeleport, action_eventteleportshot, shot,
 							shot->x, shot->y, shot->w, shot->h);
@@ -299,7 +299,7 @@ static void action_eventshot(space_t * space, shot_t * shot, space_t * p_spaceTe
 
 static void action_eventteleporttux(space_t * space, teleport_t * teleport, tux_t * tux)
 {
-	UNUSET(space);
+	UNUSED(space);
 
 	teleportTux(tux, teleport);
 }
@@ -308,7 +308,7 @@ static void action_eventtux(space_t * space, tux_t * tux, space_t * p_spaceTelep
 {
 	int x, y, w, h;
 
-	UNUSET(space);
+	UNUSED(space);
 
 	export_fce->fce_tux_get_proportion(tux, &x, &y, &w, &h);
 
@@ -336,10 +336,10 @@ int event()
 
 int isConflict(int x, int y, int w, int h)
 {
-	UNUSET(x);
-	UNUSET(y);
-	UNUSET(w);
-	UNUSET(h);
+	UNUSED(x);
+	UNUSED(y);
+	UNUSED(w);
+	UNUSED(h);
 
 	if (spaceTeleport == NULL) {
 		return 0;
@@ -356,7 +356,7 @@ void cmdArena(char *line)
 
 void recvMsg(char *msg)
 {
-	UNUSET(msg);
+	UNUSED(msg);
 }
 
 int destroy()
diff --git a/src/modules/modWall.c b/src/modules/modWall.c
index 6e9b54f..4facf20 100644
--- a/src/modules/modWall.c
+++ b/src/modules/modWall.c
@@ -157,11 +157,11 @@ static void getStatusImgWall(void *p, int *id, int *x, int *y, int *w, int *h)
 
 static void setStatusImgWall(void *p, int x, int y, int w, int h)
 {
-	UNUSET(p);
-	UNUSET(x);
-	UNUSET(y);
-	UNUSET(w);
-	UNUSET(h);
+	UNUSED(p);
+	UNUSED(x);
+	UNUSED(y);
+	UNUSED(w);
+	UNUSED(h);
 }
 
 #endif
@@ -258,8 +258,8 @@ int init(export_fce_t * p)
 
 static void action_drawwall(space_t * space, wall_t * wall, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	drawWall(wall);
 }
@@ -283,8 +283,8 @@ static void action_eventwall(space_t * space, wall_t * wall, shot_t * shot)
 	arena_t *arena;
 	tux_t *author;
 
-	UNUSET(space);
-	UNUSET(wall);
+	UNUSED(space);
+	UNUSED(wall);
 
 	arena = export_fce->fce_arena_get_current();
 
@@ -346,7 +346,7 @@ void cmdArena(char *line)
 
 void recvMsg(char *msg)
 {
-	UNUSET(msg);
+	UNUSED(msg);
 }
 
 int destroy()
diff --git a/src/screen/world.c b/src/screen/world.c
index 5cfb301..8bb7215 100644
--- a/src/screen/world.c
+++ b/src/screen/world.c
@@ -500,8 +500,8 @@ void startWorld()
 
 static void action_analyze(space_t * space, tux_t * tux, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	analyze_add(tux->name, tux->score);
 }