diff --git a/src/screen_client.c b/src/screen_client.c
index f864f1998498e810ea182feddbf3183344220f14..6eb9bf4964de2f2950a60ae021fd65346eac0a46 100644 (file)
--- a/src/screen_client.c
+++ b/src/screen_client.c
#include "screen_client.h"
#include "screen_utils.h"
-#include "screen_message.h"
+#include "screen_status.h"
#include "mpdclient.h"
#include "i18n.h"
#include "charset.h"
static bool
_screen_auth(struct mpdclient *c, gint recursion)
{
- struct mpd_connection *connection;
- char *password;
-
- connection = mpdclient_get_connection(c);
+ struct mpd_connection *connection = mpdclient_get_connection(c);
if (connection == NULL)
return false;
if (recursion > 2)
return false;
- password = screen_read_password(NULL);
+ char *password = screen_read_password(NULL);
if (password == NULL)
return false;
void
screen_database_update(struct mpdclient *c, const char *path)
{
- struct mpd_connection *connection;
- unsigned id;
-
assert(c != NULL);
assert(mpdclient_is_connected(c));
- connection = mpdclient_get_connection(c);
+ struct mpd_connection *connection = mpdclient_get_connection(c);
if (connection == NULL)
return;
- id = mpd_run_update(connection, path);
+ unsigned id = mpd_run_update(connection, path);
if (id == 0) {
if (mpd_connection_get_error(connection) == MPD_ERROR_SERVER &&
mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_UPDATE_ALREADY &&