From 38a1214af1c2dbe2e57e96451a10f9c058fa3f20 Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Sun, 29 Jan 2017 21:04:50 +0100 Subject: Use readdir instead of readdir_r To eliminate compiler warnings, we're single-threaded anyway. --- plugins/lua-loader.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'plugins') diff --git a/plugins/lua-loader.c b/plugins/lua-loader.c index 8fa1875..725ba06 100644 --- a/plugins/lua-loader.c +++ b/plugins/lua-loader.c @@ -424,20 +424,9 @@ initialize (void *ctx, struct plugin_api *api) lua_setfield (L, -2, "__index"); luaL_setfuncs (L, xlua_unit_table, 0); - struct dirent buf, *iter; - while (true) + struct dirent *iter; + while ((errno = 0, iter = readdir (dir))) { - if (readdir_r (dir, &buf, &iter)) - { - print_fatal ("%s: %s: %s", "Lua", "readdir_r", strerror (errno)); - break; - } - if (!iter) - { - success = true; - break; - } - char *dot = strrchr (iter->d_name, '.'); if (!dot || strcmp (dot, ".lua")) continue; @@ -446,6 +435,10 @@ initialize (void *ctx, struct plugin_api *api) (void) load_one_plugin (L, iter->d_name, path); free (path); } + if (errno) + print_fatal ("%s: %s: %s", "Lua", "readdir", strerror (errno)); + else + success = true; end: closedir (dir); -- cgit v1.2.3-70-g09d2