From 7db9e2f9cd008716e3865cc005ee6ea43cca8a12 Mon Sep 17 00:00:00 2001 From: jcorporation Date: Thu, 29 Nov 2018 19:52:29 +0100 Subject: [PATCH] Fix: code cleanups --- src/mpd_client.c | 6 +++--- src/mpd_client.h | 2 +- src/mympd.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mpd_client.c b/src/mpd_client.c index 2c804c7..a81ea39 100644 --- a/src/mpd_client.c +++ b/src/mpd_client.c @@ -805,7 +805,7 @@ void callback_mympd(struct mg_connection *nc, const struct mg_str msg) { #ifdef DEBUG clock_gettime(CLOCK_MONOTONIC_RAW, &end); uint64_t delta_us = (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_nsec - start.tv_nsec) / 1000; - fprintf(stderr, "DEBUG: Time used: %llu\n", delta_us); + fprintf(stderr, "DEBUG: Time used: %lu\n", delta_us); #endif if (n == 0) @@ -2309,7 +2309,7 @@ int mympd_search(char *buffer, char *searchstr, char *filter, char *plist, unsig if (mpd_send_command(mpd.conn, "searchaddpl", plist, filter, searchstr, NULL) == false) RETURN_ERROR_AND_RECOVER("mpd_searchaddpl"); } - + if (strcmp(plist, "") == 0) { while ((song = mpd_recv_song(mpd.conn)) != NULL) { entity_count++; @@ -2417,7 +2417,7 @@ int mympd_search_adv(char *buffer, char *expression, char *sort, bool sortdesc, else len = json_printf(&out, "{type: result, data: ok}"); #else - len = json_printf(&out, "{type: error, data: %s}", "Advanced search is disabled."); + len = json_printf(&out, "{type: error, data: %Q}", "Advanced search is disabled."); #endif CHECK_RETURN_LEN(); return len; diff --git a/src/mpd_client.h b/src/mpd_client.h index 69688f2..ad32193 100644 --- a/src/mpd_client.h +++ b/src/mpd_client.h @@ -30,7 +30,7 @@ #define RETURN_ERROR_AND_RECOVER(X) do { \ printf("MPD %s: %s\n", X, mpd_connection_get_error_message(mpd.conn)); \ - len = json_printf(&out, "{ type:error, data : %Q }", mpd_connection_get_error_message(mpd.conn)); \ + len = json_printf(&out, "{type: error, data: %Q}", mpd_connection_get_error_message(mpd.conn)); \ if (!mpd_connection_clear_error(mpd.conn)) \ mpd.conn_state = MPD_FAILURE; \ return len; \ diff --git a/src/mympd.c b/src/mympd.c index 498474c..e3b443d 100644 --- a/src/mympd.c +++ b/src/mympd.c @@ -500,8 +500,8 @@ int main(int argc, char **argv) { snprintf(testdirname, 400, "%s/library", SRC_PATH); if (testdir("Link to mpd music_directory", testdirname)) { + LOG_INFO() printf("Enabling featLibrary support\n"); mpd.feat_library = true; - LOG_INFO() printf("Enabling coverimage support\n"); } else { LOG_INFO() printf("Disabling coverimage support\n");