From 206c7648cd05fd598f5eabd58748d2f40bb4ff39 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Thu, 14 Feb 2013 14:40:28 +0000 Subject: [PATCH] Sprinkle some const. --- commands.c | 4 ++-- commands.h | 4 ++-- keybindings.c | 6 +++--- keybindings.h | 6 +++--- paint.c | 4 ++-- paint.h | 4 ++-- player.c | 2 +- player.h | 6 +++--- players/gstplayer.c | 6 +++--- players/gstplayer.h | 12 ++++++------ players/mplayer.c | 12 ++++++------ players/mplayer.h | 6 +++--- str2argv.c | 2 +- str2argv.h | 2 +- vitunes.c | 2 +- vitunes.h | 2 +- 16 files changed, 40 insertions(+), 40 deletions(-) diff --git a/commands.c b/commands.c index e310fca..f65f32c 100644 --- a/commands.c +++ b/commands.c @@ -75,7 +75,7 @@ toggleset_free() } void -toggle_list_add_command(toggle_list *t, char *cmd) +toggle_list_add_command(toggle_list *t, const char *cmd) { char **new_cmds; int idx; @@ -918,7 +918,7 @@ cmd_playlist(int argc, char *argv[]) } void -cmd_execute(char *cmd) +cmd_execute(const char *cmd) { const char *errmsg = NULL; bool found; diff --git a/commands.h b/commands.h index 521efe7..799b554 100644 --- a/commands.h +++ b/commands.h @@ -56,7 +56,7 @@ int cmd_toggle(int argc, char *argv[]); int cmd_playlist(int argc, char *argv[]); /* parse a string and execute it as a command */ -void cmd_execute(char *cmd); +void cmd_execute(const char *cmd); /**************************************************************************** @@ -80,7 +80,7 @@ void toggleset_init(); void toggleset_free(); toggle_list *toggle_list_create(int registr, int argc, char *argv[]); -void toggle_list_add_command(toggle_list *t, char *cmd); +void toggle_list_add_command(toggle_list *t, const char *cmd); void toggle_list_free(toggle_list *t); void toggle_add(toggle_list *t); diff --git a/keybindings.c b/keybindings.c index 242e868..e404dd6 100644 --- a/keybindings.c +++ b/keybindings.c @@ -361,7 +361,7 @@ kb_str2action(const char *s, KeyAction *action) } KeyCode -kb_str2specialKey(char *s) +kb_str2specialKey(const char *s) { size_t i; @@ -374,7 +374,7 @@ kb_str2specialKey(char *s) } KeyCode -kb_str2keycode(char *s) +kb_str2keycode(const char *s) { KeyCode val; @@ -387,7 +387,7 @@ kb_str2keycode(char *s) } KeyCode -kb_str2keycode2(char *control, char *key) +kb_str2keycode2(const char *control, const char *key) { KeyCode val; diff --git a/keybindings.h b/keybindings.h index 4ad5ccb..2b935a3 100644 --- a/keybindings.h +++ b/keybindings.h @@ -101,9 +101,9 @@ void kb_unbind_all(); bool kb_execute(KeyCode); bool kb_execute_by_name(const char *); -bool kb_str2action(const char*, KeyAction*); -KeyCode kb_str2keycode(char*); -KeyCode kb_str2keycode2(char*, char*); +bool kb_str2action(const char *, KeyAction *); +KeyCode kb_str2keycode(const char *); +KeyCode kb_str2keycode2(const char *, const char *); /* diff --git a/paint.c b/paint.c index e0b4a8f..ca57279 100644 --- a/paint.c +++ b/paint.c @@ -552,7 +552,7 @@ paint_all() * identical to that of printf(3) (vwprintw(3) actually). */ void -paint_error(char *fmt, ...) +paint_error(const char *fmt, ...) { va_list ap; @@ -574,7 +574,7 @@ paint_error(char *fmt, ...) * is identical to that of printf(3) (vwprintw(3) actually). */ void -paint_message(char *fmt, ...) +paint_message(const char *fmt, ...) { va_list ap; diff --git a/paint.h b/paint.h index b8c8643..a572088 100644 --- a/paint.h +++ b/paint.h @@ -81,8 +81,8 @@ extern bool showing_file_info; void paint_playlist_file_info(const meta_info *m); /* routines for painting errors/messages in the command/status window */ -void paint_error(char *fmt, ...); -void paint_message(char *fmt, ...); +void paint_error(const char *fmt, ...); +void paint_message(const char *fmt, ...); /* for setting up and working with the colors */ void paint_setup_colors(); diff --git a/player.c b/player.c index 37bf637..3758efd 100644 --- a/player.c +++ b/player.c @@ -25,7 +25,7 @@ player_info_t player_info; static void callback_playnext() { player_skip_song(1); } static void -callback_fatal(char *fmt, ...) +callback_fatal(const char *fmt, ...) { va_list ap; diff --git a/player.h b/player.h index 029fb43..8cc131c 100644 --- a/player.h +++ b/player.h @@ -98,9 +98,9 @@ typedef struct { /* callback functions */ void (*set_callback_playnext)(void (*f)(void)); - void (*set_callback_notice)(void (*f)(char *, ...)); - void (*set_callback_error)(void (*f)(char *, ...)); - void (*set_callback_fatal)(void (*f)(char *, ...)); + void (*set_callback_notice)(void (*f)(const char *, ...)); + void (*set_callback_error)(void (*f)(const char *, ...)); + void (*set_callback_fatal)(void (*f)(const char *, ...)); /* monitor function */ void (*monitor)(void); diff --git a/players/gstplayer.c b/players/gstplayer.c index 01f77a7..4b6f1c0 100644 --- a/players/gstplayer.c +++ b/players/gstplayer.c @@ -269,17 +269,17 @@ gstplayer_set_callback_playnext(void (*f)(void)) gplayer.playnext_cb = f; } void -gstplayer_set_callback_notice(void (*f)(char *, ...)) +gstplayer_set_callback_notice(void (*f)(const char *, ...)) { gplayer.notice_cb = f; } void -gstplayer_set_callback_error(void (*f)(char *, ...)) +gstplayer_set_callback_error(void (*f)(const char *, ...)) { gplayer.error_cb = f; } void -gstplayer_set_callback_fatal(void (*f)(char *, ...)) +gstplayer_set_callback_fatal(void (*f)(const char *, ...)) { gplayer.fatal_cb = f; } diff --git a/players/gstplayer.h b/players/gstplayer.h index b23c8f7..244e6e9 100644 --- a/players/gstplayer.h +++ b/players/gstplayer.h @@ -35,9 +35,9 @@ typedef struct { bool about_to_finish; /* callback functions */ void (*playnext_cb)(void); - void (*notice_cb)(char *, ...); - void (*error_cb)(char *, ...); - void (*fatal_cb)(char *, ...); + void (*notice_cb)(const char *, ...); + void (*error_cb)(const char *, ...); + void (*fatal_cb)(const char *, ...); /* backend data */ GstElement *player; @@ -60,9 +60,9 @@ bool gstplayer_is_playing(); bool gstplayer_is_paused(); void gstplayer_set_callback_playnext(void (*f)(void)); -void gstplayer_set_callback_notice(void (*f)(char *, ...)); -void gstplayer_set_callback_error(void (*f)(char *, ...)); -void gstplayer_set_callback_fatal(void (*f)(char *, ...)); +void gstplayer_set_callback_notice(void (*f)(const char *, ...)); +void gstplayer_set_callback_error(void (*f)(const char *, ...)); +void gstplayer_set_callback_fatal(void (*f)(const char *, ...)); void gstplayer_monitor(); diff --git a/players/mplayer.c b/players/mplayer.c index fcc8f71..4afb5f7 100644 --- a/players/mplayer.c +++ b/players/mplayer.c @@ -19,9 +19,9 @@ /* callback functions */ void (*mplayer_callback_playnext)(void) = NULL; -void (*mplayer_callback_notice)(char *, ...) = NULL; -void (*mplayer_callback_error)(char *, ...) = NULL; -void (*mplayer_callback_fatal)(char *, ...) = NULL; +void (*mplayer_callback_notice)(const char *, ...) = NULL; +void (*mplayer_callback_error)(const char *, ...) = NULL; +void (*mplayer_callback_fatal)(const char *, ...) = NULL; /* record keeping */ @@ -306,19 +306,19 @@ mplayer_set_callback_playnext(void (*f)(void)) } void -mplayer_set_callback_notice(void (*f)(char *, ...)) +mplayer_set_callback_notice(void (*f)(const char *, ...)) { mplayer_callback_notice = f; } void -mplayer_set_callback_error(void (*f)(char *, ...)) +mplayer_set_callback_error(void (*f)(const char *, ...)) { mplayer_callback_error = f; } void -mplayer_set_callback_fatal(void (*f)(char *, ...)) +mplayer_set_callback_fatal(void (*f)(const char *, ...)) { mplayer_callback_fatal = f; } diff --git a/players/mplayer.h b/players/mplayer.h index 03700cd..fd31537 100644 --- a/players/mplayer.h +++ b/players/mplayer.h @@ -55,9 +55,9 @@ bool mplayer_is_playing(); bool mplayer_is_paused(); void mplayer_set_callback_playnext(void (*f)(void)); -void mplayer_set_callback_notice(void (*f)(char *, ...)); -void mplayer_set_callback_error(void (*f)(char *, ...)); -void mplayer_set_callback_fatal(void (*f)(char *, ...)); +void mplayer_set_callback_notice(void (*f)(const char *, ...)); +void mplayer_set_callback_error(void (*f)(const char *, ...)); +void mplayer_set_callback_fatal(void (*f)(const char *, ...)); void mplayer_monitor(); diff --git a/str2argv.c b/str2argv.c index 5922ffb..5fbb0ec 100644 --- a/str2argv.c +++ b/str2argv.c @@ -85,7 +85,7 @@ argv_finish_token(int *argc, char ***argv) * both argc/argv are set to 0/NULL. */ int -str2argv(char *str, int *argc, char ***argv, const char **errmsg) +str2argv(const char *str, int *argc, char ***argv, const char **errmsg) { bool in_token; bool in_container; diff --git a/str2argv.h b/str2argv.h index ab77c19..b9d77b3 100644 --- a/str2argv.h +++ b/str2argv.h @@ -36,7 +36,7 @@ * quoting, etc., and builds an argc/argv style set of parameters that are * suitable for passing to any of the cmd_* or ecmd_* functions. */ -int str2argv(char *str, int *argc, char ***argv, const char **errmsg); +int str2argv(const char *str, int *argc, char ***argv, const char **errmsg); /* * After the above function is used to build an argc/argv set of parameters, diff --git a/vitunes.c b/vitunes.c index 7d1abbb..f71e457 100644 --- a/vitunes.c +++ b/vitunes.c @@ -65,7 +65,7 @@ char *playlist_dir; char *player_backend; /* program name with directories removed */ -char *progname; +const char *progname; /***************************************************************************** diff --git a/vitunes.h b/vitunes.h index 8348da0..245ad3e 100644 --- a/vitunes.h +++ b/vitunes.h @@ -54,7 +54,7 @@ extern char *vitunes_dir; extern char *playlist_dir; extern char *db_file; -extern char *progname; +extern const char *progname; /* record keeping */ extern playlist *viewing_playlist;