Fix CLANG build break

.github/workflows/ccpp.yml

@@ -1,19 +0,0 @@
-name: C/C++ CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    
-    steps:
-    - uses: actions/checkout@v2
-    - name: make
-      run: make
-    - name: make test
-      run: make test

.vscode/settings.json

@@ -1,58 +0,0 @@
-{
-    "files.associations": {
-        "zmalloc.h": "c",
-        "stat.h": "c",
-        "array": "cpp",
-        "atomic": "cpp",
-        "*.tcc": "cpp",
-        "cctype": "cpp",
-        "chrono": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "condition_variable": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "deque": "cpp",
-        "list": "cpp",
-        "unordered_map": "cpp",
-        "vector": "cpp",
-        "exception": "cpp",
-        "fstream": "cpp",
-        "functional": "cpp",
-        "future": "cpp",
-        "initializer_list": "cpp",
-        "iomanip": "cpp",
-        "iosfwd": "cpp",
-        "iostream": "cpp",
-        "istream": "cpp",
-        "limits": "cpp",
-        "memory": "cpp",
-        "mutex": "cpp",
-        "new": "cpp",
-        "numeric": "cpp",
-        "optional": "cpp",
-        "ostream": "cpp",
-        "ratio": "cpp",
-        "scoped_allocator": "cpp",
-        "sstream": "cpp",
-        "stdexcept": "cpp",
-        "streambuf": "cpp",
-        "string_view": "cpp",
-        "system_error": "cpp",
-        "thread": "cpp",
-        "cinttypes": "cpp",
-        "tuple": "cpp",
-        "type_traits": "cpp",
-        "typeinfo": "cpp",
-        "utility": "cpp",
-        "set": "cpp",
-        "algorithm": "cpp"
-    }
-}

src/config.cpp

@@ -1496,15 +1496,8 @@ void configGetCommand(client *c) {
             listIter li;
             listNode *ln;
             listRewind(g_pserver->masters, &li);
-            bool fFirst = true;
             while ((ln = listNext(&li)))
             {
-                if (!fFirst)
-                {
-                    addReplyBulkCString(c,optname);
-                    matches++;
-                }
-                fFirst = false;
                 struct redisMaster *mi = (struct redisMaster*)listNodeValue(ln);
                 snprintf(buf,sizeof(buf),"%s %d",
                     mi->masterhost, mi->masterport);

src/motd.cpp

@@ -23,7 +23,7 @@ static const char *szMotdCachePath()
         return "";
     const char *homedir = pw->pw_dir;
     sdsMotdCachePath = sdsnew(homedir);
-    sdsMotdCachePath = sdscat(sdsMotdCachePath, motd_cache_file);
+    sdsMotdCachePath = sdscat(sdsMotdCachePath, "/.keydb-cli-motd");
     return sdsMotdCachePath;
 }
 static size_t motd_write_callback(void *ptr, size_t size, size_t nmemb, sds *str)
@@ -87,7 +87,7 @@ extern "C" char *fetchMOTD(int cache)
     str = sdsnew("");
     curl = curl_easy_init();
     if(curl) {
-        curl_easy_setopt(curl, CURLOPT_URL, motd_url);
+        curl_easy_setopt(curl, CURLOPT_URL, "http://api.keydb.dev/motd/motd.txt");
         curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); // follow redirects
         curl_easy_setopt(curl, CURLOPT_TIMEOUT, 2); // take no more than two seconds
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, motd_write_callback);
@@ -101,17 +101,6 @@ extern "C" char *fetchMOTD(int cache)
             sdsfree(str);
             str = NULL;
         }
-        else
-        {
-            long response_code;
-            curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code);
-            if ((response_code / 100) != 2)
-            {
-                // An error code not in the 200s implies an error
-                sdsfree(str);
-                str = NULL;
-            }
-        }
 
         /* always cleanup */ 
         curl_easy_cleanup(curl);

src/motd.h

@@ -1,8 +1,5 @@
 #pragma once
 
-extern const char *motd_url;
-extern const char *motd_cache_file;
-
 #ifdef __cplusplus
 extern "C" {
 #endif

src/redis-cli.c

@@ -93,9 +93,6 @@ int spectrum_palette_size;
 
 int g_fInCrash = 0;
 
-const char *motd_url = "http://api.keydb.dev/motd/motd_cli.txt";
-const char *motd_cache_file = "/.keydb-cli-motd";
-
 /*------------------------------------------------------------------------------
  * Utility functions
  *--------------------------------------------------------------------------- */

src/server.cpp

@@ -65,8 +65,6 @@
 #include "motd.h"
 
 int g_fTestMode = false;
-const char *motd_url = "http://api.keydb.dev/motd/motd_server.txt";
-const char *motd_cache_file = "/.keydb-server-motd";
 
 /* Our shared "common" objects */
 

src/version.h

@@ -1,3 +1,3 @@
-#define KEYDB_REAL_VERSION "0.0.0"
+#define KEYDB_REAL_VERSION "5.3.2"
 extern const char *KEYDB_SET_VERSION;   // Unlike real version, this can be overriden by the config