![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/main.c b/src/main.c
index d35fda4c0d89228dafa0a160ff5f14e130557dce..044221024ff11bf1f78947a4ebe7e402edb8670b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
static void
update_xterm_title(void)
{
- static char title[BUFSIZE];
- char tmp[BUFSIZE];
struct mpd_status *status = NULL;
const struct mpd_song *song = NULL;
-
if (mpd) {
status = mpd->status;
song = mpd->song;
}
+ char tmp[BUFSIZE];
if (options.xterm_title_format && status && song &&
mpd_status_get_state(status) == MPD_STATE_PLAY)
strfsong(tmp, BUFSIZE, options.xterm_title_format, song);
else
g_strlcpy(tmp, PACKAGE " version " VERSION, BUFSIZE);
+ static char title[BUFSIZE];
if (strncmp(title, tmp, BUFSIZE)) {
g_strlcpy(title, tmp, BUFSIZE);
set_xterm_title("%s", title);
#ifndef WIN32
static void
-catch_sigint(G_GNUC_UNUSED int sig)
+catch_sigint(gcc_unused int sig)
{
g_main_loop_quit(main_loop);
}
static void
-catch_sigcont(G_GNUC_UNUSED int sig)
+catch_sigcont(gcc_unused int sig)
{
char irrelevant = 'a';
if (1 != write(sigwinch_pipes[1], &irrelevant, 1))
}
static gboolean
-sigwinch_event(G_GNUC_UNUSED GIOChannel *source,
- G_GNUC_UNUSED GIOCondition condition, G_GNUC_UNUSED gpointer data)
+sigwinch_event(gcc_unused GIOChannel *source,
+ gcc_unused GIOCondition condition, gcc_unused gpointer data)
{
char ignoreme[64];
if (1 > read(sigwinch_pipes[0], ignoreme, 64))
}
static void
-catch_sigwinch(G_GNUC_UNUSED int sig)
+catch_sigwinch(gcc_unused int sig)
{
char irrelevant = 'a';
if (1 != write(sigwinch_pipes[1], &irrelevant, 1))
static void
idle_callback(enum mpd_error error,
- G_GNUC_UNUSED enum mpd_server_error server_error,
+ gcc_unused enum mpd_server_error server_error,
const char *message, enum mpd_idle events,
- G_GNUC_UNUSED void *ctx);
+ gcc_unused void *ctx);
static gboolean
timer_mpd_update(gpointer data);
* broken. It tries to recover by reconnecting periodically.
*/
static gboolean
-timer_reconnect(G_GNUC_UNUSED gpointer data)
+timer_reconnect(gcc_unused gpointer data)
{
- bool success;
- struct mpd_connection *connection;
-
assert(!mpdclient_is_connected(mpd));
reconnect_source_id = 0;
doupdate();
mpdclient_disconnect(mpd);
- success = mpdclient_connect(mpd,
- options.host, options.port,
- options.timeout_ms,
- options.password);
- if (!success) {
+ if (!mpdclient_connect(mpd, options.host, options.port,
+ options.timeout_ms,
+ options.password)) {
/* try again in 5 seconds */
reconnect_source_id = g_timeout_add(5000,
timer_reconnect, NULL);
return FALSE;
}
- connection = mpdclient_get_connection(mpd);
+ struct mpd_connection *connection = mpdclient_get_connection(mpd);
#ifndef NCMPC_MINI
/* quit if mpd is pre 0.14 - song id not supported by mpd */
if (mpd_connection_cmp_server_version(connection, 0, 16, 0) < 0) {
const unsigned *version =
mpd_connection_get_server_version(connection);
- screen_status_printf(_("Error: MPD version %d.%d.%d is to old (%s needed)"),
+ screen_status_printf(_("Error: MPD version %d.%d.%d is too old (%s needed)"),
version[0], version[1], version[2],
"0.16.0");
mpdclient_disconnect(mpd);
assert(mpdclient_is_connected(c));
if (error != MPD_ERROR_SUCCESS) {
- char *allocated;
-
if (error == MPD_ERROR_SERVER &&
server_error == MPD_SERVER_ERROR_UNKNOWN_CMD) {
/* the "idle" command is not supported - fall
return;
}
+ char *allocated;
if (error == MPD_ERROR_SERVER)
message = allocated = utf8_to_locale(message);
else
}
static gboolean
-timer_mpd_update(G_GNUC_UNUSED gpointer data)
+timer_mpd_update(gcc_unused gpointer data)
{
do_mpd_update();
}
static gboolean
-keyboard_event(G_GNUC_UNUSED GIOChannel *source,
- G_GNUC_UNUSED GIOCondition condition,
- G_GNUC_UNUSED gpointer data)
+keyboard_event(gcc_unused GIOChannel *source,
+ gcc_unused GIOCondition condition,
+ gcc_unused gpointer data)
{
- command_t cmd;
-
begin_input_event();
- if ((cmd=get_keyboard_command()) != CMD_NONE)
+ command_t cmd = get_keyboard_command();
+ if (cmd != CMD_NONE)
if (do_input_event(cmd) != 0)
return FALSE;
* message every 10 seconds.
*/
static gboolean
-timer_check_key_bindings(G_GNUC_UNUSED gpointer data)
+timer_check_key_bindings(gcc_unused gpointer data)
{
char buf[256];
-#ifdef ENABLE_KEYDEF_SCREEN
- char comment[64];
-#endif
- gboolean key_error;
- key_error = check_key_bindings(NULL, buf, sizeof(buf));
- if (!key_error) {
+ if (check_key_bindings(NULL, buf, sizeof(buf))) {
/* no error: disable this timer for the rest of this
process */
check_key_bindings_source_id = 0;
/* to translators: a key was bound twice in the key editor,
and this is a hint for the user what to press to correct
that */
+ char comment[64];
g_snprintf(comment, sizeof(comment), _("press %s for the key editor"),
get_key_names(CMD_SCREEN_KEYDEF, false));
g_strlcat(buf, comment, sizeof(buf));
int
main(int argc, const char *argv[])
{
-#ifndef WIN32
- struct sigaction act;
-#endif
#ifdef ENABLE_LOCALE
#ifndef ENABLE_NLS
- G_GNUC_UNUSED
+ gcc_unused
#endif
const char *charset = NULL;
-#endif
- GIOChannel *keyboard_channel;
-#ifdef ENABLE_LIRC
- int lirc_socket;
- GIOChannel *lirc_channel = NULL;
-#endif
- GIOChannel *sigwinch_channel = NULL;
-
-#ifdef ENABLE_LOCALE
/* time and date formatting */
setlocale(LC_TIME,"");
/* care about sorting order etc */
#ifndef WIN32
/* setup signal behavior - SIGINT */
+ struct sigaction act;
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
act.sa_handler = catch_sigint;
main_loop = g_main_loop_new(NULL, FALSE);
/* watch out for keyboard input */
- keyboard_channel = g_io_channel_unix_new(STDIN_FILENO);
+ GIOChannel *keyboard_channel = g_io_channel_unix_new(STDIN_FILENO);
g_io_add_watch(keyboard_channel, G_IO_IN, keyboard_event, NULL);
#ifdef ENABLE_LIRC
/* watch out for lirc input */
- lirc_socket = ncmpc_lirc_open();
+ int lirc_socket = ncmpc_lirc_open();
+ GIOChannel *lirc_channel = NULL;
if (lirc_socket >= 0) {
lirc_channel = g_io_channel_unix_new(lirc_socket);
g_io_add_watch(lirc_channel, G_IO_IN, lirc_event, NULL);
#endif
#ifndef WIN32
+ GIOChannel *sigwinch_channel = NULL;
if (!pipe(sigwinch_pipes) &&
!fcntl(sigwinch_pipes[1], F_SETFL, O_NONBLOCK)) {
sigwinch_channel = g_io_channel_unix_new(sigwinch_pipes[0]);