mirror of
https://github.com/curl/curl.git
synced 2026-07-26 06:57:16 +03:00
lib/src: white space edits to comply better with code style
... as checksrc now finds and complains about these. Closes #14921
This commit is contained in:
Daniel Stenberg
parent
a57b45c386
commit
fbf5d507ce
128 changed files with 854 additions and 837 deletions
|
|
@ -192,7 +192,7 @@ static void loghex(unsigned char *buffer, ssize_t len)
|
|||
ssize_t width = 0;
|
||||
int left = sizeof(data);
|
||||
|
||||
for(i = 0; i<len && (left >= 0); i++) {
|
||||
for(i = 0; i < len && (left >= 0); i++) {
|
||||
msnprintf(optr, left, "%02x", ptr[i]);
|
||||
width += 2;
|
||||
optr += 2;
|
||||
|
|
@ -218,15 +218,14 @@ static void logprotocol(mqttdir dir,
|
|||
char *optr = data;
|
||||
int left = sizeof(data);
|
||||
|
||||
for(i = 0; i<len && (left >= 0); i++) {
|
||||
for(i = 0; i < len && (left >= 0); i++) {
|
||||
msnprintf(optr, left, "%02x", ptr[i]);
|
||||
optr += 2;
|
||||
left -= 2;
|
||||
}
|
||||
fprintf(output, "%s %s %zx %s\n",
|
||||
dir == FROM_CLIENT? "client": "server",
|
||||
prefix, remlen,
|
||||
data);
|
||||
dir == FROM_CLIENT ? "client" : "server",
|
||||
prefix, remlen, data);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -931,7 +930,7 @@ int main(int argc, char *argv[])
|
|||
int error;
|
||||
int arg = 1;
|
||||
|
||||
while(argc>arg) {
|
||||
while(argc > arg) {
|
||||
if(!strcmp("--version", argv[arg])) {
|
||||
printf("mqttd IPv4%s\n",
|
||||
#ifdef USE_IPV6
|
||||
|
|
@ -944,27 +943,27 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--pidfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
pidname = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--portfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
portname = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--config", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
configfile = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--logfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
serverlogfile = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--logdir", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
logdir = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--ipv6", argv[arg])) {
|
||||
|
|
@ -984,7 +983,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--port", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
char *endptr;
|
||||
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
|
||||
if((endptr != argv[arg] + strlen(argv[arg])) ||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ int main(int argc, char *argv[])
|
|||
const char *host = NULL;
|
||||
int rc = 0;
|
||||
|
||||
while(argc>arg) {
|
||||
while(argc > arg) {
|
||||
if(!strcmp("--version", argv[arg])) {
|
||||
printf("resolve IPv4%s\n",
|
||||
#if defined(CURLRES_IPV6)
|
||||
|
|
|
|||
|
|
@ -953,7 +953,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
|
|||
|
||||
count -= written;
|
||||
buffer += written;
|
||||
} while(count>0);
|
||||
} while(count > 0);
|
||||
|
||||
/* Send out any RTP data */
|
||||
if(req->rtp_buffer) {
|
||||
|
|
@ -1066,7 +1066,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
memset(&req, 0, sizeof(req));
|
||||
|
||||
while(argc>arg) {
|
||||
while(argc > arg) {
|
||||
if(!strcmp("--version", argv[arg])) {
|
||||
printf("rtspd IPv4%s"
|
||||
"\n"
|
||||
|
|
@ -1081,22 +1081,22 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--pidfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
pidname = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--portfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
portname = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--logfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
serverlogfile = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--logdir", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
logdir = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--ipv4", argv[arg])) {
|
||||
|
|
@ -1115,7 +1115,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--port", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
char *endptr;
|
||||
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
|
||||
port = curlx_ultous(ulnum);
|
||||
|
|
@ -1124,7 +1124,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--srcdir", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
path = argv[arg];
|
||||
arg++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -362,7 +362,7 @@ static void lograw(unsigned char *buffer, ssize_t len)
|
|||
ssize_t width = 0;
|
||||
int left = sizeof(data);
|
||||
|
||||
for(i = 0; i<len; i++) {
|
||||
for(i = 0; i < len; i++) {
|
||||
switch(ptr[i]) {
|
||||
case '\n':
|
||||
msnprintf(optr, left, "\\n");
|
||||
|
|
@ -378,14 +378,14 @@ static void lograw(unsigned char *buffer, ssize_t len)
|
|||
break;
|
||||
default:
|
||||
msnprintf(optr, left, "%c", (ISGRAPH(ptr[i]) ||
|
||||
ptr[i] == 0x20) ?ptr[i]:'.');
|
||||
ptr[i] == 0x20) ? ptr[i] : '.');
|
||||
width++;
|
||||
optr++;
|
||||
left--;
|
||||
break;
|
||||
}
|
||||
|
||||
if(width>60) {
|
||||
if(width > 60) {
|
||||
logmsg("'%s'", data);
|
||||
width = 0;
|
||||
optr = data;
|
||||
|
|
@ -1366,7 +1366,7 @@ int main(int argc, char *argv[])
|
|||
enum sockmode mode = PASSIVE_LISTEN; /* default */
|
||||
const char *addr = NULL;
|
||||
|
||||
while(argc>arg) {
|
||||
while(argc > arg) {
|
||||
if(!strcmp("--version", argv[arg])) {
|
||||
printf("sockfilt IPv4%s\n",
|
||||
#ifdef USE_IPV6
|
||||
|
|
@ -1383,7 +1383,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--pidfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
pidname = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--portfile", argv[arg])) {
|
||||
|
|
@ -1393,7 +1393,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--logfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
serverlogfile = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--ipv6", argv[arg])) {
|
||||
|
|
@ -1417,7 +1417,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--port", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
char *endptr;
|
||||
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
|
||||
port = curlx_ultous(ulnum);
|
||||
|
|
@ -1428,7 +1428,7 @@ int main(int argc, char *argv[])
|
|||
/* Asked to actively connect to the specified local port instead of
|
||||
doing a passive server-style listening. */
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
char *endptr;
|
||||
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
|
||||
if((endptr != argv[arg] + strlen(argv[arg])) ||
|
||||
|
|
@ -1444,7 +1444,7 @@ int main(int argc, char *argv[])
|
|||
else if(!strcmp("--addr", argv[arg])) {
|
||||
/* Set an IP address to use with --connect; otherwise use localhost */
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
addr = argv[arg];
|
||||
arg++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@ static void loghex(unsigned char *buffer, ssize_t len)
|
|||
ssize_t width = 0;
|
||||
int left = sizeof(data);
|
||||
|
||||
for(i = 0; i<len && (left >= 0); i++) {
|
||||
for(i = 0; i < len && (left >= 0); i++) {
|
||||
msnprintf(optr, left, "%02x", ptr[i]);
|
||||
width += 2;
|
||||
optr += 2;
|
||||
|
|
@ -324,7 +324,7 @@ static curl_socket_t socks4(curl_socket_t fd,
|
|||
return CURL_SOCKET_BAD;
|
||||
}
|
||||
if(!config.port)
|
||||
s4port = (unsigned short)((buffer[SOCKS4_DSTPORT]<<8) |
|
||||
s4port = (unsigned short)((buffer[SOCKS4_DSTPORT] << 8) |
|
||||
(buffer[SOCKS4_DSTPORT + 1]));
|
||||
else
|
||||
s4port = config.port;
|
||||
|
|
@ -572,7 +572,7 @@ static curl_socket_t sockit(curl_socket_t fd)
|
|||
|
||||
if(!config.port) {
|
||||
unsigned char *portp = &buffer[SOCKS5_DSTADDR + len];
|
||||
s5port = (unsigned short)((portp[0]<<8) | (portp[1]));
|
||||
s5port = (unsigned short)((portp[0] << 8) | (portp[1]));
|
||||
}
|
||||
else
|
||||
s5port = config.port;
|
||||
|
|
@ -968,7 +968,7 @@ int main(int argc, char *argv[])
|
|||
bool unlink_socket = false;
|
||||
#endif
|
||||
|
||||
while(argc>arg) {
|
||||
while(argc > arg) {
|
||||
if(!strcmp("--version", argv[arg])) {
|
||||
printf("socksd IPv4%s\n",
|
||||
#ifdef USE_IPV6
|
||||
|
|
@ -981,37 +981,37 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--pidfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
pidname = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--portfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
portname = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--config", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
configfile = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--backend", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
backendaddr = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--backendport", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
backendport = (unsigned short)atoi(argv[arg++]);
|
||||
}
|
||||
else if(!strcmp("--logfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
serverlogfile = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--reqfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
reqlogfile = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--ipv6", argv[arg])) {
|
||||
|
|
@ -1030,7 +1030,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--unix-socket", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
#ifdef USE_UNIX_SOCKETS
|
||||
struct sockaddr_un sau;
|
||||
unix_socket = argv[arg];
|
||||
|
|
@ -1048,7 +1048,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--port", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
char *endptr;
|
||||
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
|
||||
port = curlx_ultous(ulnum);
|
||||
|
|
|
|||
|
|
@ -372,7 +372,7 @@ static int ProcessRequest(struct httprequest *req)
|
|||
req->callcount++;
|
||||
|
||||
logmsg("Process %zu bytes request%s", req->offset,
|
||||
req->callcount > 1?" [CONTINUED]":"");
|
||||
req->callcount > 1 ? " [CONTINUED]" : "");
|
||||
|
||||
/* try to figure out the request characteristics as soon as possible, but
|
||||
only once! */
|
||||
|
|
@ -792,7 +792,7 @@ static void storerequest(const char *reqbuf, size_t totalsize)
|
|||
char dumpfile[256];
|
||||
|
||||
msnprintf(dumpfile, sizeof(dumpfile), "%s/%s",
|
||||
logdir, is_proxy?REQUEST_PROXY_DUMP:REQUEST_DUMP);
|
||||
logdir, is_proxy ? REQUEST_PROXY_DUMP : REQUEST_DUMP);
|
||||
|
||||
if(!reqbuf)
|
||||
return;
|
||||
|
|
@ -1021,7 +1021,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
|
|||
char responsedump[256];
|
||||
|
||||
msnprintf(responsedump, sizeof(responsedump), "%s/%s",
|
||||
logdir, is_proxy?RESPONSE_PROXY_DUMP:RESPONSE_DUMP);
|
||||
logdir, is_proxy ? RESPONSE_PROXY_DUMP:RESPONSE_DUMP);
|
||||
|
||||
switch(req->rcmd) {
|
||||
default:
|
||||
|
|
@ -1084,7 +1084,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
|
|||
|
||||
/* select the <data> tag for "normal" requests and the <connect> one
|
||||
for CONNECT requests (within the <reply> section) */
|
||||
const char *section = req->connect_request?"connect":"data";
|
||||
const char *section = req->connect_request ? "connect" : "data";
|
||||
|
||||
if(req->partno)
|
||||
msnprintf(partbuf, sizeof(partbuf), "%s%ld", section, req->partno);
|
||||
|
|
@ -2017,7 +2017,7 @@ int main(int argc, char *argv[])
|
|||
/* a default CONNECT port is basically pointless but still ... */
|
||||
size_t socket_idx;
|
||||
|
||||
while(argc>arg) {
|
||||
while(argc > arg) {
|
||||
if(!strcmp("--version", argv[arg])) {
|
||||
puts("sws IPv4"
|
||||
#ifdef USE_IPV6
|
||||
|
|
@ -2031,27 +2031,27 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--pidfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
pidname = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--portfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
portname = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--logfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
serverlogfile = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--logdir", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
logdir = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--cmdfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
cmdfile = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--gopher", argv[arg])) {
|
||||
|
|
@ -2076,7 +2076,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--unix-socket", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
#ifdef USE_UNIX_SOCKETS
|
||||
unix_socket = argv[arg];
|
||||
if(strlen(unix_socket) >= sizeof(me.sau.sun_path)) {
|
||||
|
|
@ -2094,7 +2094,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--port", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
char *endptr;
|
||||
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
|
||||
if((endptr != argv[arg] + strlen(argv[arg])) ||
|
||||
|
|
@ -2109,14 +2109,14 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
else if(!strcmp("--srcdir", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
path = argv[arg];
|
||||
arg++;
|
||||
}
|
||||
}
|
||||
else if(!strcmp("--keepalive", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
char *endptr;
|
||||
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
|
||||
if((endptr != argv[arg] + strlen(argv[arg])) ||
|
||||
|
|
@ -2134,7 +2134,7 @@ int main(int argc, char *argv[])
|
|||
what the client asks for, but also use this as a hint that we run as
|
||||
a proxy and do a few different internal choices */
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
connecthost = argv[arg];
|
||||
arg++;
|
||||
is_proxy = TRUE;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ int main(int argc, char **argv)
|
|||
char *part;
|
||||
size_t partlen;
|
||||
|
||||
if(argc< 3) {
|
||||
if(argc < 3) {
|
||||
printf("./testpart main sub\n");
|
||||
}
|
||||
else {
|
||||
|
|
|
|||
|
|
@ -564,7 +564,7 @@ int main(int argc, char **argv)
|
|||
|
||||
memset(&test, 0, sizeof(test));
|
||||
|
||||
while(argc>arg) {
|
||||
while(argc > arg) {
|
||||
if(!strcmp("--version", argv[arg])) {
|
||||
printf("tftpd IPv4%s\n",
|
||||
#ifdef USE_IPV6
|
||||
|
|
@ -577,22 +577,22 @@ int main(int argc, char **argv)
|
|||
}
|
||||
else if(!strcmp("--pidfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
pidname = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--portfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
portname = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--logfile", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
serverlogfile = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--logdir", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg)
|
||||
if(argc > arg)
|
||||
logdir = argv[arg++];
|
||||
}
|
||||
else if(!strcmp("--ipv4", argv[arg])) {
|
||||
|
|
@ -611,7 +611,7 @@ int main(int argc, char **argv)
|
|||
}
|
||||
else if(!strcmp("--port", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
char *endptr;
|
||||
unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
|
||||
port = curlx_ultous(ulnum);
|
||||
|
|
@ -620,7 +620,7 @@ int main(int argc, char **argv)
|
|||
}
|
||||
else if(!strcmp("--srcdir", argv[arg])) {
|
||||
arg++;
|
||||
if(argc>arg) {
|
||||
if(argc > arg) {
|
||||
path = argv[arg];
|
||||
arg++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -562,15 +562,22 @@ static BOOL WINAPI ctrl_event_handler(DWORD dwCtrlType)
|
|||
logmsg("ctrl_event_handler: %lu", dwCtrlType);
|
||||
switch(dwCtrlType) {
|
||||
#ifdef SIGINT
|
||||
case CTRL_C_EVENT: signum = SIGINT; break;
|
||||
case CTRL_C_EVENT:
|
||||
signum = SIGINT;
|
||||
break;
|
||||
#endif
|
||||
#ifdef SIGTERM
|
||||
case CTRL_CLOSE_EVENT: signum = SIGTERM; break;
|
||||
case CTRL_CLOSE_EVENT:
|
||||
signum = SIGTERM;
|
||||
break;
|
||||
#endif
|
||||
#ifdef SIGBREAK
|
||||
case CTRL_BREAK_EVENT: signum = SIGBREAK; break;
|
||||
case CTRL_BREAK_EVENT:
|
||||
signum = SIGBREAK;
|
||||
break;
|
||||
#endif
|
||||
default: return FALSE;
|
||||
default:
|
||||
return FALSE;
|
||||
}
|
||||
if(signum) {
|
||||
logmsg("ctrl_event_handler: %lu -> %d", dwCtrlType, signum);
|
||||
|
|
@ -595,9 +602,13 @@ static LRESULT CALLBACK main_window_proc(HWND hwnd, UINT uMsg,
|
|||
if(hwnd == hidden_main_window) {
|
||||
switch(uMsg) {
|
||||
#ifdef SIGTERM
|
||||
case WM_CLOSE: signum = SIGTERM; break;
|
||||
case WM_CLOSE:
|
||||
signum = SIGTERM;
|
||||
break;
|
||||
#endif
|
||||
case WM_DESTROY: PostQuitMessage(0); break;
|
||||
case WM_DESTROY:
|
||||
PostQuitMessage(0);
|
||||
break;
|
||||
}
|
||||
if(signum) {
|
||||
logmsg("main_window_proc: %d -> %d", uMsg, signum);
|
||||
|
|
@ -671,7 +682,7 @@ static SIGHANDLER_T set_signal(int signum, SIGHANDLER_T handler,
|
|||
sa.sa_handler = handler;
|
||||
sigemptyset(&sa.sa_mask);
|
||||
sigaddset(&sa.sa_mask, signum);
|
||||
sa.sa_flags = restartable? SA_RESTART: 0;
|
||||
sa.sa_flags = restartable ? SA_RESTART : 0;
|
||||
|
||||
if(sigaction(signum, &sa, &oldsa))
|
||||
return SIG_ERR;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue