Merge pull request #2041 from mfournier/contrib-docker

[collectd.git] / src / lua.c

diff --git a/src/lua.c b/src/lua.c
index 351b8c6..2bd56a1 100644 (file)
--- a/src/lua.c
+++ b/src/lua.c
@@ -32,15 +32,15 @@
  * GCC will complain about the macro definition. */
 #define DONT_POISON_SPRINTF_YET
 
-#include "collectd.h"
 #include "common.h"
 #include "plugin.h"
+#include "collectd.h"
 
 /* Include the Lua API header files. */
-#include "utils_lua.h"
 #include <lauxlib.h>
 #include <lua.h>
 #include <lualib.h>
+#include "utils_lua.h"
 
 #include <pthread.h>
 
@@ -303,15 +303,12 @@ static int lua_cb_register_read(lua_State *L) /* {{{ */
   cb->lua_function_name = strdup(function_name);
   pthread_mutex_init(&cb->lock, NULL);
 
-  user_data_t ud = {
-    .data = cb
-  };
-
   int status = plugin_register_complex_read(/* group = */ "lua",
                                             /* name      = */ function_name,
                                             /* callback  = */ clua_read,
-                                            /* interval  = */ 0,
-                                            /* user_data = */ &ud);
+                                            /* interval  = */ 0, &(user_data_t){
+                                                                     .data = cb,
+                                                                 });
 
   if (status != 0)
     return luaL_error(L, "%s", "plugin_register_complex_read failed");
@@ -349,13 +346,11 @@ static int lua_cb_register_write(lua_State *L) /* {{{ */
   cb->lua_function_name = strdup(function_name);
   pthread_mutex_init(&cb->lock, NULL);
 
-  user_data_t ud = {
-    .data = cb
-  };
-
-  int status = plugin_register_write(/* name = */ function_name,
-                                    /* callback  = */ clua_write,
-                                    /* user_data = */ &ud);
+  int status =
+      plugin_register_write(/* name = */ function_name,
+                            /* callback  = */ clua_write, &(user_data_t){
+                                                              .data = cb,
+                                                          });
 
   if (status != 0)
     return luaL_error(L, "%s", "plugin_register_write failed");
@@ -371,8 +366,7 @@ static const luaL_Reg collectdlib[] = {
     {"dispatch_values", lua_cb_dispatch_values},
     {"register_read", lua_cb_register_read},
     {"register_write", lua_cb_register_write},
-    {NULL, NULL}
-};
+    {NULL, NULL}};
 
 static int open_collectd(lua_State *L) /* {{{ */
 {
@@ -416,7 +410,7 @@ static int lua_script_init(lua_script_t *script) /* {{{ */
   /* Open up all the standard Lua libraries. */
   luaL_openlibs(script->lua_state);
 
-  /* Load the 'collectd' library */
+/* Load the 'collectd' library */
 #if LUA_VERSION_NUM < 502
   lua_pushcfunction(script->lua_state, open_collectd);
   lua_pushstring(script->lua_state, "collectd");