Move variable definitions into the blocks where they are really needed,

so that warnings about unused variables don't appear if those blocks
are removed by the C preprocessor.

Submitted by:
Reviewed by:
PR:
This commit is contained in:
Bodo Möller 1999-05-09 10:16:46 +00:00
parent 303c002898
commit a0d0c6a61b

View file

@ -274,8 +274,6 @@ void SHA1_Update(SHA_CTX *c, const register unsigned char *data,
void SHA1_Transform(SHA_CTX *c, unsigned char *b) void SHA1_Transform(SHA_CTX *c, unsigned char *b)
{ {
SHA_LONG p[SHA_LBLOCK]; SHA_LONG p[SHA_LBLOCK];
SHA_LONG *q;
int i;
#if SHA_LONG_LOG2==2 #if SHA_LONG_LOG2==2
#if defined(B_ENDIAN) || defined(SHA1_ASM) #if defined(B_ENDIAN) || defined(SHA1_ASM)
@ -285,6 +283,9 @@ void SHA1_Transform(SHA_CTX *c, unsigned char *b)
#else #else
if (((unsigned long)b%sizeof(SHA_LONG)) == 0) if (((unsigned long)b%sizeof(SHA_LONG)) == 0)
{ {
SHA_LONG *q;
int i;
q=p; q=p;
for (i=(SHA_LBLOCK/4); i; i--) for (i=(SHA_LBLOCK/4); i; i--)
{ {
@ -302,16 +303,21 @@ void SHA1_Transform(SHA_CTX *c, unsigned char *b)
#endif #endif
#endif #endif
#ifndef SHA_NO_TAIL_CODE /* defined above, see comment */ #ifndef SHA_NO_TAIL_CODE /* defined above, see comment */
q=p;
for (i=(SHA_LBLOCK/4); i; i--)
{ {
SHA_LONG l; SHA_LONG *q;
c2nl(b,l); *(q++)=l; int i;
c2nl(b,l); *(q++)=l;
c2nl(b,l); *(q++)=l; q=p;
c2nl(b,l); *(q++)=l; for (i=(SHA_LBLOCK/4); i; i--)
} {
sha1_block(c,p,1); SHA_LONG l;
c2nl(b,l); *(q++)=l;
c2nl(b,l); *(q++)=l;
c2nl(b,l); *(q++)=l;
c2nl(b,l); *(q++)=l;
}
sha1_block(c,p,1);
}
#endif #endif
} }