lib: Wrapper a function to make gcc-10 happy

gcc-10 is complaining:

lib/frrscript.c:42:14: error: cast between incompatible function types from ‘const char * (*)(lua_State *, const char *)’ to ‘void (*)(lua_State *, const void *)’ [-Werror=cast-function-type]
   42 |   .encoder = (encoder_func)lua_pushstring,
      |              ^

Wrapper it to make it happy.  Not sure what else to do.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/lib/frrlua.h b/lib/frrlua.h
index 8e52931e503ab5c6f457ff1823ba119daefa544b..6fb30938b061d5bedd4cc5328cd90f850bb68f72 100644 (file)
--- a/lib/frrlua.h
+++ b/lib/frrlua.h
@@ -34,6 +34,17 @@
 extern "C" {
 #endif
 
+/*
+ * gcc-10 is complaining about the wrapper function
+ * not being compatible with lua_pushstring returning
+ * a char *.  Let's wrapper it here to make our life
+ * easier
+ */
+static inline void lua_pushstring_wrapper(lua_State *L, const char *str)
+{
+       (void)lua_pushstring(L, str);
+}
+
 /*
  * Converts a prefix to a Lua value and pushes it on the stack.
  */

diff --git a/lib/frrscript.c b/lib/frrscript.c
index a43f389f99760ce46caf90fa23bb58b20b309784..10d400886d835de6e55b5d8459d76b5c1e1527d1 100644 (file)
--- a/lib/frrscript.c
+++ b/lib/frrscript.c
@@ -39,7 +39,7 @@ struct frrscript_codec frrscript_codecs_lib[] = {
         .encoder = (encoder_func)lua_pushintegerp,
         .decoder = lua_tointegerp},
        {.typename = "string",
-        .encoder = (encoder_func)lua_pushstring,
+        .encoder = (encoder_func)lua_pushstring_wrapper,
         .decoder = lua_tostringp},
        {.typename = "prefix",
         .encoder = (encoder_func)lua_pushprefix,