]> source.dussan.org Git - rspamd.git/commitdiff
Revert "[Fix] Fix compatibility with old maps query logic"
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 17 May 2018 11:52:09 +0000 (12:52 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 17 May 2018 11:52:09 +0000 (12:52 +0100)
This reverts commit d9a157872055ad382ee653fc864d85768fa989cc.

src/lua/lua_map.c

index fe8c264d2a9515496f21f3336f0f345a732b88cf..2d2a098d244ae5f3592606ee511fbded858f79b8 100644 (file)
@@ -697,20 +697,6 @@ lua_map_process_string_key (lua_State *L, gint pos, gsize *len)
        return NULL;
 }
 
-static inline void
-lua_push_map_str_elt (lua_State *L, const gchar *value, gint len)
-{
-       if (len == 0 || value[0] == '\0') {
-               lua_pushstring (L, "1"); /* Compatibility */
-       }
-       else if (len == -1) {
-               lua_pushstring (L, value); /* Zero terminated */
-       }
-       else {
-               lua_pushlstring (L, value, len);
-       }
-}
-
 /* Radix and hash table functions */
 static gint
 lua_map_get_key (lua_State * L)
@@ -785,7 +771,7 @@ lua_map_get_key (lua_State * L)
                        }
 
                        if (ret) {
-                               lua_push_map_str_elt (L, value, -1);
+                               lua_pushstring (L, value);
                                return 1;
                        }
                }
@@ -804,7 +790,7 @@ lua_map_get_key (lua_State * L)
                                                len);
 
                                if (value) {
-                                       lua_push_map_str_elt (L, value, -1);
+                                       lua_pushstring (L, value);
                                        return 1;
                                }
                        }
@@ -824,7 +810,7 @@ lua_map_get_key (lua_State * L)
                                        lua_createtable (L, ar->len, 0);
 
                                        PTR_ARRAY_FOREACH (ar, i, val) {
-                                               lua_push_map_str_elt (L, val, -1);
+                                               lua_pushstring (L, val);
                                                lua_rawseti (L, -2, i + 1);
                                        }
 
@@ -843,7 +829,7 @@ lua_map_get_key (lua_State * L)
                        }
 
                        if (value) {
-                               lua_push_map_str_elt (L, value, -1);
+                               lua_pushstring (L, value);
                                return 1;
                        }
                }