Browse Source

Merge pull request #578 from colmartofus/lua-casts

Add lua casts for clang++.
bel2125 7 years ago
parent
commit
4b27ac2f51
2 changed files with 5 additions and 5 deletions
  1. 1 1
      src/civetweb.c
  2. 4 4
      src/mod_lua.inl

+ 1 - 1
src/civetweb.c

@@ -17493,7 +17493,7 @@ mg_start(const struct mg_callbacks *callbacks,
 		struct vec opt_vec;
 		struct vec eq_vec;
 		const char *sparams;
-		lua_State *state = (void *)mg_prepare_lua_context_script(
+		lua_State *state = mg_prepare_lua_context_script(
 		    ctx->dd.config[LUA_BACKGROUND_SCRIPT], ctx, ebuf, sizeof(ebuf));
 		if (!state) {
 			mg_cry_internal(fc(ctx), "lua_background_script error: %s", ebuf);

+ 4 - 4
src/mod_lua.inl

@@ -1119,7 +1119,7 @@ lsp_get_info(lua_State *L)
 				/* Get system info */
 				len = mg_get_system_info(NULL, 0);
 				if (len > 0) {
-					buf = mg_malloc(len + 64);
+					buf = (char *)mg_malloc(len + 64);
 					if (!buf) {
 						return luaL_error(L, "OOM in get_info() call");
 					}
@@ -1141,7 +1141,7 @@ lsp_get_info(lua_State *L)
 				/* Get context info for server context */
 				len = mg_get_context_info(ctx, NULL, 0);
 				if (len > 0) {
-					buf = mg_malloc(len + 64);
+					buf = (char *)mg_malloc(len + 64);
 					if (!buf) {
 						return luaL_error(L, "OOM in get_info() call");
 					}
@@ -1157,7 +1157,7 @@ lsp_get_info(lua_State *L)
 				/* Get context info for NULL context */
 				len = mg_get_context_info(NULL, NULL, 0);
 				if (len > 0) {
-					buf = mg_malloc(len + 64);
+					buf = (char *)mg_malloc(len + 64);
 					if (!buf) {
 						return luaL_error(L, "OOM in get_info() call");
 					}
@@ -1199,7 +1199,7 @@ lsp_get_info(lua_State *L)
 #ifdef MG_EXPERIMENTAL_INTERFACES
 				len = mg_get_connection_info(ctx, idx, NULL, 0);
 				if (len > 0) {
-					buf = mg_malloc(len + 64);
+					buf = (char *)mg_malloc(len + 64);
 					if (!buf) {
 						return luaL_error(L, "OOM in get_info() call");
 					}