Просмотр исходного кода

Merge pull request #541 from xtne6f/pr-c89

Restore C89/C90 compliance
bel2125 7 лет назад
Родитель
Сommit
e753611a88
2 измененных файлов с 6 добавлено и 4 удалено
  1. 4 3
      src/civetweb.c
  2. 2 1
      src/mod_lua.inl

+ 4 - 3
src/civetweb.c

@@ -17043,6 +17043,9 @@ mg_start(const struct mg_callbacks *callbacks,
 	/* If a Lua background script has been configured, start it. */
 	if (ctx->config[LUA_BACKGROUND_SCRIPT] != NULL) {
 		char ebuf[256];
+		struct vec opt_vec;
+		struct vec eq_vec;
+		const char *sparams;
 		lua_State *state = (void *)mg_prepare_lua_context_script(
 		    ctx->config[LUA_BACKGROUND_SCRIPT], ctx, ebuf, sizeof(ebuf));
 		if (!state) {
@@ -17056,9 +17059,7 @@ mg_start(const struct mg_callbacks *callbacks,
 		lua_newtable(state);
 		reg_boolean(state, "shutdown", 0);
 
-		struct vec opt_vec;
-		struct vec eq_vec;
-		const char *sparams = ctx->config[LUA_BACKGROUND_SCRIPT_PARAMS];
+		sparams = ctx->config[LUA_BACKGROUND_SCRIPT_PARAMS];
 
 		while ((sparams = next_option(sparams, &opt_vec, &eq_vec)) != NULL) {
 			reg_llstring(

+ 2 - 1
src/mod_lua.inl

@@ -1178,6 +1178,7 @@ lsp_get_info(lua_State *L)
 
 			/* Get info according to argument */
 			if (!mg_strcasecmp(arg1, "connection")) {
+				int idx;
 
 				/* Get context */
 				struct mg_context *ctx;
@@ -1186,7 +1187,7 @@ lsp_get_info(lua_State *L)
 				ctx = (struct mg_context *)lua_touserdata(L, -1);
 
 				/* Get connection info for connection idx */
-				int idx = (int)(arg2 + 0.5);
+				idx = (int)(arg2 + 0.5);
 
 				/* Lua uses 1 based index, C uses 0 based index */
 				idx--;