Unverified Commit 95b88f67 authored by Binbin's avatar Binbin Committed by GitHub
Browse files

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.
parent 5ce64ab0
...@@ -2576,7 +2576,7 @@ int RM_StringToStreamID(const RedisModuleString *str, RedisModuleStreamID *id) { ...@@ -2576,7 +2576,7 @@ int RM_StringToStreamID(const RedisModuleString *str, RedisModuleStreamID *id) {
/* Compare two string objects, returning -1, 0 or 1 respectively if /* 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 * a < b, a == b, a > b. Strings are compared byte by byte as two
* binary blobs without any encoding care / collation attempt. */ * 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); return compareStringObjects(a,b);
} }
......
...@@ -710,7 +710,7 @@ robj *getDecodedObject(robj *o) { ...@@ -710,7 +710,7 @@ robj *getDecodedObject(robj *o) {
#define REDIS_COMPARE_BINARY (1<<0) #define REDIS_COMPARE_BINARY (1<<0)
#define REDIS_COMPARE_COLL (1<<1) #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); serverAssertWithInfo(NULL,a,a->type == OBJ_STRING && b->type == OBJ_STRING);
char bufa[128], bufb[128], *astr, *bstr; char bufa[128], bufb[128], *astr, *bstr;
size_t alen, blen, minlen; size_t alen, blen, minlen;
...@@ -743,12 +743,12 @@ int compareStringObjectsWithFlags(robj *a, robj *b, int flags) { ...@@ -743,12 +743,12 @@ int compareStringObjectsWithFlags(robj *a, robj *b, int flags) {
} }
/* Wrapper for compareStringObjectsWithFlags() using binary comparison. */ /* 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); return compareStringObjectsWithFlags(a,b,REDIS_COMPARE_BINARY);
} }
/* Wrapper for compareStringObjectsWithFlags() using collation. */ /* 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); return compareStringObjectsWithFlags(a,b,REDIS_COMPARE_COLL);
} }
......
...@@ -2650,8 +2650,8 @@ int getLongDoubleFromObject(robj *o, long double *target); ...@@ -2650,8 +2650,8 @@ int getLongDoubleFromObject(robj *o, long double *target);
int getLongDoubleFromObjectOrReply(client *c, robj *o, long double *target, const char *msg); int getLongDoubleFromObjectOrReply(client *c, robj *o, long double *target, const char *msg);
int getIntFromObjectOrReply(client *c, robj *o, int *target, const char *msg); int getIntFromObjectOrReply(client *c, robj *o, int *target, const char *msg);
char *strEncoding(int encoding); char *strEncoding(int encoding);
int compareStringObjects(robj *a, robj *b); int compareStringObjects(const robj *a, const robj *b);
int collateStringObjects(robj *a, robj *b); int collateStringObjects(const robj *a, const robj *b);
int equalStringObjects(robj *a, robj *b); int equalStringObjects(robj *a, robj *b);
unsigned long long estimateObjectIdleTime(robj *o); unsigned long long estimateObjectIdleTime(robj *o);
void trimStringObjectIfNeeded(robj *o); void trimStringObjectIfNeeded(robj *o);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment