Merge pull request #44 from daTokenizer/patch-1

gkorland · web-flow · commit 0c75ce53d698 · 2020-03-18T13:31:34.000+02:00
add Null reply assertion macro to rm_utils (RMUtil_AssertNullReply)
diff --git a/rmutil/test_util.h b/rmutil/test_util.h
@@ -19,6 +19,9 @@
                 
 #define RMUtil_Assert(expr) if (!(expr)) { fprintf (stderr, "Assertion '%s' Failed\n", __STRING(expr)); return REDISMODULE_ERR; }
 
+#define RMUtil_AssertNullReply(rep) RMUtil_Assert( \
+            RedisModule_CallReplyType(rep) == REDISMODULE_REPLY_NULL || RedisModule_CreateStringFromCallReply(rep) == NULL)
+
 #define RMUtil_AssertReplyEquals(rep, cstr) RMUtil_Assert( \
             RMUtil_StringEquals(RedisModule_CreateStringFromCallReply(rep), RedisModule_CreateString(ctx, cstr, strlen(cstr))) \
             )
@@ -64,4 +67,4 @@ RedisModuleString **RMUtil_MakeArgs(RedisModuleCtx *ctx, int *argcp, const char
     return NULL;
 }
 
-#endif
+#endif

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@`
`19`	`19`
`20`	`20`	`#define RMUtil_Assert(expr) if (!(expr)) { fprintf (stderr, "Assertion '%s' Failed\n", __STRING(expr)); return REDISMODULE_ERR; }`
`21`	`21`
	`22`	`+#define RMUtil_AssertNullReply(rep) RMUtil_Assert( \`
	`23`	`+ RedisModule_CallReplyType(rep) == REDISMODULE_REPLY_NULL \|\| RedisModule_CreateStringFromCallReply(rep) == NULL)`
	`24`	`+`
`22`	`25`	`#define RMUtil_AssertReplyEquals(rep, cstr) RMUtil_Assert( \`
`23`	`26`	`RMUtil_StringEquals(RedisModule_CreateStringFromCallReply(rep), RedisModule_CreateString(ctx, cstr, strlen(cstr))) \`
`24`	`27`	`)`
`@@ -64,4 +67,4 @@ RedisModuleString *RMUtil_MakeArgs(RedisModuleCtx ctx, int *argcp, const char`
`64`	`67`	`return NULL;`
`65`	`68`	`}`
`66`	`69`
`67`		`-#endif`
	`70`	`+#endif`