Commit ccab3808 authored by Ben Boeckel's avatar Ben Boeckel Committed by Brad King
Browse files

clang-tidy: address readability-isolate-declaration lints

parent e798e567
...@@ -130,7 +130,10 @@ size_t kwsysBase64_Encode(const unsigned char* input, size_t length, ...@@ -130,7 +130,10 @@ size_t kwsysBase64_Encode(const unsigned char* input, size_t length,
/* Decode 4 bytes into a 3 byte string. */ /* Decode 4 bytes into a 3 byte string. */
int kwsysBase64_Decode3(const unsigned char* src, unsigned char* dest) int kwsysBase64_Decode3(const unsigned char* src, unsigned char* dest)
{ {
unsigned char d0, d1, d2, d3; unsigned char d0;
unsigned char d1;
unsigned char d2;
unsigned char d3;
d0 = kwsysBase64DecodeChar(src[0]); d0 = kwsysBase64DecodeChar(src[0]);
d1 = kwsysBase64DecodeChar(src[1]); d1 = kwsysBase64DecodeChar(src[1]);
......
...@@ -171,8 +171,10 @@ typedef struct md5_state_s ...@@ -171,8 +171,10 @@ typedef struct md5_state_s
static void md5_process(md5_state_t* pms, const md5_byte_t* data /*[64]*/) static void md5_process(md5_state_t* pms, const md5_byte_t* data /*[64]*/)
{ {
md5_word_t a = pms->abcd[0], b = pms->abcd[1], c = pms->abcd[2], md5_word_t a = pms->abcd[0];
d = pms->abcd[3]; md5_word_t b = pms->abcd[1];
md5_word_t c = pms->abcd[2];
md5_word_t d = pms->abcd[3];
md5_word_t t; md5_word_t t;
#if BYTE_ORDER > 0 #if BYTE_ORDER > 0
/* Define storage only for big-endian CPUs. */ /* Define storage only for big-endian CPUs. */
......
...@@ -1184,7 +1184,7 @@ static int kwsysProcessWaitForPipe(kwsysProcess* cp, char** data, int* length, ...@@ -1184,7 +1184,7 @@ static int kwsysProcessWaitForPipe(kwsysProcess* cp, char** data, int* length,
/* Make sure the set is empty (it should always be empty here /* Make sure the set is empty (it should always be empty here
anyway). */ anyway). */
FD_ZERO(&cp->PipeSet); FD_ZERO(&cp->PipeSet); // NOLINT(readability-isolate-declaration)
/* Setup a timeout if required. */ /* Setup a timeout if required. */
if (wd->TimeoutTime.tv_sec < 0) { if (wd->TimeoutTime.tv_sec < 0) {
...@@ -1502,7 +1502,7 @@ static int kwsysProcessInitialize(kwsysProcess* cp) ...@@ -1502,7 +1502,7 @@ static int kwsysProcessInitialize(kwsysProcess* cp)
cp->PipesLeft = 0; cp->PipesLeft = 0;
cp->CommandsLeft = 0; cp->CommandsLeft = 0;
#if KWSYSPE_USE_SELECT #if KWSYSPE_USE_SELECT
FD_ZERO(&cp->PipeSet); FD_ZERO(&cp->PipeSet); // NOLINT(readability-isolate-declaration)
#endif #endif
cp->State = kwsysProcess_State_Starting; cp->State = kwsysProcess_State_Starting;
cp->Killed = 0; cp->Killed = 0;
...@@ -1690,7 +1690,8 @@ int decc$set_child_standard_streams(int fd1, int fd2, int fd3); ...@@ -1690,7 +1690,8 @@ int decc$set_child_standard_streams(int fd1, int fd2, int fd3);
static int kwsysProcessCreate(kwsysProcess* cp, int prIndex, static int kwsysProcessCreate(kwsysProcess* cp, int prIndex,
kwsysProcessCreateInformation* si) kwsysProcessCreateInformation* si)
{ {
sigset_t mask, old_mask; sigset_t mask;
sigset_t old_mask;
int pgidPipe[2]; int pgidPipe[2];
char tmp; char tmp;
ssize_t readRes; ssize_t readRes;
...@@ -2808,7 +2809,10 @@ static void kwsysProcessesSignalHandler(int signum ...@@ -2808,7 +2809,10 @@ static void kwsysProcessesSignalHandler(int signum
#endif #endif
) )
{ {
int i, j, procStatus, old_errno = errno; int i;
int j;
int procStatus;
int old_errno = errno;
#if KWSYSPE_USE_SIGINFO #if KWSYSPE_USE_SIGINFO
(void)info; (void)info;
(void)ucontext; (void)ucontext;
......
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