Commit 5ada375f authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'more-clang-tidy'

de210648 clang-tidy: address `readability-else-after-return` lint
535633fa clang-tidy: address `readability-isolate-declaration` lint
83b20b65

 clang-tidy: address `readability-braces-around-statements` lint
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !180
parents b62956f5 de210648
...@@ -417,14 +417,16 @@ static void md5_finish(md5_state_t* pms, md5_byte_t digest[16]) ...@@ -417,14 +417,16 @@ static void md5_finish(md5_state_t* pms, md5_byte_t digest[16])
int i; int i;
/* Save the length before padding. */ /* Save the length before padding. */
for (i = 0; i < 8; ++i) for (i = 0; i < 8; ++i) {
data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3)); data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
}
/* Pad to 56 bytes mod 64. */ /* Pad to 56 bytes mod 64. */
md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1); md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
/* Append the length. */ /* Append the length. */
md5_append(pms, data, 8); md5_append(pms, data, 8);
for (i = 0; i < 16; ++i) for (i = 0; i < 16; ++i) {
digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3)); digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
}
} }
#if defined(__clang__) && !defined(__INTEL_COMPILER) #if defined(__clang__) && !defined(__INTEL_COMPILER)
......
...@@ -1147,8 +1147,8 @@ static int kwsysProcessWaitForPipe(kwsysProcess* cp, char** data, int* length, ...@@ -1147,8 +1147,8 @@ static int kwsysProcessWaitForPipe(kwsysProcess* cp, char** data, int* length,
read until the operation is not interrupted. */ read until the operation is not interrupted. */
while (((n = read(cp->PipeReadEnds[i], cp->PipeBuffer, while (((n = read(cp->PipeReadEnds[i], cp->PipeBuffer,
KWSYSPE_PIPE_BUFFER_SIZE)) < 0) && KWSYSPE_PIPE_BUFFER_SIZE)) < 0) &&
(errno == EINTR)) (errno == EINTR)) {
; }
if (n > 0) { if (n > 0) {
/* We have data on this pipe. */ /* We have data on this pipe. */
if (i == KWSYSPE_PIPE_SIGNAL) { if (i == KWSYSPE_PIPE_SIGNAL) {
...@@ -1221,8 +1221,8 @@ static int kwsysProcessWaitForPipe(kwsysProcess* cp, char** data, int* length, ...@@ -1221,8 +1221,8 @@ static int kwsysProcessWaitForPipe(kwsysProcess* cp, char** data, int* length,
/* Run select to block until data are available. Repeat call /* Run select to block until data are available. Repeat call
until it is not interrupted. */ until it is not interrupted. */
while (((numReady = select(max + 1, &cp->PipeSet, 0, 0, timeout)) < 0) && while (((numReady = select(max + 1, &cp->PipeSet, 0, 0, timeout)) < 0) &&
(errno == EINTR)) (errno == EINTR)) {
; }
/* Check result of select. */ /* Check result of select. */
if (numReady == 0) { if (numReady == 0) {
...@@ -1879,7 +1879,8 @@ static void kwsysProcessDestroy(kwsysProcess* cp) ...@@ -1879,7 +1879,8 @@ static void kwsysProcessDestroy(kwsysProcess* cp)
int i; int i;
/* Temporarily disable signals that access ForkPIDs. We don't want them to /* Temporarily disable signals that access ForkPIDs. We don't want them to
read a reaped PID, and writes to ForkPIDs are not atomic. */ read a reaped PID, and writes to ForkPIDs are not atomic. */
sigset_t mask, old_mask; sigset_t mask;
sigset_t old_mask;
sigemptyset(&mask); sigemptyset(&mask);
sigaddset(&mask, SIGINT); sigaddset(&mask, SIGINT);
sigaddset(&mask, SIGTERM); sigaddset(&mask, SIGTERM);
...@@ -1892,8 +1893,8 @@ static void kwsysProcessDestroy(kwsysProcess* cp) ...@@ -1892,8 +1893,8 @@ static void kwsysProcessDestroy(kwsysProcess* cp)
int result; int result;
while (((result = waitpid(cp->ForkPIDs[i], &cp->CommandExitCodes[i], while (((result = waitpid(cp->ForkPIDs[i], &cp->CommandExitCodes[i],
WNOHANG)) < 0) && WNOHANG)) < 0) &&
(errno == EINTR)) (errno == EINTR)) {
; }
if (result > 0) { if (result > 0) {
/* This child has termianted. */ /* This child has termianted. */
cp->ForkPIDs[i] = 0; cp->ForkPIDs[i] = 0;
...@@ -2567,7 +2568,8 @@ static void kwsysProcessKill(pid_t process_id) ...@@ -2567,7 +2568,8 @@ static void kwsysProcessKill(pid_t process_id)
/* Make sure the process started and provided a valid header. */ /* Make sure the process started and provided a valid header. */
if (ps && fscanf(ps, "%*[^\n]\n") != EOF) { if (ps && fscanf(ps, "%*[^\n]\n") != EOF) {
/* Look for processes whose parent is the process being killed. */ /* Look for processes whose parent is the process being killed. */
int pid, ppid; int pid;
int ppid;
while (fscanf(ps, KWSYSPE_PS_FORMAT, &pid, &ppid) == 2) { while (fscanf(ps, KWSYSPE_PS_FORMAT, &pid, &ppid) == 2) {
if (ppid == process_id) { if (ppid == process_id) {
/* Recursively kill this child and its children. */ /* Recursively kill this child and its children. */
......
...@@ -710,7 +710,8 @@ int main(int argc, const char* argv[]) ...@@ -710,7 +710,8 @@ int main(int argc, const char* argv[])
free(argv0); free(argv0);
#endif #endif
return r; return r;
} else if (argc > 2 && strcmp(argv[1], "0") == 0) { }
if (argc > 2 && strcmp(argv[1], "0") == 0) {
/* This is the special debugging test to run a given command /* This is the special debugging test to run a given command
line. */ line. */
const char** cmd = argv + 2; const char** cmd = argv + 2;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment