1
0
mirror of https://github.com/fluencelabs/redis synced 2025-06-30 17:31:33 +00:00

Merge branch 'unstable' of github.com:/antirez/redis into unstable

This commit is contained in:
antirez
2016-06-23 16:18:57 +02:00
5 changed files with 26 additions and 2 deletions

@ -687,6 +687,17 @@ RedisModuleString *RM_CreateStringFromLongLong(RedisModuleCtx *ctx, long long ll
return RM_CreateString(ctx,buf,len);
}
/* Like RedisModule_CreatString(), but creates a string starting from another
* RedisModuleString.
*
* The returned string must be released with RedisModule_FreeString() or by
* enabling automatic memory management. */
RedisModuleString *RM_CreateStringFromString(RedisModuleCtx *ctx, const RedisModuleString *str) {
RedisModuleString *o = dupStringObject(str);
autoMemoryAdd(ctx,REDISMODULE_AM_STRING,o);
return o;
}
/* Free a module string object obtained with one of the Redis modules API calls
* that return new string objects.
*
@ -2887,6 +2898,7 @@ void moduleRegisterCoreAPI(void) {
REGISTER_API(CreateStringFromCallReply);
REGISTER_API(CreateString);
REGISTER_API(CreateStringFromLongLong);
REGISTER_API(CreateStringFromString);
REGISTER_API(FreeString);
REGISTER_API(StringPtrLen);
REGISTER_API(AutoMemory);