rename git sha related (#184)

redisGitSHA1 -> serverGitSHA1  
redisGitDirty -> serverGitDirty 
redisBuildId -> serverBuildId 
redisBuildIdRaw -> serverBuildIdRaw 
redisBuildIdString -> serverBuildIdString

#144
#170

Signed-off-by: 0del <bany.y0599@gmail.com>

src/cli_common.c

@@ -50,8 +50,8 @@
 
 #define UNUSED(V) ((void) V)
 
-char *redisGitSHA1(void);
-char *redisGitDirty(void);
+char *serverGitSHA1(void);
+char *serverGitDirty(void);
 
 /* Wrapper around redisSecureConnection to avoid hiredis_ssl dependencies if
  * not building with TLS support.
@@ -416,9 +416,9 @@ sds cliVersion(void) {
     sds version = sdscatprintf(sdsempty(), "%s", REDIS_VERSION);
 
     /* Add git commit and working tree status when available. */
-    if (strtoll(redisGitSHA1(),NULL,16)) {
-        version = sdscatprintf(version, " (git:%s", redisGitSHA1());
-        if (strtoll(redisGitDirty(),NULL,10))
+    if (strtoll(serverGitSHA1(),NULL,16)) {
+        version = sdscatprintf(version, " (git:%s", serverGitSHA1());
+        if (strtoll(serverGitDirty(),NULL,10))
             version = sdscatprintf(version, "-dirty");
         version = sdscat(version, ")");
     }

src/release.c

@@ -37,19 +37,19 @@
 #include "release.h"
 #include "crc64.h"
 
-char *redisGitSHA1(void) {
+char *serverGitSHA1(void) {
     return REDIS_GIT_SHA1;
 }
 
-char *redisGitDirty(void) {
+char *serverGitDirty(void) {
     return REDIS_GIT_DIRTY;
 }
 
-const char *redisBuildIdRaw(void) {
+const char *serverBuildIdRaw(void) {
     return REDIS_BUILD_ID_RAW;
 }
 
-uint64_t redisBuildId(void) {
+uint64_t serverBuildId(void) {
     char *buildid = REDIS_BUILD_ID_RAW;
 
     return crc64(0,(unsigned char*)buildid,strlen(buildid));
@@ -58,11 +58,11 @@ uint64_t redisBuildId(void) {
 /* Return a cached value of the build string in order to avoid recomputing
  * and converting it in hex every time: this string is shown in the INFO
  * output that should be fast. */
-char *redisBuildIdString(void) {
+char *serverBuildIdString(void) {
     static char buf[32];
     static int cached = 0;
     if (!cached) {
-        snprintf(buf,sizeof(buf),"%llx",(unsigned long long) redisBuildId());
+        snprintf(buf,sizeof(buf),"%llx",(unsigned long long) serverBuildId());
         cached = 1;
     }
     return buf;

src/server.c

@@ -5585,9 +5585,9 @@ sds genRedisInfoString(dict *section_dict, int all_sections, int everything) {
 
         info = sdscatfmt(info, "# Server\r\n" FMTARGS(
             "redis_version:%s\r\n", REDIS_VERSION,
-            "redis_git_sha1:%s\r\n", redisGitSHA1(),
-            "redis_git_dirty:%i\r\n", strtol(redisGitDirty(),NULL,10) > 0,
-            "redis_build_id:%s\r\n", redisBuildIdString(),
+            "redis_git_sha1:%s\r\n", serverGitSHA1(),
+            "redis_git_dirty:%i\r\n", strtol(serverGitDirty(),NULL,10) > 0,
+            "redis_build_id:%s\r\n", serverBuildIdString(),
             "redis_mode:%s\r\n", mode,
             "os:%s", name.sysname,
             " %s", name.release,
@@ -6266,11 +6266,11 @@ sds getVersion(void) {
     sds version = sdscatprintf(sdsempty(),
         "v=%s sha=%s:%d malloc=%s bits=%d build=%llx",
         REDIS_VERSION,
-        redisGitSHA1(),
-        atoi(redisGitDirty()) > 0,
+        serverGitSHA1(),
+        atoi(serverGitDirty()) > 0,
         ZMALLOC_LIB,
         sizeof(long) == 4 ? 32 : 64,
-        (unsigned long long) redisBuildId());
+        (unsigned long long) serverBuildId());
     return version;
 }
 
@@ -6320,8 +6320,8 @@ void redisAsciiArt(void) {
     } else {
         snprintf(buf,1024*16,ascii_logo,
             REDIS_VERSION,
-            redisGitSHA1(),
-            strtol(redisGitDirty(),NULL,10) > 0,
+            serverGitSHA1(),
+            strtol(serverGitDirty(),NULL,10) > 0,
             (sizeof(long) == 8) ? "64" : "32",
             mode, server.port ? server.port : server.tls_port,
             (long) getpid()
@@ -7157,8 +7157,8 @@ int main(int argc, char **argv) {
         "Redis version=%s, bits=%d, commit=%s, modified=%d, pid=%d, just started",
             REDIS_VERSION,
             (sizeof(long) == 8) ? 64 : 32,
-            redisGitSHA1(),
-            strtol(redisGitDirty(),NULL,10) > 0,
+            serverGitSHA1(),
+            strtol(serverGitDirty(),NULL,10) > 0,
             (int)getpid());
 
     if (argc == 1) {

src/server.h

@@ -3470,11 +3470,11 @@ void dictListDestructor(dict *d, void *val);
 void *dictSdsDup(dict *d, const void *key);
 
 /* Git SHA1 */
-char *redisGitSHA1(void);
-char *redisGitDirty(void);
-uint64_t redisBuildId(void);
-const char *redisBuildIdRaw(void);
-char *redisBuildIdString(void);
+char *serverGitSHA1(void);
+char *serverGitDirty(void);
+uint64_t serverBuildId(void);
+const char *serverBuildIdRaw(void);
+char *serverBuildIdString(void);
 
 /* Commands prototypes */
 void authCommand(client *c);

src/tls.c

@@ -1176,7 +1176,7 @@ int RedisModule_OnLoad(void *ctx, RedisModuleString **argv, int argc) {
     UNUSED(argc);
 
     /* Connection modules must be part of the same build as redis. */
-    if (strcmp(REDIS_BUILD_ID_RAW, redisBuildIdRaw())) {
+    if (strcmp(REDIS_BUILD_ID_RAW, serverBuildIdRaw())) {
         serverLog(LL_NOTICE, "Connection type %s was not built together with the redis-server used.", CONN_TYPE_TLS);
         return REDISMODULE_ERR;
     }