Fixed some wording and comments

Signed-off-by: Madelyn Olson <[email protected]>
madolson · Apr 2, 2024 · a524520 · a524520
1 parent 597cac1
commit a524520
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/mkreleasehdr.sh b/src/mkreleasehdr.sh
@@ -12,5 +12,5 @@ echo "#define REDIS_GIT_SHA1 \"$GIT_SHA1\"" > release.h
 echo "#define REDIS_GIT_DIRTY \"$GIT_DIRTY\"" >> release.h
 echo "#define REDIS_BUILD_ID \"$BUILD_ID\"" >> release.h
 echo "#include \"version.h\"" >> release.h
-echo "#define REDIS_BUILD_ID_RAW SERVER_VERSION REDIS_BUILD_ID REDIS_GIT_DIRTY REDIS_GIT_SHA1" >> release.h
+echo "#define REDIS_BUILD_ID_RAW SERVER_NAME SERVER_VERSION REDIS_BUILD_ID REDIS_GIT_DIRTY REDIS_GIT_SHA1" >> release.h
 touch release.c # Force recompile of release.c
diff --git a/src/rdb.c b/src/rdb.c
@@ -1195,9 +1195,10 @@ int rdbSaveInfoAuxFields(rio *rdb, int rdbflags, rdbSaveInfo *rsi) {
     int aof_base = (rdbflags & RDBFLAGS_AOF_PREAMBLE) != 0;
 
     /* Add a few fields about the state when the RDB was created. */
-if (rdbSaveAuxFieldStrStr(rdb,"server-ver",SERVER_VERSION) == -1) return -1;
+    if (rdbSaveAuxFieldStrStr(rdb,"server-ver",SERVER_VERSION) == -1) return -1;
     /* Print Redis version for backwards compatibility with redis. */
-    if (rdbSaveAuxFieldStrStr(rdb,"redis-ver",SERVER_VERSION) == -1) return -1;    if (rdbSaveAuxFieldStrInt(rdb,"redis-bits",redis_bits) == -1) return -1;
+    if (rdbSaveAuxFieldStrStr(rdb,"redis-ver",REDIS_VERSION) == -1) return -1;
+    if (rdbSaveAuxFieldStrInt(rdb,"redis-bits",redis_bits) == -1) return -1;
     if (rdbSaveAuxFieldStrInt(rdb,"ctime",time(NULL)) == -1) return -1;
     if (rdbSaveAuxFieldStrInt(rdb,"used-mem",zmalloc_used_memory()) == -1) return -1;
 

diff --git a/src/script_lua.c b/src/script_lua.c
@@ -1383,7 +1383,7 @@ void luaSetTableProtectionRecursively(lua_State *lua) {
 }
 
 void luaRegisterVersion(lua_State* lua) {
-    /* For legacy compatibility reasons, also include Redis version. */
+    /* For legacy compatibility reasons include Redis versions. */
     lua_pushstring(lua,"REDIS_VERSION_NUM");
     lua_pushnumber(lua,REDIS_VERSION_NUM);
     lua_settable(lua,-3);

diff --git a/src/version.h b/src/version.h
@@ -3,6 +3,6 @@
 #define SERVER_VERSION_NUM 0x00ffffff
 
 /* Redis compatibility version, should never
-/* exceed 7.2.x. */
+ * exceed 7.2.x. */
 #define REDIS_VERSION "7.2.4"
 #define REDIS_VERSION_NUM 0x00070204