X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flua.c;h=45fd7d5a36fab1a76a8dd524ba56aad4ee0b0602;hb=604607d3463fbe13eac252308f8a2497fb190167;hp=3b8b3da075b56383ee4a02edd163a9e25f3220f7;hpb=e61b8a91ed7c21e01ff40006837d319eaeef24ab;p=collectd.git diff --git a/src/lua.c b/src/lua.c index 3b8b3da0..45fd7d5a 100644 --- a/src/lua.c +++ b/src/lua.c @@ -303,15 +303,13 @@ 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); + &(user_data_t) { + .data = cb, + }); if (status != 0) return luaL_error(L, "%s", "plugin_register_complex_read failed"); @@ -349,20 +347,18 @@ 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); + &(user_data_t) { + .data = cb, + }); if (status != 0) return luaL_error(L, "%s", "plugin_register_write failed"); return 0; } /* }}} int lua_cb_register_write */ -static luaL_Reg collectdlib[] = { +static const luaL_Reg collectdlib[] = { {"log_debug", lua_cb_log_debug}, {"log_error", lua_cb_log_error}, {"log_info", lua_cb_log_info}, @@ -547,7 +543,7 @@ static int lua_config_script(const oconfig_item_t *ci) /* {{{ */ if (status != 0) return (status); - INFO("Lua plugin: File \"%s\" loaded succesfully", abs_path); + INFO("Lua plugin: File \"%s\" loaded successfully", abs_path); return 0; } /* }}} int lua_config_script */ @@ -585,7 +581,7 @@ static int lua_shutdown(void) /* {{{ */ return (0); } /* }}} int lua_shutdown */ -void module_register() { +void module_register(void) { plugin_register_complex_config("lua", lua_config); plugin_register_shutdown("lua", lua_shutdown); }