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:

diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c
index e867f6972b4d28125e5ffbfeacb4bba690f5a00e..de8fa84e24e975c018ad9cafa6b76b1ed2ab6401 100644 (file)
--- a/crypto/sha/sha1dgst.c
+++ b/crypto/sha/sha1dgst.c
@@ -274,8 +274,6 @@ void SHA1_Update(SHA_CTX *c, const register unsigned char *data,
 void SHA1_Transform(SHA_CTX *c, unsigned char *b)
        {
        SHA_LONG p[SHA_LBLOCK];
 void SHA1_Transform(SHA_CTX *c, unsigned char *b)
        {
        SHA_LONG p[SHA_LBLOCK];

-       SHA_LONG *q;
-       int i;

 
 #if SHA_LONG_LOG2==2
 #if defined(B_ENDIAN) || defined(SHA1_ASM)
 
 #if SHA_LONG_LOG2==2
 #if defined(B_ENDIAN) || defined(SHA1_ASM)


@@ -285,6 +283,9 @@ void SHA1_Transform(SHA_CTX *c, unsigned char *b)
 #else
        if (((unsigned long)b%sizeof(SHA_LONG)) == 0)
                {
 #else
        if (((unsigned long)b%sizeof(SHA_LONG)) == 0)
                {

+               SHA_LONG *q;
+               int i;
+

                q=p;
                for (i=(SHA_LBLOCK/4); i; i--)
                        {
                q=p;
                for (i=(SHA_LBLOCK/4); i; i--)
                        {


@@ -302,16 +303,21 @@ void SHA1_Transform(SHA_CTX *c, unsigned char *b)
 #endif
 #endif
 #ifndef SHA_NO_TAIL_CODE /* defined above, see comment */
 #endif
 #endif
 #ifndef SHA_NO_TAIL_CODE /* defined above, see comment */

-       q=p;
-       for (i=(SHA_LBLOCK/4); i; i--)

                {
                {

-               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);
+               SHA_LONG *q;
+               int i;
+       
+               q=p;
+               for (i=(SHA_LBLOCK/4); i; i--)
+                       {
+                       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
        }