From 5a61f9e0b0366b96bb47f50f8950edf975c0ac6f Mon Sep 17 00:00:00 2001 From: "chao.an" Date: Mon, 20 Dec 2021 13:43:08 +0800 Subject: [PATCH] system/lzf: fix nxstyle warning Signed-off-by: chao.an --- system/lzf/lzf_main.c | 64 ++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/system/lzf/lzf_main.c b/system/lzf/lzf_main.c index 2f25274c4..e29669c07 100644 --- a/system/lzf/lzf_main.c +++ b/system/lzf/lzf_main.c @@ -1,27 +1,30 @@ /**************************************************************************** - * apps/examples/lzf/lzf_main.c + * apps/system/lzf/lzf_main.c * * Copyright (c) 2006 Stefan Traby * - * Redistribution and use in source and binary forms, with or without modifica- - * tion, are permitted provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- - * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO - * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- - * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- - * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ @@ -66,7 +69,10 @@ static off_t g_nread; static off_t g_nwritten; static FAR const char *g_imagename; -static enum { COMPRESS, UNCOMPRESS } g_mode; +static enum + { + COMPRESS, UNCOMPRESS + } g_mode; static bool g_verbose; static bool g_force; static unsigned long g_blocksize; @@ -92,8 +98,10 @@ static void lzf_exit(int exitcode) static void usage(int ret) { fprintf(stderr, "\n" - "lzf, a very lightweight compression/decompression utility written by Stefan Traby.\n" - "uses liblzf written by Marc Lehmann You can find more info at\n" + "lzf, a very lightweight compression/decompression " + "utility written by Stefan Traby.\n" + "uses liblzf written by Marc Lehmann " + " You can find more info at\n" "http://liblzf.plan9.de/\n" "\n" "usage: lzf [-dufhvb] [file ...]\n\n" @@ -155,7 +163,8 @@ static inline ssize_t wwrite(int fd, void *buf, size_t len) return 0; } -/* Anatomy: an lzf file consists of any number of blocks in the following format: +/* Anatomy: an lzf file consists of any number of blocks + * in the following format: * * \x00 EOF (optional) * "ZV\0" 2-byte-usize @@ -172,7 +181,8 @@ static int compress_fd(int from, int to) g_nread = g_nwritten = 0; while ((us = rread(from, &g_buf1[LZF_MAX_HDR_SIZE], g_blocksize)) > 0) { - len = lzf_compress(&g_buf1[LZF_MAX_HDR_SIZE], us, &g_buf2[LZF_MAX_HDR_SIZE], + len = lzf_compress(&g_buf1[LZF_MAX_HDR_SIZE], us, + &g_buf2[LZF_MAX_HDR_SIZE], us > 4 ? us - 4 : us, g_htab, &header); if (wwrite(to, header, len) == -1) { @@ -214,7 +224,8 @@ static int uncompress_fd(int from, int to) if (ret < LZF_MIN_HDR_SIZE || header[0] != 'Z' || header[1] != 'V') { - fprintf(stderr, "%s: invalid data stream - magic not found or short header\n", + fprintf(stderr, "%s: invalid data stream - " + "magic not found or short header\n", g_imagename); return -1; } @@ -278,7 +289,8 @@ static int uncompress_fd(int from, int to) { if (lzf_decompress(g_buf1, cs, g_buf2, us) != us) { - fprintf(stderr, "%s: decompress: invalid stream - data corrupted\n", + fprintf(stderr, "%s: decompress: invalid stream - " + "data corrupted\n", g_imagename); return -1; } @@ -533,14 +545,16 @@ int main(int argc, FAR char *argv[]) { if ((g_mode == UNCOMPRESS) && isatty(0)) { - fprintf(stderr, "%s: compressed data not read from a terminal. " + fprintf(stderr, + "%s: compressed data not read from a terminal. " "Use -f to force decompression.\n", g_imagename); lzf_exit(1); } if (g_mode == COMPRESS && isatty(1)) { - fprintf(stderr, "%s: compressed data not written to a terminal. " + fprintf(stderr, + "%s: compressed data not written to a terminal. " "Use -f to force compression.\n", g_imagename); lzf_exit(1); }