projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2807 from sileht/master
[collectd.git]
/
src
/
lua.c
diff --git
a/src/lua.c
b/src/lua.c
index
aeaeff2
..
f66d852
100644
(file)
--- a/
src/lua.c
+++ b/
src/lua.c
@@
-28,27
+28,18
@@
* Ruben Kerkhof <ruben at rubenkerkhof.com>
**/
* Ruben Kerkhof <ruben at rubenkerkhof.com>
**/
-/* <lua5.1/luaconf.h> defines a macro using "sprintf". Although not used here,
- * GCC will complain about the macro definition. */
-#define DONT_POISON_SPRINTF_YET
-
+#include "collectd.h"
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include "
collectd
.h"
+#include "
utils_lua
.h"
/* Include the Lua API header files. */
#include <lauxlib.h>
#include <lua.h>
#include <lualib.h>
/* Include the Lua API header files. */
#include <lauxlib.h>
#include <lua.h>
#include <lualib.h>
-#include "utils_lua.h"
#include <pthread.h>
#include <pthread.h>
-#if COLLECT_DEBUG && __GNUC__
-#undef sprintf
-#pragma GCC poison sprintf
-#endif
-
typedef struct lua_script_s {
char *script_path;
lua_State *lua_state;
typedef struct lua_script_s {
char *script_path;
lua_State *lua_state;
@@
-282,7
+273,7
@@
static int lua_cb_register_read(lua_State *L) /* {{{ */
luaL_checktype(L, 1, LUA_TFUNCTION);
char function_name[DATA_MAX_NAME_LEN];
luaL_checktype(L, 1, LUA_TFUNCTION);
char function_name[DATA_MAX_NAME_LEN];
- s
s
nprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1));
+ snprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1));
int callback_id = clua_store_callback(L, 1);
if (callback_id < 0)
int callback_id = clua_store_callback(L, 1);
if (callback_id < 0)
@@
-306,9
+297,10
@@
static int lua_cb_register_read(lua_State *L) /* {{{ */
int status = plugin_register_complex_read(/* group = */ "lua",
/* name = */ function_name,
/* callback = */ clua_read,
int status = plugin_register_complex_read(/* group = */ "lua",
/* name = */ function_name,
/* callback = */ clua_read,
- /* interval = */ 0, &(user_data_t){
- .data = cb,
- });
+ /* interval = */ 0,
+ &(user_data_t){
+ .data = cb,
+ });
if (status != 0)
return luaL_error(L, "%s", "plugin_register_complex_read failed");
if (status != 0)
return luaL_error(L, "%s", "plugin_register_complex_read failed");
@@
-325,7
+317,7
@@
static int lua_cb_register_write(lua_State *L) /* {{{ */
luaL_checktype(L, 1, LUA_TFUNCTION);
char function_name[DATA_MAX_NAME_LEN] = "";
luaL_checktype(L, 1, LUA_TFUNCTION);
char function_name[DATA_MAX_NAME_LEN] = "";
- s
s
nprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1));
+ snprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1));
int callback_id = clua_store_callback(L, 1);
if (callback_id < 0)
int callback_id = clua_store_callback(L, 1);
if (callback_id < 0)
@@
-346,11
+338,11
@@
static int lua_cb_register_write(lua_State *L) /* {{{ */
cb->lua_function_name = strdup(function_name);
pthread_mutex_init(&cb->lock, NULL);
cb->lua_function_name = strdup(function_name);
pthread_mutex_init(&cb->lock, NULL);
- int status =
-
plugin_register_write(/* name = */ function_nam
e,
-
/* callback = */ clua_write,
&(user_data_t){
-
.data = cb,
-
});
+ int status =
plugin_register_write(/* name = */ function_name,
+
/* callback = */ clua_writ
e,
+
&(user_data_t){
+ .data = cb,
+ });
if (status != 0)
return luaL_error(L, "%s", "plugin_register_write failed");
if (status != 0)
return luaL_error(L, "%s", "plugin_register_write failed");
@@
-533,7
+525,7
@@
static int lua_config_script(const oconfig_item_t *ci) /* {{{ */
if (base_path[0] == '\0')
sstrncpy(abs_path, rel_path, sizeof(abs_path));
else
if (base_path[0] == '\0')
sstrncpy(abs_path, rel_path, sizeof(abs_path));
else
- s
s
nprintf(abs_path, sizeof(abs_path), "%s/%s", base_path, rel_path);
+ snprintf(abs_path, sizeof(abs_path), "%s/%s", base_path, rel_path);
DEBUG("Lua plugin: abs_path = \"%s\";", abs_path);
DEBUG("Lua plugin: abs_path = \"%s\";", abs_path);