瀏覽代碼

[CRYPTO] authenc: Move initialisations up to shut up gcc

It seems that newer versions of gcc have regressed in their abilities to
analyse initialisations.  This patch moves the initialisations up to avoid
the warnings.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Herbert Xu 18 年之前
父節點
當前提交
f347c4facf
共有 1 個文件被更改,包括 4 次插入8 次删除
  1. 4 8
      crypto/authenc.c

+ 4 - 8
crypto/authenc.c

@@ -84,8 +84,8 @@ static int crypto_authenc_hash(struct aead_request *req)
 		.tfm = auth,
 		.tfm = auth,
 	};
 	};
 	u8 *hash = aead_request_ctx(req);
 	u8 *hash = aead_request_ctx(req);
-	struct scatterlist *dst;
-	unsigned int cryptlen;
+	struct scatterlist *dst = req->dst;
+	unsigned int cryptlen = req->cryptlen;
 	int err;
 	int err;
 
 
 	hash = (u8 *)ALIGN((unsigned long)hash + crypto_hash_alignmask(auth), 
 	hash = (u8 *)ALIGN((unsigned long)hash + crypto_hash_alignmask(auth), 
@@ -100,8 +100,6 @@ static int crypto_authenc_hash(struct aead_request *req)
 	if (err)
 	if (err)
 		goto auth_unlock;
 		goto auth_unlock;
 
 
-	cryptlen = req->cryptlen;
-	dst = req->dst;
 	err = crypto_hash_update(&desc, dst, cryptlen);
 	err = crypto_hash_update(&desc, dst, cryptlen);
 	if (err)
 	if (err)
 		goto auth_unlock;
 		goto auth_unlock;
@@ -159,8 +157,8 @@ static int crypto_authenc_verify(struct aead_request *req)
 	};
 	};
 	u8 *ohash = aead_request_ctx(req);
 	u8 *ohash = aead_request_ctx(req);
 	u8 *ihash;
 	u8 *ihash;
-	struct scatterlist *src;
-	unsigned int cryptlen;
+	struct scatterlist *src = req->src;
+	unsigned int cryptlen = req->cryptlen;
 	unsigned int authsize;
 	unsigned int authsize;
 	int err;
 	int err;
 
 
@@ -177,8 +175,6 @@ static int crypto_authenc_verify(struct aead_request *req)
 	if (err)
 	if (err)
 		goto auth_unlock;
 		goto auth_unlock;
 
 
-	cryptlen = req->cryptlen;
-	src = req->src;
 	err = crypto_hash_update(&desc, src, cryptlen);
 	err = crypto_hash_update(&desc, src, cryptlen);
 	if (err)
 	if (err)
 		goto auth_unlock;
 		goto auth_unlock;