Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 14:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: deflate - Fix checkpatch errors

Browse Source 
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Richard Hartmann 2010-02-16 20:32:13 +08:00 committed by Herbert Xu
parent c9af70fb86
commit 9472d763b3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crypto/deflate.c
View File

@ -1,14 +1,14 @@
/* /*
* Cryptographic API. * Cryptographic API.
* *
* Deflate algorithm (RFC 1951), implemented here primarily for use * Deflate algorithm (RFC 1951), implemented here primarily for use
* by IPCOMP (RFC 3173 & RFC 2394). * by IPCOMP (RFC 3173 & RFC 2394).
* *
* Copyright (c) 2003 James Morris <jmorris@intercode.com.au> * Copyright (c) 2003 James Morris <jmorris@intercode.com.au>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free * under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option) * Software Foundation; either version 2 of the License, or (at your option)
* any later version. * any later version.
* *
* FIXME: deflate transforms will require up to a total of about 436k of kernel * FIXME: deflate transforms will require up to a total of about 436k of kernel
@ -49,7 +49,7 @@ static int deflate_comp_init(struct deflate_ctx *ctx)
struct z_stream_s *stream = &ctx->comp_stream; struct z_stream_s *stream = &ctx->comp_stream;
stream->workspace = vmalloc(zlib_deflate_workspacesize()); stream->workspace = vmalloc(zlib_deflate_workspacesize());
if (!stream->workspace ) { if (!stream->workspace) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
@ -61,7 +61,7 @@ static int deflate_comp_init(struct deflate_ctx *ctx)
ret = -EINVAL; ret = -EINVAL;
goto out_free; goto out_free;
} }
out: out:
return ret; return ret;
out_free: out_free:
vfree(stream->workspace); vfree(stream->workspace);
@ -74,7 +74,7 @@ static int deflate_decomp_init(struct deflate_ctx *ctx)
struct z_stream_s *stream = &ctx->decomp_stream; struct z_stream_s *stream = &ctx->decomp_stream;
stream->workspace = kzalloc(zlib_inflate_workspacesize(), GFP_KERNEL); stream->workspace = kzalloc(zlib_inflate_workspacesize(), GFP_KERNEL);
if (!stream->workspace ) { if (!stream->workspace) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
@ -106,7 +106,7 @@ static int deflate_init(struct crypto_tfm *tfm)
{ {
struct deflate_ctx *ctx = crypto_tfm_ctx(tfm); struct deflate_ctx *ctx = crypto_tfm_ctx(tfm);
int ret; int ret;
ret = deflate_comp_init(ctx); ret = deflate_comp_init(ctx);
if (ret) if (ret)
goto out; goto out;
@ -153,11 +153,11 @@ static int deflate_compress(struct crypto_tfm *tfm, const u8 *src,
out: out:
return ret; return ret;
} }
static int deflate_decompress(struct crypto_tfm *tfm, const u8 *src, static int deflate_decompress(struct crypto_tfm *tfm, const u8 *src,
unsigned int slen, u8 *dst, unsigned int *dlen) unsigned int slen, u8 *dst, unsigned int *dlen)
{ {
int ret = 0; int ret = 0;
struct deflate_ctx *dctx = crypto_tfm_ctx(tfm); struct deflate_ctx *dctx = crypto_tfm_ctx(tfm);
struct z_stream_s *stream = &dctx->decomp_stream; struct z_stream_s *stream = &dctx->decomp_stream;
@ -182,7 +182,7 @@ static int deflate_decompress(struct crypto_tfm *tfm, const u8 *src,
if (ret == Z_OK && !stream->avail_in && stream->avail_out) { if (ret == Z_OK && !stream->avail_in && stream->avail_out) {
u8 zerostuff = 0; u8 zerostuff = 0;
stream->next_in = &zerostuff; stream->next_in = &zerostuff;
stream->avail_in = 1; stream->avail_in = 1;
ret = zlib_inflate(stream, Z_FINISH); ret = zlib_inflate(stream, Z_FINISH);
} }
if (ret != Z_STREAM_END) { if (ret != Z_STREAM_END) {