remove dependency on unspecified behavior

salikx · Mar 24, 2015 · a209691 · a209691
1 parent 051c35f
commit a209691
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/src/script.c b/src/script.c
@@ -22,9 +22,9 @@ static int script_thread_newindex(lua_State *);
 static int script_wrk_lookup(lua_State *);
 static int script_wrk_connect(lua_State *);
 
-static void set_fields(lua_State *, int index, const table_field *);
-static void set_string(lua_State *, int, char *, char *, size_t);
-static char *get_url_part(char *, struct http_parser_url *, enum http_parser_url_fields, size_t *);
+static void set_fields(lua_State *, int, const table_field *);
+static void set_field(lua_State *, int, char *, int);
+static int push_url_part(lua_State *, char *, struct http_parser_url *, enum http_parser_url_fields);
 
 static const struct luaL_reg addrlib[] = {
     { "__tostring", script_addr_tostring   },
@@ -60,7 +60,6 @@ lua_State *script_create(char *file, char *url, char **headers) {
     struct http_parser_url parts = {};
     script_parse_url(url, &parts);
     char *path = "/";
-    size_t len = 0;
 
     if (parts.field_set & (1 << UF_PATH)) {
         path = &url[parts.field_data[UF_PATH].off];
@@ -75,9 +74,9 @@ lua_State *script_create(char *file, char *url, char **headers) {
 
     lua_getglobal(L, "wrk");
 
-    set_string(L, 4, "scheme", get_url_part(url, &parts, UF_SCHEMA, &len), len);
-    set_string(L, 4, "host",   get_url_part(url, &parts, UF_HOST,   &len), len);
-    set_string(L, 4, "port",   get_url_part(url, &parts, UF_PORT,   &len), len);
+    set_field(L, 4, "scheme", push_url_part(L, url, &parts, UF_SCHEMA));
+    set_field(L, 4, "host",   push_url_part(L, url, &parts, UF_HOST));
+    set_field(L, 4, "port",   push_url_part(L, url, &parts, UF_PORT));
     set_fields(L, 4, fields);
 
     lua_getfield(L, 4, "headers");
@@ -502,20 +501,24 @@ int script_parse_url(char *url, struct http_parser_url *parts) {
     return 0;
 }
 
-static char *get_url_part(char *url, struct http_parser_url *parts, enum http_parser_url_fields field, size_t *len) {
-    char *value = NULL;
-    if (parts->field_set & (1 << field)) {
-        value = &url[parts->field_data[field].off];
-        *len  = parts->field_data[field].len;
+static int push_url_part(lua_State *L, char *url, struct http_parser_url *parts, enum http_parser_url_fields field) {
+    int type = parts->field_set & (1 << field) ? LUA_TSTRING : LUA_TNIL;
+    uint16_t off, len;
+    switch (type) {
+        case LUA_TSTRING:
+            off = parts->field_data[field].off;
+            len = parts->field_data[field].len;
+            lua_pushlstring(L, &url[off], len);
+            break;
+        case LUA_TNIL:
+            lua_pushnil(L);
     }
-    return value;
+    return type;
 }
 
-static void set_string(lua_State *L, int index, char *field, char *value, size_t len) {
-    if (value != NULL) {
-        lua_pushlstring(L, value, len);
-        lua_setfield(L, index, field);
-    }
+static void set_field(lua_State *L, int index, char *field, int type) {
+    (void) type;
+    lua_setfield(L, index, field);
 }
 
 static void set_fields(lua_State *L, int index, const table_field *fields) {