From 9167cc9a8b98ee691b5653aeedbb71e6d857dbed Mon Sep 17 00:00:00 2001 From: "Bernhard R. Link" Date: Wed, 15 Jul 2009 18:48:03 +0200 Subject: silence unused variables and unused parameters warnings --- src/actions.c | 224 ++++++++++++++++++++++++++++----------------------------- src/editor.c | 4 +- src/globals.c | 4 ++ src/globals.h | 6 ++ src/history.c | 2 +- src/main.c | 8 +-- src/xinerama.c | 12 +++- 7 files changed, 138 insertions(+), 122 deletions(-) diff --git a/src/actions.c b/src/actions.c index 77cdeb8..0aef237 100644 --- a/src/actions.c +++ b/src/actions.c @@ -1053,14 +1053,14 @@ cmd_unmanage (int interactive, struct cmdarg **args) /* Clear the unmanaged window list */ cmdret * -cmd_clrunmanaged (int interactive, struct cmdarg **args) +cmd_clrunmanaged (int interactive UNUSED, struct cmdarg **args UNUSED) { clear_unmanaged_list(); return cmdret_new (RET_SUCCESS, NULL); } cmdret * -cmd_undefinekey (int interactive, struct cmdarg **args) +cmd_undefinekey (int interactive UNUSED, struct cmdarg **args) { cmdret *ret = NULL; rp_keymap *map; @@ -1090,7 +1090,7 @@ cmd_undefinekey (int interactive, struct cmdarg **args) } cmdret * -cmd_definekey (int interactive, struct cmdarg **args) +cmd_definekey (int interactive UNUSED, struct cmdarg **args) { cmdret *ret = NULL; rp_keymap *map; @@ -1124,13 +1124,13 @@ cmd_definekey (int interactive, struct cmdarg **args) } cmdret * -cmd_unimplemented (int interactive, struct cmdarg **args) +cmd_unimplemented (int interactive UNUSED, struct cmdarg **args UNUSED) { return cmdret_new (RET_FAILURE, "FIXME: unimplemented command"); } cmdret * -cmd_source (int interactive, struct cmdarg **args) +cmd_source (int interactive UNUSED, struct cmdarg **args) { FILE *fileptr; @@ -1147,7 +1147,7 @@ cmd_source (int interactive, struct cmdarg **args) } cmdret * -cmd_meta (int interactive, struct cmdarg **args) +cmd_meta (int interactive UNUSED, struct cmdarg **args) { cmdret *ret = NULL; struct rp_key key; @@ -1185,7 +1185,7 @@ cmd_meta (int interactive, struct cmdarg **args) } cmdret * -cmd_prev (int interactive, struct cmdarg **args) +cmd_prev (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_window *cur, *win; cur = current_window(); @@ -1202,7 +1202,7 @@ cmd_prev (int interactive, struct cmdarg **args) } cmdret * -cmd_prev_frame (int interactive, struct cmdarg **args) +cmd_prev_frame (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame *frame; @@ -1216,7 +1216,7 @@ cmd_prev_frame (int interactive, struct cmdarg **args) } cmdret * -cmd_next (int interactive, struct cmdarg **args) +cmd_next (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_window *cur, *win; cur = current_window(); @@ -1233,7 +1233,7 @@ cmd_next (int interactive, struct cmdarg **args) } cmdret * -cmd_next_frame (int interactive, struct cmdarg **args) +cmd_next_frame (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame *frame; @@ -1247,7 +1247,7 @@ cmd_next_frame (int interactive, struct cmdarg **args) } cmdret * -cmd_other (int interactive, struct cmdarg **args) +cmd_other (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_window *w; @@ -1279,7 +1279,7 @@ string_to_window_number (char *str) } static struct list_head * -trivial_completions (char* str) +trivial_completions (char* str UNUSED) { struct list_head *list; @@ -1291,7 +1291,7 @@ trivial_completions (char* str) } static struct list_head * -keymap_completions (char* str) +keymap_completions (char* str UNUSED) { rp_keymap *cur; struct list_head *list; @@ -1313,7 +1313,7 @@ keymap_completions (char* str) } static struct list_head * -window_completions (char* str) +window_completions (char* str UNUSED) { rp_window_elem *cur; struct list_head *list; @@ -1337,7 +1337,7 @@ window_completions (char* str) /* switch to window number or name */ cmdret * -cmd_select (int interactive, struct cmdarg **args) +cmd_select (int interactive UNUSED, struct cmdarg **args) { cmdret *ret = NULL; char *str; @@ -1394,7 +1394,7 @@ cmd_select (int interactive, struct cmdarg **args) } cmdret * -cmd_rename (int interactive, struct cmdarg **args) +cmd_rename (int interactive UNUSED, struct cmdarg **args) { if (current_window() == NULL) return cmdret_new (RET_FAILURE, NULL); @@ -1410,7 +1410,7 @@ cmd_rename (int interactive, struct cmdarg **args) } cmdret * -cmd_delete (int interactive, struct cmdarg **args) +cmd_delete (int interactive UNUSED, struct cmdarg **args UNUSED) { XEvent ev; int status; @@ -1433,7 +1433,7 @@ cmd_delete (int interactive, struct cmdarg **args) } cmdret * -cmd_kill (int interactive, struct cmdarg **args) +cmd_kill (int interactive UNUSED, struct cmdarg **args UNUSED) { if (current_window() == NULL) return cmdret_new (RET_FAILURE, NULL); @@ -1444,7 +1444,7 @@ cmd_kill (int interactive, struct cmdarg **args) } cmdret * -cmd_version (int interactive, struct cmdarg **args) +cmd_version (int interactive UNUSED, struct cmdarg **args UNUSED) { return cmdret_new (RET_SUCCESS, "%s", PACKAGE " " VERSION " (built " __DATE__ " " __TIME__ ")"); } @@ -1564,7 +1564,7 @@ read_keydesc (struct argspec *spec, struct sbuf *s, struct cmdarg **arg) } static struct list_head * -group_completions (char *str) +group_completions (char *str UNUSED) { struct list_head *list; rp_group *cur; @@ -1597,7 +1597,7 @@ group_completions (char *str) } static struct list_head * -colon_completions (char* str) +colon_completions (char* str UNUSED) { int i; struct user_command *uc; @@ -1717,7 +1717,7 @@ read_shellcmd (struct argspec *spec, struct sbuf *s, struct cmdarg **arg, const /* Return NULL on abort/failure. */ static cmdret * -read_frame (struct argspec *spec, struct sbuf *s, struct cmdarg **arg) +read_frame (struct sbuf *s, struct cmdarg **arg) { rp_frame *frame; int fnum = -1; @@ -1990,7 +1990,7 @@ read_group (struct argspec *spec, struct sbuf *s, struct cmdarg **arg) } static struct list_head * -hook_completions (char* str) +hook_completions (char* str UNUSED) { struct list_head *list; struct rp_hook_db_entry *entry; @@ -2058,7 +2058,7 @@ find_variable (char *str) } static struct list_head * -var_completions (char *str) +var_completions (char *str UNUSED) { struct list_head *list; struct set_var *cur; @@ -2168,7 +2168,7 @@ read_arg (struct argspec *spec, struct sbuf *s, struct cmdarg **arg, const char ret = read_window (spec, s, arg); break; case arg_FRAME: - ret = read_frame (spec, s, arg); + ret = read_frame (s, arg); break; case arg_GROUP: ret = read_group (spec, s, arg); @@ -2550,7 +2550,7 @@ command (int interactive, char *data) } cmdret * -cmd_colon (int interactive, struct cmdarg **args) +cmd_colon (int interactive UNUSED, struct cmdarg **args) { cmdret *result; char *input; @@ -2571,21 +2571,21 @@ cmd_colon (int interactive, struct cmdarg **args) } cmdret * -cmd_exec (int interactive, struct cmdarg **args) +cmd_exec (int interactive UNUSED, struct cmdarg **args) { spawn (ARG_STRING(0), 0, current_frame()); return cmdret_new (RET_SUCCESS, NULL); } cmdret * -cmd_execa (int interactive, struct cmdarg **args) +cmd_execa (int interactive UNUSED, struct cmdarg **args) { spawn (ARG_STRING(0), 0, NULL); return cmdret_new (RET_SUCCESS, NULL); } cmdret * -cmd_execf (int interactive, struct cmdarg **args) +cmd_execf (int interactive UNUSED, struct cmdarg **args) { spawn (ARG_STRING(1), 0, ARG(0,frame)); return cmdret_new (RET_SUCCESS, NULL); @@ -2639,7 +2639,7 @@ spawn(char *cmd, int raw, rp_frame *frame) /* Switch to a different Window Manager. Thanks to "Chr. v. Stuckrad" for the patch. */ cmdret * -cmd_newwm(int interactive, struct cmdarg **args) +cmd_newwm(int interactive UNUSED, struct cmdarg **args) { /* in the event loop, this will switch WMs. */ rp_exec_newwm = xstrdup (ARG_STRING(0)); @@ -2648,7 +2648,7 @@ cmd_newwm(int interactive, struct cmdarg **args) } cmdret * -cmd_quit(int interactive, struct cmdarg **args) +cmd_quit(int interactive UNUSED, struct cmdarg **args UNUSED) { kill_signalled = 1; return cmdret_new (RET_SUCCESS, NULL); @@ -2658,7 +2658,7 @@ cmd_quit(int interactive, struct cmdarg **args) for the patch. Thanks to Jonathan Walther for making it pretty. */ cmdret * -cmd_time (int interactive, struct cmdarg **args) +cmd_time (int interactive UNUSED, struct cmdarg **args UNUSED) { char *msg, *tmp; time_t timep; @@ -2678,7 +2678,7 @@ cmd_time (int interactive, struct cmdarg **args) /* Assign a new number to a window ala screen's number command. */ cmdret * -cmd_number (int interactive, struct cmdarg **args) +cmd_number (int interactive UNUSED, struct cmdarg **args) { int old_number, new_number; rp_window_elem *other_win, *win; @@ -2768,14 +2768,14 @@ cmd_windows (int interactive, struct cmdarg **args) } cmdret * -cmd_abort (int interactive, struct cmdarg **args) +cmd_abort (int interactive UNUSED, struct cmdarg **args UNUSED) { return cmdret_new (RET_SUCCESS, NULL); } /* Redisplay the current window by sending 2 resize events. */ cmdret * -cmd_redisplay (int interactive, struct cmdarg **args) +cmd_redisplay (int interactive UNUSED, struct cmdarg **args UNUSED) { force_maximize (current_window()); return cmdret_new (RET_SUCCESS, NULL); @@ -2783,7 +2783,7 @@ cmd_redisplay (int interactive, struct cmdarg **args) /* Reassign the prefix key. */ cmdret * -cmd_escape (int interactive, struct cmdarg **args) +cmd_escape (int interactive UNUSED, struct cmdarg **args) { struct rp_key *key; rp_action *action; @@ -2834,7 +2834,7 @@ cmd_escape (int interactive, struct cmdarg **args) /* User accessible call to display the passed in string. */ cmdret * -cmd_echo (int interactive, struct cmdarg **args) +cmd_echo (int interactive UNUSED, struct cmdarg **args) { marked_message_printf (0, 0, "%s", ARG_STRING(0)); @@ -2866,7 +2866,7 @@ read_split (char *str, int max, int *p) } cmdret * -cmd_v_split (int interactive, struct cmdarg **args) +cmd_v_split (int interactive UNUSED, struct cmdarg **args) { cmdret *ret; rp_frame *frame; @@ -2894,7 +2894,7 @@ cmd_v_split (int interactive, struct cmdarg **args) } cmdret * -cmd_h_split (int interactive, struct cmdarg **args) +cmd_h_split (int interactive UNUSED, struct cmdarg **args) { cmdret *ret; rp_frame *frame; @@ -2922,7 +2922,7 @@ cmd_h_split (int interactive, struct cmdarg **args) } cmdret * -cmd_only (int interactive, struct cmdarg **args) +cmd_only (int interactive UNUSED, struct cmdarg **args UNUSED) { push_frame_undo (current_screen()); /* fdump to stack */ remove_all_splits(); @@ -2932,7 +2932,7 @@ cmd_only (int interactive, struct cmdarg **args) } cmdret * -cmd_remove (int interactive, struct cmdarg **args) +cmd_remove (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_screen *s = current_screen(); rp_frame *frame; @@ -2957,7 +2957,7 @@ cmd_remove (int interactive, struct cmdarg **args) } cmdret * -cmd_shrink (int interactive, struct cmdarg **args) +cmd_shrink (int interactive UNUSED, struct cmdarg **args UNUSED) { push_frame_undo (current_screen()); /* fdump to stack */ resize_shrink_to_window (current_frame()); @@ -3106,7 +3106,7 @@ set_resizeunit (struct cmdarg **args) /* banish the rat pointer */ cmdret * -cmd_banish (int interactive, struct cmdarg **args) +cmd_banish (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_screen *s; @@ -3117,7 +3117,7 @@ cmd_banish (int interactive, struct cmdarg **args) } cmdret * -cmd_banishrel (int interactive, struct cmdarg **args) +cmd_banishrel (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_screen *s = current_screen(); rp_window *w = current_window(); @@ -3132,7 +3132,7 @@ cmd_banishrel (int interactive, struct cmdarg **args) } cmdret * -cmd_ratinfo (int interactive, struct cmdarg **args) +cmd_ratinfo (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_screen *s; Window root_win, child_win; @@ -3146,7 +3146,7 @@ cmd_ratinfo (int interactive, struct cmdarg **args) } cmdret * -cmd_ratrelinfo (int interactive, struct cmdarg **args) +cmd_ratrelinfo (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_screen *s; rp_window *rpw; @@ -3172,7 +3172,7 @@ cmd_ratrelinfo (int interactive, struct cmdarg **args) } cmdret * -cmd_ratwarp (int interactive, struct cmdarg **args) +cmd_ratwarp (int interactive UNUSED, struct cmdarg **args) { rp_screen *s; @@ -3182,7 +3182,7 @@ cmd_ratwarp (int interactive, struct cmdarg **args) } cmdret * -cmd_ratrelwarp (int interactive, struct cmdarg **args) +cmd_ratrelwarp (int interactive UNUSED, struct cmdarg **args) { rp_screen *s; @@ -3192,7 +3192,7 @@ cmd_ratrelwarp (int interactive, struct cmdarg **args) } cmdret * -cmd_ratclick (int interactive, struct cmdarg **args) +cmd_ratclick (int interactive UNUSED, struct cmdarg **args) { int button = 1; @@ -3213,7 +3213,7 @@ cmd_ratclick (int interactive, struct cmdarg **args) } cmdret * -cmd_rathold (int interactive, struct cmdarg **args) +cmd_rathold (int interactive UNUSED, struct cmdarg **args) { int button = 1; @@ -3239,7 +3239,7 @@ cmd_rathold (int interactive, struct cmdarg **args) } cmdret * -cmd_curframe (int interactive, struct cmdarg **args) +cmd_curframe (int interactive, struct cmdarg **args UNUSED) { if (interactive) { @@ -3253,7 +3253,7 @@ cmd_curframe (int interactive, struct cmdarg **args) /* Thanks to Martin Samuelsson for the original patch. */ cmdret * -cmd_license (int interactive, struct cmdarg **args) +cmd_license (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_screen *s = current_screen(); int x = 10; @@ -3494,7 +3494,7 @@ cmd_help (int interactive, struct cmdarg **args) } cmdret * -cmd_rudeness (int interactive, struct cmdarg **args) +cmd_rudeness (int interactive UNUSED, struct cmdarg **args) { int num; @@ -3547,7 +3547,7 @@ wingravity_to_string (int g) } cmdret * -cmd_gravity (int interactive, struct cmdarg **args) +cmd_gravity (int interactive UNUSED, struct cmdarg **args) { int gravity; rp_window *win; @@ -3604,7 +3604,7 @@ set_maxsizegravity (struct cmdarg **args) } cmdret * -cmd_msgwait (int interactive, struct cmdarg **args) +cmd_msgwait (int interactive UNUSED, struct cmdarg **args) { if (args[0] == NULL) return cmdret_new (RET_SUCCESS, "%d", defaults.bar_timeout); @@ -4112,7 +4112,7 @@ set_bwcolor (struct cmdarg **args) } cmdret * -cmd_setenv (int interactive, struct cmdarg **args) +cmd_setenv (int interactive UNUSED, struct cmdarg **args) { struct sbuf *env; @@ -4139,7 +4139,7 @@ cmd_setenv (int interactive, struct cmdarg **args) } cmdret * -cmd_getenv (int interactive, struct cmdarg **args) +cmd_getenv (int interactive UNUSED, struct cmdarg **args) { char *value; @@ -4153,7 +4153,7 @@ cmd_getenv (int interactive, struct cmdarg **args) /* Thanks to Gergely Nagy for the original patch. */ cmdret * -cmd_chdir (int interactive, struct cmdarg **args) +cmd_chdir (int interactive UNUSED, struct cmdarg **args) { char *dir; @@ -4177,7 +4177,7 @@ cmd_chdir (int interactive, struct cmdarg **args) /* Thanks to Gergely Nagy for the original patch. */ cmdret * -cmd_unsetenv (int interactive, struct cmdarg **args) +cmd_unsetenv (int interactive UNUSED, struct cmdarg **args) { struct sbuf *s; @@ -4195,7 +4195,7 @@ cmd_unsetenv (int interactive, struct cmdarg **args) /* Thanks to Gergely Nagy for the original patch. */ cmdret * -cmd_info (int interactive, struct cmdarg **args) +cmd_info (int interactive UNUSED, struct cmdarg **args) { struct sbuf *buf; char *tmp; @@ -4228,14 +4228,14 @@ cmd_info (int interactive, struct cmdarg **args) /* Thanks to Gergely Nagy for the original patch. */ cmdret * -cmd_lastmsg (int interactive, struct cmdarg **args) +cmd_lastmsg (int interactive UNUSED, struct cmdarg **args UNUSED) { show_last_message(); return cmdret_new (RET_SUCCESS, NULL); } cmdret * -cmd_focusup (int interactive, struct cmdarg **args) +cmd_focusup (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame *frame; @@ -4248,7 +4248,7 @@ cmd_focusup (int interactive, struct cmdarg **args) } cmdret * -cmd_focusdown (int interactive, struct cmdarg **args) +cmd_focusdown (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame *frame; @@ -4261,7 +4261,7 @@ cmd_focusdown (int interactive, struct cmdarg **args) } cmdret * -cmd_focusleft (int interactive, struct cmdarg **args) +cmd_focusleft (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame *frame; @@ -4274,7 +4274,7 @@ cmd_focusleft (int interactive, struct cmdarg **args) } cmdret * -cmd_focusright (int interactive, struct cmdarg **args) +cmd_focusright (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame *frame; @@ -4287,7 +4287,7 @@ cmd_focusright (int interactive, struct cmdarg **args) } cmdret * -cmd_exchangeup (int interactive, struct cmdarg **args) +cmd_exchangeup (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame *frame; @@ -4298,7 +4298,7 @@ cmd_exchangeup (int interactive, struct cmdarg **args) } cmdret * -cmd_exchangedown (int interactive, struct cmdarg **args) +cmd_exchangedown (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame *frame; @@ -4309,7 +4309,7 @@ cmd_exchangedown (int interactive, struct cmdarg **args) } cmdret * -cmd_exchangeleft (int interactive, struct cmdarg **args) +cmd_exchangeleft (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame *frame; @@ -4320,7 +4320,7 @@ cmd_exchangeleft (int interactive, struct cmdarg **args) } cmdret * -cmd_exchangeright (int interactive, struct cmdarg **args) +cmd_exchangeright (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame *frame; @@ -4331,7 +4331,7 @@ cmd_exchangeright (int interactive, struct cmdarg **args) } cmdret * -cmd_swap (int interactive, struct cmdarg **args) +cmd_swap (int interactive UNUSED, struct cmdarg **args) { rp_screen *s; rp_frame *dest_frame; @@ -4353,7 +4353,7 @@ cmd_swap (int interactive, struct cmdarg **args) } cmdret * -cmd_restart (int interactive, struct cmdarg **args) +cmd_restart (int interactive UNUSED, struct cmdarg **args UNUSED) { hup_signalled = 1; return cmdret_new (RET_SUCCESS, NULL); @@ -4376,7 +4376,7 @@ cmd_startup_message (int interactive, struct cmdarg **args) } cmdret * -cmd_focuslast (int interactive, struct cmdarg **args) +cmd_focuslast (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame *frame = find_last_frame(); @@ -4431,7 +4431,7 @@ set_barpadding (struct cmdarg **args) } cmdret * -cmd_alias (int interactive, struct cmdarg **args) +cmd_alias (int interactive UNUSED, struct cmdarg **args) { /* Add or update the alias. */ add_alias (ARG_STRING(0), ARG_STRING(1)); @@ -4439,7 +4439,7 @@ cmd_alias (int interactive, struct cmdarg **args) } cmdret * -cmd_unalias (int interactive, struct cmdarg **args) +cmd_unalias (int interactive UNUSED, struct cmdarg **args) { int i; @@ -4473,7 +4473,7 @@ cmd_unalias (int interactive, struct cmdarg **args) } cmdret * -cmd_nextscreen (int interactive, struct cmdarg **args) +cmd_nextscreen (int interactive UNUSED, struct cmdarg **args UNUSED) { int new_screen; @@ -4491,7 +4491,7 @@ cmd_nextscreen (int interactive, struct cmdarg **args) } cmdret * -cmd_prevscreen (int interactive, struct cmdarg **args) +cmd_prevscreen (int interactive UNUSED, struct cmdarg **args UNUSED) { int new_screen; @@ -4509,7 +4509,7 @@ cmd_prevscreen (int interactive, struct cmdarg **args) } cmdret * -cmd_sselect(int interactive, struct cmdarg **args) +cmd_sselect(int interactive UNUSED, struct cmdarg **args) { int new_screen; @@ -4690,7 +4690,7 @@ sync_wins (rp_screen *s) static int tmpwm_error_raised = 0; static int -tmpwm_error_handler (Display *d, XErrorEvent *e) +tmpwm_error_handler (Display *d UNUSED, XErrorEvent *e) { if (e->request_code == X_ChangeWindowAttributes && e->error_code == BadAccess) { @@ -4703,7 +4703,7 @@ tmpwm_error_handler (Display *d, XErrorEvent *e) /* Temporarily give control over to another window manager, reclaiming */ /* control when that WM terminates. */ cmdret * -cmd_tmpwm (int interactive, struct cmdarg **args) +cmd_tmpwm (int interactive UNUSED, struct cmdarg **args) { struct list_head *tmp, *iter; rp_window *win = NULL; @@ -4837,7 +4837,7 @@ fdump (rp_screen *screen) } cmdret * -cmd_fdump (int interactively, struct cmdarg **args) +cmd_fdump (int interactively UNUSED, struct cmdarg **args) { if (args[0] == NULL) { @@ -4957,14 +4957,14 @@ frestore (char *data, rp_screen *s) } cmdret * -cmd_frestore (int interactively, struct cmdarg **args) +cmd_frestore (int interactively UNUSED, struct cmdarg **args) { push_frame_undo (current_screen()); /* fdump to stack */ return frestore (ARG_STRING(0), current_screen()); } cmdret * -cmd_verbexec (int interactive, struct cmdarg **args) +cmd_verbexec (int interactive UNUSED, struct cmdarg **args) { marked_message_printf(0, 0, "Running %s", ARG_STRING(0)); spawn (ARG_STRING(0), 0, current_frame()); @@ -4988,28 +4988,28 @@ set_winliststyle (struct cmdarg **args) } cmdret * -cmd_gnext (int interactive, struct cmdarg **args) +cmd_gnext (int interactive UNUSED, struct cmdarg **args UNUSED) { set_current_group (group_next_group ()); return cmdret_new (RET_SUCCESS, NULL); } cmdret * -cmd_gprev (int interactive, struct cmdarg **args) +cmd_gprev (int interactive UNUSED, struct cmdarg **args UNUSED) { set_current_group (group_prev_group ()); return cmdret_new (RET_SUCCESS, NULL); } cmdret * -cmd_gother (int interactive, struct cmdarg **args) +cmd_gother (int interactive UNUSED, struct cmdarg **args UNUSED) { set_current_group (group_last_group ()); return cmdret_new (RET_SUCCESS, NULL); } cmdret * -cmd_gnew (int interactive, struct cmdarg **args) +cmd_gnew (int interactive UNUSED, struct cmdarg **args) { if (groups_find_group_by_name (ARG_STRING (0), 1)) return cmdret_new (RET_FAILURE, "gnew: group already exists"); @@ -5018,7 +5018,7 @@ cmd_gnew (int interactive, struct cmdarg **args) } cmdret * -cmd_gnewbg (int interactive, struct cmdarg **args) +cmd_gnewbg (int interactive UNUSED, struct cmdarg **args) { if (groups_find_group_by_name (ARG_STRING (0), 1)) return cmdret_new (RET_FAILURE, "gnewbg: group already exists"); @@ -5027,7 +5027,7 @@ cmd_gnewbg (int interactive, struct cmdarg **args) } cmdret * -cmd_grename (int interactive, struct cmdarg **args) +cmd_grename (int interactive UNUSED, struct cmdarg **args) { if (groups_find_group_by_name (ARG_STRING (0), 1)) return cmdret_new (RET_FAILURE, "grename: duplicate group name"); @@ -5052,7 +5052,7 @@ cmd_gselect (int interactive, struct cmdarg **args) /* Show all the groups, with the current one highlighted. */ cmdret * -cmd_groups (int interactive, struct cmdarg **args) +cmd_groups (int interactive, struct cmdarg **args UNUSED) { rp_group *cur; int mark_start = 0, mark_end = 0; @@ -5119,7 +5119,7 @@ cmd_groups (int interactive, struct cmdarg **args) /* Move a window to a different group. */ cmdret * -cmd_gmove (int interactive, struct cmdarg **args) +cmd_gmove (int interactive UNUSED, struct cmdarg **args) { if (current_window() == NULL) return cmdret_new (RET_FAILURE, "gmove: no focused window"); @@ -5129,14 +5129,14 @@ cmd_gmove (int interactive, struct cmdarg **args) } cmdret * -cmd_gmerge (int interactive, struct cmdarg **args) +cmd_gmerge (int interactive UNUSED, struct cmdarg **args) { groups_merge (ARG(0,group), rp_current_group); return cmdret_new (RET_SUCCESS, NULL); } cmdret * -cmd_addhook (int interactive, struct cmdarg **args) +cmd_addhook (int interactive UNUSED, struct cmdarg **args) { struct list_head *hook; struct sbuf *cmd; @@ -5154,7 +5154,7 @@ cmd_addhook (int interactive, struct cmdarg **args) } cmdret * -cmd_remhook (int interactive, struct cmdarg **args) +cmd_remhook (int interactive UNUSED, struct cmdarg **args) { struct sbuf *cmd; @@ -5168,7 +5168,7 @@ cmd_remhook (int interactive, struct cmdarg **args) } cmdret * -cmd_listhook (int interactive, struct cmdarg **args) +cmd_listhook (int interactive UNUSED, struct cmdarg **args) { cmdret *ret; struct sbuf *buffer; @@ -5197,7 +5197,7 @@ cmd_listhook (int interactive, struct cmdarg **args) } cmdret * -cmd_gdelete (int interactive, struct cmdarg **args) +cmd_gdelete (int interactive UNUSED, struct cmdarg **args) { rp_group *g; @@ -5224,7 +5224,7 @@ cmd_gdelete (int interactive, struct cmdarg **args) } cmdret * -cmd_readkey (int interactive, struct cmdarg **args) +cmd_readkey (int interactive UNUSED, struct cmdarg **args) { char *keysym_name; rp_action *key_action; @@ -5264,7 +5264,7 @@ cmd_readkey (int interactive, struct cmdarg **args) } cmdret * -cmd_newkmap (int interactive, struct cmdarg **args) +cmd_newkmap (int interactive UNUSED, struct cmdarg **args) { rp_keymap *map; @@ -5279,7 +5279,7 @@ cmd_newkmap (int interactive, struct cmdarg **args) } cmdret * -cmd_delkmap (int interactive, struct cmdarg **args) +cmd_delkmap (int interactive UNUSED, struct cmdarg **args) { rp_keymap *map, *top, *root; @@ -5307,7 +5307,7 @@ set_framesels (struct cmdarg **args) } cmdret * -cmd_set (int interactive, struct cmdarg **args) +cmd_set (int interactive UNUSED, struct cmdarg **args) { if (args[0] == NULL) { @@ -5404,7 +5404,7 @@ cmd_set (int interactive, struct cmdarg **args) } cmdret * -cmd_sfdump (int interactively, struct cmdarg **args) +cmd_sfdump (int interactively UNUSED, struct cmdarg **args UNUSED) { cmdret *ret; struct sbuf *s; @@ -5437,7 +5437,7 @@ cmd_sfdump (int interactively, struct cmdarg **args) } cmdret * -cmd_sfrestore (int interactively, struct cmdarg **args) +cmd_sfrestore (int interactively UNUSED, struct cmdarg **args) { int out_of_screen = 0; int number_of_frames = 0; @@ -5509,7 +5509,7 @@ cmd_sfrestore (int interactively, struct cmdarg **args) } cmdret * -cmd_sdump (int interactive, struct cmdarg **args) +cmd_sdump (int interactive UNUSED, struct cmdarg **args UNUSED) { cmdret *ret; struct sbuf *s; @@ -5676,7 +5676,7 @@ cmd_iprev (int interactive, struct cmdarg **args) } cmdret * -cmd_cother (int interactive, struct cmdarg **args) +cmd_cother (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_window *cur, *w; @@ -5692,7 +5692,7 @@ cmd_cother (int interactive, struct cmdarg **args) } cmdret * -cmd_iother (int interactive, struct cmdarg **args) +cmd_iother (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_window *cur, *w; @@ -5708,7 +5708,7 @@ cmd_iother (int interactive, struct cmdarg **args) } cmdret * -cmd_undo (int interactive, struct cmdarg **args) +cmd_undo (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame_undo *cur; @@ -5725,7 +5725,7 @@ cmd_undo (int interactive, struct cmdarg **args) } cmdret * -cmd_redo (int interactive, struct cmdarg **args) +cmd_redo (int interactive UNUSED, struct cmdarg **args UNUSED) { rp_frame_undo *cur; @@ -5744,7 +5744,7 @@ cmd_redo (int interactive, struct cmdarg **args) } cmdret * -cmd_prompt (int interactive, struct cmdarg **args) +cmd_prompt (int interactive UNUSED, struct cmdarg **args) { cmdret *ret; char *query, *output, *prefix; @@ -5775,7 +5775,7 @@ cmd_prompt (int interactive, struct cmdarg **args) } cmdret * -cmd_describekey (int interactive, struct cmdarg **args) +cmd_describekey (int interactive UNUSED, struct cmdarg **args) { char *keysym_name; rp_action *key_action; @@ -5819,7 +5819,7 @@ cmd_describekey (int interactive, struct cmdarg **args) } cmdret * -cmd_dedicate (int interactive, struct cmdarg **args) +cmd_dedicate (int interactive UNUSED, struct cmdarg **args) { rp_frame *f; @@ -5838,14 +5838,14 @@ cmd_dedicate (int interactive, struct cmdarg **args) } cmdret * -cmd_putsel (int interactive, struct cmdarg **args) +cmd_putsel (int interactive UNUSED, struct cmdarg **args) { set_selection(ARG_STRING(0)); return cmdret_new (RET_SUCCESS, NULL); } cmdret * -cmd_getsel (int interactive, struct cmdarg **args) +cmd_getsel (int interactive UNUSED, struct cmdarg **args UNUSED) { char *sel = get_selection(); cmdret *ret; @@ -5857,7 +5857,7 @@ cmd_getsel (int interactive, struct cmdarg **args) /* This is a command that restores old commands that have been recently depricated. */ cmdret * -cmd_compat (int interactive, struct cmdarg **args) +cmd_compat (int interactive UNUSED, struct cmdarg **args UNUSED) { add_alias ("defresizeunit", "set resizeunit"); add_alias ("defwingravity", "set wingravity"); diff --git a/src/editor.c b/src/editor.c index 23b6e35..ac10d1f 100644 --- a/src/editor.c +++ b/src/editor.c @@ -415,13 +415,13 @@ editor_history_next (rp_input_line *line) } static edit_status -editor_abort (rp_input_line *line) +editor_abort (rp_input_line *line UNUSED) { return EDIT_ABORT; } static edit_status -editor_no_action (rp_input_line *line) +editor_no_action (rp_input_line *line UNUSED) { return EDIT_NO_OP; } diff --git a/src/globals.c b/src/globals.c index f056103..9ebc8e3 100644 --- a/src/globals.c +++ b/src/globals.c @@ -297,7 +297,11 @@ rp_draw_string (rp_screen *s, Drawable d, int style, int x, int y, char *string, } int +#ifdef USE_XFT_FONT rp_text_width (rp_screen *s, XFontSet font, char *string, int count) +#else +rp_text_width (rp_screen *s UNUSED, XFontSet font, char *string, int count) +#endif { if (count < 0) count = strlen (string); diff --git a/src/globals.h b/src/globals.h index cb5e16c..00af94d 100644 --- a/src/globals.h +++ b/src/globals.h @@ -70,6 +70,12 @@ #define STYLE_NORMAL 0 #define STYLE_INVERSE 1 +#ifdef __GNUC__ +#define UNUSED __attribute__ ((unused)) +#else +#define UNUSED +#endif + /* The list of groups. */ extern struct list_head rp_groups; diff --git a/src/history.c b/src/history.c index bea9fb6..29e1749 100644 --- a/src/history.c +++ b/src/history.c @@ -301,7 +301,7 @@ history_next (int history_id) return list_entry(histories[history_id].current, struct history_item, node)->line; } -int history_expand_line (int history_id, char *string, char **output) +int history_expand_line (int history_id UNUSED, char *string, char **output) { #ifdef HAVE_HISTORY struct history_item *item; diff --git a/src/main.c b/src/main.c index 4255b8f..417fc1a 100644 --- a/src/main.c +++ b/src/main.c @@ -202,19 +202,19 @@ str_comp (char *s1, char *s2, int len) } static void -sighandler (int signum) +sighandler (int signum UNUSED) { kill_signalled++; } static void -hup_handler (int signum) +hup_handler (int signum UNUSED) { hup_signalled++; } static void -alrm_handler (int signum) +alrm_handler (int signum UNUSED) { alarm_signalled++; } @@ -250,7 +250,7 @@ check_child_procs (void) } void -chld_handler (int signum) +chld_handler (int signum UNUSED) { int serrno; diff --git a/src/xinerama.c b/src/xinerama.c index 044928f..51d51b3 100644 --- a/src/xinerama.c +++ b/src/xinerama.c @@ -36,11 +36,11 @@ static XineramaScreenInfo *xine_screens = NULL; void init_xinerama(void) { +#ifdef XINERAMA int evbase, errbase, major, minor; rp_have_xinerama = 0; -#ifdef XINERAMA if (xine_screens) XFree(xine_screens); if (!XineramaQueryExtension(dpy, &evbase, &errbase)) { @@ -66,20 +66,26 @@ init_xinerama(void) } rp_have_xinerama = 1; +#else + rp_have_xinerama = 0; #endif } +#ifdef XINERAMA void xinerama_get_screen_info(int sc, int *x, int *y, int *w, int *h) { -#ifdef XINERAMA if ((sc < xine_screen_count) && (sc >= 0)) { *x = xine_screens[sc].x_org; *y = xine_screens[sc].y_org; *w = xine_screens[sc].width; *h = xine_screens[sc].height; } -#endif } +#else +void xinerama_get_screen_info(int sc UNUSED, int *x UNUSED, int *y UNUSED, int *w UNUSED, int *h UNUSED) +{ +} +#endif void free_xinerama(void) -- cgit v1.2.3