summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBinbin <binloveplay1314@qq.com>2022-07-19 13:59:39 +0800
committerGitHub <noreply@github.com>2022-07-19 08:59:39 +0300
commit95b88f672a54fc66d719c1385008ad8f8cc7d642 (patch)
treedd6c5337c1ea45afc45d9c631d9e4b9aa1475376 /src
parent5ce64ab01011781c426074f3fa7398260cce94cc (diff)
downloadredis-95b88f672a54fc66d719c1385008ad8f8cc7d642.tar.gz
Set RM_StringCompare input args as const (#11010)
Following #10996, it forgot to modify RM_StringCompare in module.c Modified RM_StringCompare, compareStringObjectsWithFlags, compareStringObjects and collateStringObjects.
Diffstat (limited to 'src')
-rw-r--r--src/module.c2
-rw-r--r--src/object.c6
-rw-r--r--src/server.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/module.c b/src/module.c
index 8e14f7c5d..b57032c8d 100644
--- a/src/module.c
+++ b/src/module.c
@@ -2576,7 +2576,7 @@ int RM_StringToStreamID(const RedisModuleString *str, RedisModuleStreamID *id) {
/* Compare two string objects, returning -1, 0 or 1 respectively if
* a < b, a == b, a > b. Strings are compared byte by byte as two
* binary blobs without any encoding care / collation attempt. */
-int RM_StringCompare(RedisModuleString *a, RedisModuleString *b) {
+int RM_StringCompare(const RedisModuleString *a, const RedisModuleString *b) {
return compareStringObjects(a,b);
}
diff --git a/src/object.c b/src/object.c
index 84a9e3afc..0f36f8f8c 100644
--- a/src/object.c
+++ b/src/object.c
@@ -710,7 +710,7 @@ robj *getDecodedObject(robj *o) {
#define REDIS_COMPARE_BINARY (1<<0)
#define REDIS_COMPARE_COLL (1<<1)
-int compareStringObjectsWithFlags(robj *a, robj *b, int flags) {
+int compareStringObjectsWithFlags(const robj *a, const robj *b, int flags) {
serverAssertWithInfo(NULL,a,a->type == OBJ_STRING && b->type == OBJ_STRING);
char bufa[128], bufb[128], *astr, *bstr;
size_t alen, blen, minlen;
@@ -743,12 +743,12 @@ int compareStringObjectsWithFlags(robj *a, robj *b, int flags) {
}
/* Wrapper for compareStringObjectsWithFlags() using binary comparison. */
-int compareStringObjects(robj *a, robj *b) {
+int compareStringObjects(const robj *a, const robj *b) {
return compareStringObjectsWithFlags(a,b,REDIS_COMPARE_BINARY);
}
/* Wrapper for compareStringObjectsWithFlags() using collation. */
-int collateStringObjects(robj *a, robj *b) {
+int collateStringObjects(const robj *a, const robj *b) {
return compareStringObjectsWithFlags(a,b,REDIS_COMPARE_COLL);
}
diff --git a/src/server.h b/src/server.h
index f33eaa5ce..91fcbb29d 100644
--- a/src/server.h
+++ b/src/server.h
@@ -2650,8 +2650,8 @@ int getLongDoubleFromObject(robj *o, long double *target);
int getLongDoubleFromObjectOrReply(client *c, robj *o, long double *target, const char *msg);
int getIntFromObjectOrReply(client *c, robj *o, int *target, const char *msg);
char *strEncoding(int encoding);
-int compareStringObjects(robj *a, robj *b);
-int collateStringObjects(robj *a, robj *b);
+int compareStringObjects(const robj *a, const robj *b);
+int collateStringObjects(const robj *a, const robj *b);
int equalStringObjects(robj *a, robj *b);
unsigned long long estimateObjectIdleTime(robj *o);
void trimStringObjectIfNeeded(robj *o);