Skip to content

Commit 7bcbe45

Browse files
committed
drivers/dstate.c: fix whitespaces around parentheses and commas (WIN32) [#3302]
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
1 parent e674f5a commit 7bcbe45

1 file changed

Lines changed: 25 additions & 22 deletions

File tree

drivers/dstate.c

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -324,13 +324,13 @@ static void send_to_all(const char *fmt, ...)
324324
DWORD bytesWritten = 0;
325325
BOOL result = FALSE;
326326

327-
result = WriteFile (conn->fd, buf, buflen, &bytesWritten, NULL);
328-
if( result == 0 ) {
327+
result = WriteFile(conn->fd, buf, buflen, &bytesWritten, NULL);
328+
if (result == 0) {
329329
upsdebugx(2, "%s: write failed on handle %p, disconnecting", __func__, conn->fd);
330330
sock_disconnect(conn);
331331
continue;
332332
}
333-
else {
333+
else {
334334
ret = (ssize_t)bytesWritten;
335335
}
336336
#endif /* WIN32 */
@@ -423,11 +423,11 @@ static int send_to_one(conn_t *conn, const char *fmt, ...)
423423
#ifndef WIN32
424424
ret = write(conn->fd, buf, buflen);
425425
#else /* WIN32 */
426-
result = WriteFile (conn->fd, buf, buflen, &bytesWritten, NULL);
427-
if( result == 0 ) {
426+
result = WriteFile(conn->fd, buf, buflen, &bytesWritten, NULL);
427+
if (result == 0) {
428428
ret = 0;
429429
}
430-
else {
430+
else {
431431
ret = (ssize_t)bytesWritten;
432432
}
433433
#endif /* WIN32 */
@@ -449,11 +449,11 @@ static int send_to_one(conn_t *conn, const char *fmt, ...)
449449
#ifndef WIN32
450450
ret = write(conn->fd, buf, buflen);
451451
#else /* WIN32 */
452-
result = WriteFile (conn->fd, buf, buflen, &bytesWritten, NULL);
453-
if( result == 0 ) {
452+
result = WriteFile(conn->fd, buf, buflen, &bytesWritten, NULL);
453+
if (result == 0) {
454454
ret = 0;
455455
}
456-
else {
456+
else {
457457
ret = (ssize_t)bytesWritten;
458458
}
459459
#endif /* WIN32 */
@@ -585,35 +585,35 @@ static void sock_connect(TYPE_FD sock)
585585

586586
/* Prepare a new async wait for a connection on the pipe */
587587
CloseHandle(connect_overlapped.hEvent);
588-
memset(&connect_overlapped,0,sizeof(connect_overlapped));
588+
memset(&connect_overlapped, 0, sizeof(connect_overlapped));
589589
connect_overlapped.hEvent = CreateEvent(
590590
NULL, /* Security */
591591
FALSE, /* auto-reset */
592592
FALSE, /* initial state = non signaled */
593593
NULL /* no name */
594594
);
595-
if(connect_overlapped.hEvent == NULL ) {
595+
if (connect_overlapped.hEvent == NULL) {
596596
fatal_with_errno(EXIT_FAILURE, "Can't create event");
597597
}
598598

599599
/* Wait for a connection */
600-
ConnectNamedPipe(sockfd,&connect_overlapped);
600+
ConnectNamedPipe(sockfd, &connect_overlapped);
601601

602602
/* A new pipe waiting for new client connection has been created. We could manage the current connection now */
603603
/* Start a read operation on the newly connected pipe so we could wait on the event associated to this IO */
604-
memset(&conn->read_overlapped,0,sizeof(conn->read_overlapped));
605-
memset(conn->buf,0,sizeof(conn->buf));
604+
memset(&conn->read_overlapped, 0, sizeof(conn->read_overlapped));
605+
memset(conn->buf, 0, sizeof(conn->buf));
606606
conn->read_overlapped.hEvent = CreateEvent(
607607
NULL, /* Security */
608608
FALSE, /* auto-reset */
609609
FALSE, /* initial state = non signaled */
610610
NULL /* no name */
611611
);
612-
if(conn->read_overlapped.hEvent == NULL ) {
612+
if (conn->read_overlapped.hEvent == NULL) {
613613
fatal_with_errno(EXIT_FAILURE, "Can't create event");
614614
}
615615

616-
ReadFile (conn->fd, conn->buf,
616+
ReadFile(conn->fd, conn->buf,
617617
sizeof(conn->buf) - 1, /* -1 to be sure to have a trailling 0 */
618618
NULL, &(conn->read_overlapped));
619619
#endif /* WIN32 */
@@ -1045,8 +1045,8 @@ static void sock_read(conn_t *conn)
10451045
DWORD bytesRead;
10461046
BOOL res;
10471047
res = GetOverlappedResult(conn->fd, &conn->read_overlapped, &bytesRead, FALSE);
1048-
if( res == 0 ) {
1049-
upslogx(LOG_INFO, "Read error : %d",(int)GetLastError());
1048+
if (res == 0) {
1049+
upslogx(LOG_INFO, "Read error : %d", (int)GetLastError());
10501050
sock_disconnect(conn);
10511051
return;
10521052
}
@@ -1093,7 +1093,7 @@ static void sock_read(conn_t *conn)
10931093

10941094
#ifdef WIN32
10951095
/* Restart async read */
1096-
memset(conn->buf,0,sizeof(conn->buf));
1096+
memset(conn->buf, 0, sizeof(conn->buf));
10971097
ReadFile(
10981098
conn->fd,
10991099
conn->buf,
@@ -1330,7 +1330,7 @@ int dstate_poll_fds(struct timeval timeout, TYPE_FD arg_extrafd)
13301330

13311331
/* Retrieve the signaled connection */
13321332
for (conn = connhead; conn != NULL; conn = conn->next) {
1333-
if( conn->read_overlapped.hEvent == rfds[ret-WAIT_OBJECT_0]) {
1333+
if (conn->read_overlapped.hEvent == rfds[ret-WAIT_OBJECT_0]) {
13341334
break;
13351335
}
13361336
}
@@ -2061,7 +2061,9 @@ void alarm_set(const char *buf)
20612061
}
20622062
}
20632063
upslogx(LOG_ERR, "%s: error setting alarm_buf to: %s%s",
2064-
__func__, alarm_tmp, ( (buflen < sizeof(alarm_tmp)) ? "" : "...<truncated>" ) );
2064+
__func__, alarm_tmp,
2065+
( (buflen < sizeof(alarm_tmp)) ? "" : "...<truncated>" )
2066+
);
20652067
} else if ((size_t)ret > sizeof(alarm_buf)) {
20662068
char alarm_tmp[LARGEBUF];
20672069
int ibuflen;
@@ -2097,7 +2099,8 @@ void alarm_set(const char *buf)
20972099
upslogx(LOG_WARNING, "%s: result was truncated while setting or appending "
20982100
"alarm_buf (limited to %" PRIuSIZE " bytes), with message: %s%s",
20992101
__func__, sizeof(alarm_buf), alarm_tmp,
2100-
( (buflen < sizeof(alarm_tmp)) ? "" : "...<also truncated>" ));
2102+
( (buflen < sizeof(alarm_tmp)) ? "" : "...<also truncated>" )
2103+
);
21012104
}
21022105
}
21032106
#if (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_PUSH_POP_BESIDEFUNC) && (!defined HAVE_PRAGMA_GCC_DIAGNOSTIC_PUSH_POP_INSIDEFUNC) && ( (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_TYPE_LIMITS_BESIDEFUNC) || (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_TAUTOLOGICAL_CONSTANT_OUT_OF_RANGE_COMPARE_BESIDEFUNC) )

0 commit comments

Comments
 (0)