From 11113fd7a0d1fa54c24c4b026b03a85fb9aa9313 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Fri, 29 May 2009 15:20:14 -0700 Subject: [PATCH] Run Nindent on lzo/prepcore.c Automatically reformat lzo/prepcore.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin --- lzo/prepcore.c | 232 +++++++++++++++++++++++++++------------------------------ 1 file changed, 109 insertions(+), 123 deletions(-) diff --git a/lzo/prepcore.c b/lzo/prepcore.c index a1b48b2..bbf0154 100644 --- a/lzo/prepcore.c +++ b/lzo/prepcore.c @@ -56,30 +56,28 @@ #include "lzo/lzo1x.h" LZO_EXTERN(int) -lzo1x_999_compress_internal ( const lzo_bytep in , lzo_uint in_len, - lzo_bytep out, lzo_uintp out_len, - lzo_voidp wrkmem, - const lzo_bytep dict, lzo_uint dict_len, - lzo_callback_p cb, - int try_lazy, - lzo_uint good_length, - lzo_uint max_lazy, - lzo_uint nice_length, - lzo_uint max_chain, - lzo_uint32 flags ); +lzo1x_999_compress_internal(const lzo_bytep in, lzo_uint in_len, + lzo_bytep out, lzo_uintp out_len, + lzo_voidp wrkmem, + const lzo_bytep dict, lzo_uint dict_len, + lzo_callback_p cb, + int try_lazy, + lzo_uint good_length, + lzo_uint max_lazy, + lzo_uint nice_length, + lzo_uint max_chain, lzo_uint32 flags); LZO_EXTERN(int) -lzo1y_999_compress_internal ( const lzo_bytep in , lzo_uint in_len, - lzo_bytep out, lzo_uintp out_len, - lzo_voidp wrkmem, - const lzo_bytep dict, lzo_uint dict_len, - lzo_callback_p cb, - int try_lazy, - lzo_uint good_length, - lzo_uint max_lazy, - lzo_uint nice_length, - lzo_uint max_chain, - lzo_uint32 flags ); +lzo1y_999_compress_internal(const lzo_bytep in, lzo_uint in_len, + lzo_bytep out, lzo_uintp out_len, + lzo_voidp wrkmem, + const lzo_bytep dict, lzo_uint dict_len, + lzo_callback_p cb, + int try_lazy, + lzo_uint good_length, + lzo_uint max_lazy, + lzo_uint nice_length, + lzo_uint max_chain, lzo_uint32 flags); #define PARANOID 1 @@ -99,29 +97,29 @@ struct prefix { uint32_t pfx_checksum; }; -static inline uint32_t get_32(const uint32_t *p) +static inline uint32_t get_32(const uint32_t * p) { #if defined(__i386__) || defined(__x86_64__) - /* Littleendian and unaligned-capable */ - return *p; + /* Littleendian and unaligned-capable */ + return *p; #else - const uint8_t *pp = (const uint8_t *)p; - return (uint32_t)pp[0] + ((uint32_t)pp[1] << 8) + - ((uint32_t)pp[2] << 16) + ((uint32_t)pp[3] << 24); + const uint8_t *pp = (const uint8_t *)p; + return (uint32_t) pp[0] + ((uint32_t) pp[1] << 8) + + ((uint32_t) pp[2] << 16) + ((uint32_t) pp[3] << 24); #endif } -static inline void set_32(uint32_t *p, uint32_t v) +static inline void set_32(uint32_t * p, uint32_t v) { #if defined(__i386__) || defined(__x86_64__) - /* Littleendian and unaligned-capable */ - *p = v; + /* Littleendian and unaligned-capable */ + *p = v; #else - uint8_t *pp = (uint8_t *)p; - pp[0] = (v & 0xff); - pp[1] = ((v >> 8) & 0xff); - pp[2] = ((v >> 16) & 0xff); - pp[3] = ((v >> 24) & 0xff); + uint8_t *pp = (uint8_t *) p; + pp[0] = (v & 0xff); + pp[1] = ((v >> 8) & 0xff); + pp[2] = ((v >> 16) & 0xff); + pp[3] = ((v >> 24) & 0xff); #endif } @@ -134,7 +132,7 @@ int __lzo_cdecl_main main(int argc, char *argv[]) int r; int lazy; const int max_try_lazy = 5; - const lzo_uint big = 65536L; /* can result in very slow compression */ + const lzo_uint big = 65536L; /* can result in very slow compression */ const lzo_uint32 flags = 0x1; lzo_bytep in; @@ -164,10 +162,9 @@ int __lzo_cdecl_main main(int argc, char *argv[]) struct prefix *prefix; progname = argv[0]; - if (argc != 3) - { - printf("usage: %s file output-file\n", progname); - exit(1); + if (argc != 3) { + printf("usage: %s file output-file\n", progname); + exit(1); } in_name = argv[1]; if (argc > 2) @@ -176,30 +173,28 @@ int __lzo_cdecl_main main(int argc, char *argv[]) /* * Step 1: initialize the LZO library */ - if (lzo_init() != LZO_E_OK) - { - printf("internal error - lzo_init() failed !!!\n"); - printf("(this usually indicates a compiler bug - try recompiling\nwithout optimizations, and enable `-DLZO_DEBUG' for diagnostics)\n"); - exit(1); + if (lzo_init() != LZO_E_OK) { + printf("internal error - lzo_init() failed !!!\n"); + printf + ("(this usually indicates a compiler bug - try recompiling\nwithout optimizations, and enable `-DLZO_DEBUG' for diagnostics)\n"); + exit(1); } /* * Step 3: open the input file */ - f = fopen(in_name,"rb"); - if (f == NULL) - { - printf("%s: cannot open file %s\n", progname, in_name); - exit(1); + f = fopen(in_name, "rb"); + if (f == NULL) { + printf("%s: cannot open file %s\n", progname, in_name); + exit(1); } - fseek(f,0,SEEK_END); + fseek(f, 0, SEEK_END); l = ftell(f); - fseek(f,0,SEEK_SET); - if (l <= 0) - { - printf("%s: %s: empty file\n", progname, in_name); - fclose(f); - exit(1); + fseek(f, 0, SEEK_SET); + if (l <= 0) { + printf("%s: %s: empty file\n", progname, in_name); + fclose(f); + exit(1); } infile_len = (lzo_uint) l; out_bufsize = infile_len + infile_len / 16 + 64 + 3 + 2048; @@ -209,19 +204,18 @@ int __lzo_cdecl_main main(int argc, char *argv[]) */ infile = (lzo_bytep) malloc(infile_len); out = (lzo_bytep) malloc(out_bufsize); - if (infile == NULL || out == NULL) - { - printf("%s: out of memory\n", progname); - exit(1); + if (infile == NULL || out == NULL) { + printf("%s: out of memory\n", progname); + exit(1); } - infile_len = (lzo_uint) fread(infile,1,infile_len,f); + infile_len = (lzo_uint) fread(infile, 1, infile_len, f); fclose(f); /* * Select the portion which is for compression... */ prefix = (struct prefix *)infile; - start = get_32(&prefix->pfx_start); + start = get_32(&prefix->pfx_start); offset = get_32(&prefix->pfx_compressed); in = infile + offset; in_len = infile_len - offset; @@ -230,45 +224,41 @@ int __lzo_cdecl_main main(int argc, char *argv[]) /* * Step 5: compute a checksum of the uncompressed data */ - uncompressed_checksum = lzo_adler32(0,NULL,0); - uncompressed_checksum = lzo_adler32(uncompressed_checksum,in,in_len); + uncompressed_checksum = lzo_adler32(0, NULL, 0); + uncompressed_checksum = lzo_adler32(uncompressed_checksum, in, in_len); /* * Step 6a: compress from `in' to `out' with LZO1X-999 */ - for (lazy = 0; lazy <= max_try_lazy; lazy++) - { - out_len = out_bufsize; - r = lzo1x_999_compress_internal(in,in_len,out,&out_len,wrkmem, - NULL, 0, 0, - lazy, big, big, big, big, flags); - if (r != LZO_E_OK) - { - /* this should NEVER happen */ - printf("internal error - compression failed: %d\n", r); - exit(1); - } - if (out_len < best_len) - { - best_len = out_len; - best_lazy = lazy; - } + for (lazy = 0; lazy <= max_try_lazy; lazy++) { + out_len = out_bufsize; + r = lzo1x_999_compress_internal(in, in_len, out, &out_len, wrkmem, + NULL, 0, 0, + lazy, big, big, big, big, flags); + if (r != LZO_E_OK) { + /* this should NEVER happen */ + printf("internal error - compression failed: %d\n", r); + exit(1); + } + if (out_len < best_len) { + best_len = out_len; + best_lazy = lazy; + } } /* * Step 7: check if compressible */ - if (best_len >= in_len) - { - printf("This file contains incompressible data.\n"); - /* return 0; -- Sucks to be us -hpa ... */ + if (best_len >= in_len) { + printf("This file contains incompressible data.\n"); + /* return 0; -- Sucks to be us -hpa ... */ } /* * Step 8: compress data again using the best compressor found */ out_len = out_bufsize; - r = lzo1x_999_compress_internal(in,in_len,out,&out_len,wrkmem, + r = lzo1x_999_compress_internal(in, in_len, out, &out_len, wrkmem, NULL, 0, 0, best_lazy, big, big, big, big, flags); assert(r == LZO_E_OK); @@ -281,60 +271,57 @@ int __lzo_cdecl_main main(int argc, char *argv[]) /* Optimization does not require any data in the buffer that will * hold the uncompressed data. To prove this, we clear the buffer. */ - memset(in,0,in_len); + memset(in, 0, in_len); #endif orig_len = in_len; - r = lzo1x_optimize(out,out_len,in,&orig_len,NULL); - if (r != LZO_E_OK || orig_len != in_len) - { - /* this should NEVER happen */ - printf("internal error - optimization failed: %d\n", r); - exit(1); + r = lzo1x_optimize(out, out_len, in, &orig_len, NULL); + if (r != LZO_E_OK || orig_len != in_len) { + /* this should NEVER happen */ + printf("internal error - optimization failed: %d\n", r); + exit(1); } /* * Step 10: compute a checksum of the compressed data */ - compressed_checksum = lzo_adler32(0,NULL,0); - compressed_checksum = lzo_adler32(compressed_checksum,out,out_len); + compressed_checksum = lzo_adler32(0, NULL, 0); + compressed_checksum = lzo_adler32(compressed_checksum, out, out_len); /* * Step 11: write compressed data to a file */ /* Make sure we have up to 2048 bytes of zero after the output */ - memset(out+out_len, 0, 2048); + memset(out + out_len, 0, 2048); outfile_len = out_len; soff = get_32(&prefix->pfx_cdatalen); - set_32((uint32_t *)(infile+soff), out_len); + set_32((uint32_t *) (infile + soff), out_len); soff = get_32(&prefix->pfx_checksum); if (soff) { /* ISOLINUX padding and checksumming */ uint32_t csum = 0; unsigned int ptr; - outfile_len = ((offset-start+out_len+2047) & ~2047) - (offset-start); + outfile_len = + ((offset - start + out_len + 2047) & ~2047) - (offset - start); for (ptr = 64; ptr < offset; ptr += 4) - csum += get_32((uint32_t *)(infile+ptr)); + csum += get_32((uint32_t *) (infile + ptr)); for (ptr = 0; ptr < outfile_len; ptr += 4) - csum += get_32((uint32_t *)(out+ptr)); + csum += get_32((uint32_t *) (out + ptr)); - set_32((uint32_t *)(infile+soff), offset-start+outfile_len); - set_32((uint32_t *)(infile+soff+4), csum); + set_32((uint32_t *) (infile + soff), offset - start + outfile_len); + set_32((uint32_t *) (infile + soff + 4), csum); } - f = fopen(out_name,"wb"); - if (f == NULL) - { + f = fopen(out_name, "wb"); + if (f == NULL) { printf("%s: cannot open output file %s\n", progname, out_name); exit(1); } - if (fwrite(infile+start,1,offset-start,f) != offset-start || - fwrite(out,1,outfile_len,f) != outfile_len || - fclose(f)) - { + if (fwrite(infile + start, 1, offset - start, f) != offset - start || + fwrite(out, 1, outfile_len, f) != outfile_len || fclose(f)) { printf("%s: write error !!\n", progname); exit(1); } @@ -343,20 +330,19 @@ int __lzo_cdecl_main main(int argc, char *argv[]) * Step 12: verify decompression */ #ifdef PARANOID - memset(in,0,in_len); /* paranoia - clear output buffer */ + memset(in, 0, in_len); /* paranoia - clear output buffer */ orig_len = in_len; - r = lzo1x_decompress_safe(out,out_len,in,&orig_len,NULL); - if (r != LZO_E_OK || orig_len != in_len) - { - /* this should NEVER happen */ - printf("internal error - decompression failed: %d\n", r); - exit(1); + r = lzo1x_decompress_safe(out, out_len, in, &orig_len, NULL); + if (r != LZO_E_OK || orig_len != in_len) { + /* this should NEVER happen */ + printf("internal error - decompression failed: %d\n", r); + exit(1); } - if (uncompressed_checksum != lzo_adler32(lzo_adler32(0,NULL,0),in,in_len)) - { - /* this should NEVER happen */ - printf("internal error - decompression data error\n"); - exit(1); + if (uncompressed_checksum != + lzo_adler32(lzo_adler32(0, NULL, 0), in, in_len)) { + /* this should NEVER happen */ + printf("internal error - decompression data error\n"); + exit(1); } /* Now you could also verify decompression under similar conditions as in * your application, e.g. overlapping assembler decompression etc. -- 2.7.4