Style fixes

Author: mmd-osm

src/output-flex.cpp

@@ -983,28 +983,32 @@ void output_flex_t::add_row(table_connection_t *table_connection,
     }
 }
 
-static int msghandler (lua_State *L)
+static int msghandler(lua_State *lua_state)
 {
-    const char *msg = lua_tostring(L, 1);
-    if (msg == NULL) {                           /* is error object not a string? */
-        if (luaL_callmeta(L, 1, "__tostring") && /* does it have a metamethod */
-            lua_type(L, -1) == LUA_TSTRING)      /* that produces a string? */
-            return 1;                            /* that is the message */
-        else
-            msg = lua_pushfstring(L, "(error object is a %s value)",
-                                     luaL_typename(L, 1));
-    }
-    luaL_traceback(L, L, msg, 1);                /* append a standard traceback */
-    return 1;                                    /* return the traceback */
+    assert(lua_state);
+
+    char const *msg = lua_tostring(lua_state, 1);
+    if (msg == nullptr) {                                // is error object not a string?
+        if (luaL_callmeta(lua_state, 1, "__tostring") && // does it have a metamethod
+            lua_type(lua_state, -1) == LUA_TSTRING) {    // that produces a string?
+            return 1;                                    // that is the message
+        }
+        else {
+            msg = lua_pushfstring(lua_state, "(error object is a %s value)",
+                                  luaL_typename(lua_state, 1));
+        }
+    }
+    luaL_traceback(lua_state, lua_state, msg, 1); // append a standard traceback
+    return 1;                                     // return the traceback
 }
 
-static int docall (lua_State *L, int narg, int nres) {
-    int status;
-    int base = lua_gettop(L) - narg;       /* function index */
-    lua_pushcfunction(L, msghandler);      /* push message handler */
-    lua_insert(L, base);                   /* put it under function and args */
-    status = lua_pcall(L, narg, nres, base);
-    lua_remove(L, base);                   /* remove message handler from the stack */
+int output_flex_t::do_pcall(int narg, int nres)
+{
+    int const base = lua_gettop(lua_state()) - narg; // function index
+    lua_pushcfunction(lua_state(), msghandler);      // push message handler
+    lua_insert(lua_state(), base);                   // put it under function and args
+    int status = lua_pcall(lua_state(), narg, nres, base);
+    lua_remove(lua_state(), base);                   // remove message handler from the stack
     return status;
 }
 
@@ -1021,7 +1025,7 @@ void output_flex_t::call_process_function(int index,
         get_options()->extra_attributes); // the single argument
 
     luaX_set_context(lua_state(), this);
-    if (docall(lua_state(), 1, 0)) {
+    if (do_pcall(1, 0)) {
         throw std::runtime_error{"Failed to execute lua processing function:"
                                  " {}"_format(lua_tostring(lua_state(), -1))};
     }

src/output-flex.hpp

@@ -100,6 +100,7 @@ class output_flex_t : public output_t
     void init_clone();
 
     void call_process_function(int index, osmium::OSMObject const &object);
+    int do_pcall(int narg, int nres);
 
     void init_lua(std::string const &filename);