Static code analysis fixes #3852

Job	Run time
make check (--disable-tls --enable-all CFLAGS="-pedantic -Wdeclaration-after-statement -DTEST_LIB...	1m 27s
	1m 27s

Provide feedback