Skip to content
Permalink
Browse files

Remove unused code in s_security.cpp (#4172)

Note that the macro CHECK_FILE_ERR implements the code removed
  • Loading branch information
Zeno- committed May 30, 2016
1 parent d499ec4 commit a9bc7dc405df04d5a3cb5fe5de43190200dc692d
Showing with 3 additions and 11 deletions.
  1. +3 −11 src/script/cpp_api/s_security.cpp
@@ -249,8 +249,8 @@ bool ScriptApiSecurity::isSecure(lua_State *L)

#define CHECK_FILE_ERR(ret, fp) \
if (ret) { \
if (fp) std::fclose(fp); \
lua_pushfstring(L, "%s: %s", path, strerror(errno)); \
if (fp) std::fclose(fp); \
return false; \
}

@@ -291,20 +291,12 @@ bool ScriptApiSecurity::safeLoadFile(lua_State *L, const char *path)
// Read the file
int ret = std::fseek(fp, 0, SEEK_END);
CHECK_FILE_ERR(ret, fp);
if (ret) {
std::fclose(fp);
lua_pushfstring(L, "%s: %s", path, strerror(errno));
return false;
}

size_t size = std::ftell(fp) - start;
char *code = new char[size];
ret = std::fseek(fp, start, SEEK_SET);
CHECK_FILE_ERR(ret, fp);
if (ret) {
std::fclose(fp);
lua_pushfstring(L, "%s: %s", path, strerror(errno));
return false;
}

size_t num_read = std::fread(code, 1, size, fp);
if (path) {
std::fclose(fp);

0 comments on commit a9bc7dc

Please sign in to comment.
You can’t perform that action at this time.