c/civetweb
1
0
Fork 0
mirror of https://github.com/civetweb/civetweb synced 2025-03-28 21:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Declare all variables at begin of the block, to comply with old C standards.

Browse Source
This commit is contained in:
bel2125 2018-03-24 11:05:55 +01:00
parent d01c6b5b98
commit 08e7ad7c76
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/civetweb.c
View File

@ -13969,9 +13969,11 @@ is_ssl_port_used(const char *ports)
* So, for now, we use this simple algorithm, that may still return
* a false positive in bizarre cases.
*/
int i;
int portslen = (int)strlen(ports);
char prevIsNumber = 0;
for (int i = 0; i < portslen; i++) {
for (i = 0; i < portslen; i++) {
if (prevIsNumber && (ports[i] == 's' || ports[i] == 'r')) {
return 1;
}
@ -18796,6 +18798,13 @@ mg_get_context_info_impl(const struct mg_context *ctx, char *buffer, int buflen)
}
if (ctx) {
/* Declare all variables at begin of the block, to comply
* with old C standards. */
char start_time_str[64] = {0};
char now_str[64] = {0};
time_t start_time = ctx->start_time;
time_t now = time(NULL);
/* Connections information */
mg_snprintf(NULL,
NULL,
@ -18860,11 +18869,6 @@ mg_get_context_info_impl(const struct mg_context *ctx, char *buffer, int buflen)
}
/* Execution time information */
char start_time_str[64] = {0};
char now_str[64] = {0};
time_t start_time = ctx->start_time;
time_t now = time(NULL);
gmt_time_string(start_time_str,
sizeof(start_time_str) - 1,
&start_time);

4
test/websocket.lua
View File

@ -96,8 +96,8 @@ function senddata()
mg.write("text", string.format("%u:%02u:%02u", date.hour, date.min, date.sec));
if (hand ~= lasthand) then
mg.write(1, string.format("-->h %u", hand*360/(12*60)));
mg.write( string.format("-->m %u", date.min*360/60));
mg.write(1, string.format("-->h %f", hand*360/(12*60)));
mg.write( string.format("-->m %f", date.min*360/60));
lasthand = hand;
end