From 9cc45e2f88270aedc018ec5560fc323bd59a6571 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Fri, 29 May 2009 15:10:26 -0700 Subject: [PATCH] Run Nindent on com32/lib/sys/zfile.c Automatically reformat com32/lib/sys/zfile.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin --- com32/lib/sys/zfile.c | 172 +++++++++++++++++++++++++------------------------- 1 file changed, 85 insertions(+), 87 deletions(-) diff --git a/com32/lib/sys/zfile.c b/com32/lib/sys/zfile.c index 9dbee9b..a1213a9 100644 --- a/com32/lib/sys/zfile.c +++ b/com32/lib/sys/zfile.c @@ -49,123 +49,121 @@ static ssize_t gzip_file_read(struct file_info *, void *, size_t); static int gzip_file_close(struct file_info *); static const struct input_dev gzip_file_dev = { - .dev_magic = __DEV_MAGIC, - .flags = __DEV_FILE | __DEV_INPUT, - .fileflags = O_RDONLY, - .read = gzip_file_read, - .close = gzip_file_close, - .open = NULL, + .dev_magic = __DEV_MAGIC, + .flags = __DEV_FILE | __DEV_INPUT, + .fileflags = O_RDONLY, + .read = gzip_file_read, + .close = gzip_file_close, + .open = NULL, }; static int gzip_file_init(struct file_info *fp) { - z_streamp zs = calloc(1, sizeof(z_stream)); + z_streamp zs = calloc(1, sizeof(z_stream)); - if (!zs) - return -1; + if (!zs) + return -1; - fp->i.pvt = zs; + fp->i.pvt = zs; - zs->next_in = (void *)fp->i.datap; - zs->avail_in = fp->i.nbytes; + zs->next_in = (void *)fp->i.datap; + zs->avail_in = fp->i.nbytes; - if (inflateInit2(zs, 15+32) != Z_OK) { - errno = EIO; - return -1; - } + if (inflateInit2(zs, 15 + 32) != Z_OK) { + errno = EIO; + return -1; + } - fp->iop = &gzip_file_dev; - fp->i.length = -1; /* Unknown */ + fp->iop = &gzip_file_dev; + fp->i.length = -1; /* Unknown */ - return 0; + return 0; } static ssize_t gzip_file_read(struct file_info *fp, void *ptr, size_t n) { - z_streamp zs = fp->i.pvt; - int rv; - ssize_t bytes; - ssize_t nout = 0; - unsigned char *p = ptr; - - while ( n ) { - zs->next_out = p; - zs->avail_out = n; - - if (!zs->avail_in && fp->i.filedes) { - if (__file_get_block(fp)) - return nout ? nout : -1; - - zs->next_in = (void *)fp->i.datap; - zs->avail_in = fp->i.nbytes; + z_streamp zs = fp->i.pvt; + int rv; + ssize_t bytes; + ssize_t nout = 0; + unsigned char *p = ptr; + + while (n) { + zs->next_out = p; + zs->avail_out = n; + + if (!zs->avail_in && fp->i.filedes) { + if (__file_get_block(fp)) + return nout ? nout : -1; + + zs->next_in = (void *)fp->i.datap; + zs->avail_in = fp->i.nbytes; + } + + rv = inflate(zs, Z_SYNC_FLUSH); + + bytes = n - zs->avail_out; + nout += bytes; + p += bytes; + n -= bytes; + + switch (rv) { + case Z_DATA_ERROR: + case Z_NEED_DICT: + case Z_BUF_ERROR: + case Z_STREAM_ERROR: + default: + errno = EIO; + return nout ? nout : -1; + case Z_MEM_ERROR: + errno = ENOMEM; + return nout ? nout : -1; + case Z_STREAM_END: + return nout; + case Z_OK: + break; + } } - rv = inflate(zs, Z_SYNC_FLUSH); - - bytes = n - zs->avail_out; - nout += bytes; - p += bytes; - n -= bytes; - - switch (rv) { - case Z_DATA_ERROR: - case Z_NEED_DICT: - case Z_BUF_ERROR: - case Z_STREAM_ERROR: - default: - errno = EIO; - return nout ? nout : -1; - case Z_MEM_ERROR: - errno = ENOMEM; - return nout ? nout : -1; - case Z_STREAM_END: - return nout; - case Z_OK: - break; - } - } - - return nout; + return nout; } static int gzip_file_close(struct file_info *fp) { - z_streamp zs = fp->i.pvt; + z_streamp zs = fp->i.pvt; - inflateEnd(zs); - free(zs); - return __file_close(fp); + inflateEnd(zs); + free(zs); + return __file_close(fp); } int zopen(const char *pathname, int flags, ...) { - int fd, rv; - struct file_info *fp; + int fd, rv; + struct file_info *fp; - /* We don't actually give a hoot about the creation bits... */ - fd = open(pathname, flags, 0); + /* We don't actually give a hoot about the creation bits... */ + fd = open(pathname, flags, 0); - if ( fd < 0 ) - return -1; + if (fd < 0) + return -1; - fp = &__file_info[fd]; + fp = &__file_info[fd]; - /* Need to get the first block into the buffer, but not consumed */ - if ( __file_get_block(fp) ) - goto err; + /* Need to get the first block into the buffer, but not consumed */ + if (__file_get_block(fp)) + goto err; - if (fp->i.nbytes >= 14 && - (uint8_t)fp->i.buf[0] == 037 && - (uint8_t)fp->i.buf[1] == 0213 && /* gzip */ - fp->i.buf[2] == 8) /* deflate */ - rv = gzip_file_init(fp); - else - rv = 0; /* Plain file */ + if (fp->i.nbytes >= 14 && (uint8_t) fp->i.buf[0] == 037 && (uint8_t) fp->i.buf[1] == 0213 && /* gzip */ + fp->i.buf[2] == 8) /* deflate */ + rv = gzip_file_init(fp); + else + rv = 0; /* Plain file */ - if (!rv) - return fd; + if (!rv) + return fd; - err: - close(fd); - return -1; +err: + close(fd); + return -1; } -- 2.7.4