From 0f20ababd21ee6fdc9b1a08c75bc82c7017f4224 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Fri, 29 May 2009 15:10:25 -0700 Subject: [PATCH] Run Nindent on com32/lib/sys/fileread.c Automatically reformat com32/lib/sys/fileread.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/fileread.c | 76 ++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/com32/lib/sys/fileread.c b/com32/lib/sys/fileread.c index 79d912d..54ff711 100644 --- a/com32/lib/sys/fileread.c +++ b/com32/lib/sys/fileread.c @@ -39,55 +39,55 @@ int __file_get_block(struct file_info *fp) { - com32sys_t ireg, oreg; + com32sys_t ireg, oreg; - memset(&ireg, 0, sizeof ireg); - ireg.eax.w[0] = 0x0007; /* Read file */ - ireg.ebx.w[0] = OFFS(__com32.cs_bounce); - ireg.es = SEG(__com32.cs_bounce); - ireg.esi.w[0] = fp->i.filedes; - ireg.ecx.w[0] = MAXBLOCK >> fp->i.blocklg2; + memset(&ireg, 0, sizeof ireg); + ireg.eax.w[0] = 0x0007; /* Read file */ + ireg.ebx.w[0] = OFFS(__com32.cs_bounce); + ireg.es = SEG(__com32.cs_bounce); + ireg.esi.w[0] = fp->i.filedes; + ireg.ecx.w[0] = MAXBLOCK >> fp->i.blocklg2; - __intcall(0x22, &ireg, &oreg); + __intcall(0x22, &ireg, &oreg); - if ( oreg.eflags.l & EFLAGS_CF ) { - errno = EIO; - return -1; - } + if (oreg.eflags.l & EFLAGS_CF) { + errno = EIO; + return -1; + } - fp->i.filedes = oreg.esi.w[0]; - fp->i.nbytes = oreg.ecx.l; - fp->i.datap = fp->i.buf; - memcpy(fp->i.buf, __com32.cs_bounce, fp->i.nbytes); + fp->i.filedes = oreg.esi.w[0]; + fp->i.nbytes = oreg.ecx.l; + fp->i.datap = fp->i.buf; + memcpy(fp->i.buf, __com32.cs_bounce, fp->i.nbytes); - return 0; + return 0; } -ssize_t __file_read(struct file_info *fp, void *buf, size_t count) +ssize_t __file_read(struct file_info * fp, void *buf, size_t count) { - char *bufp = buf; - ssize_t n = 0; - size_t ncopy; + char *bufp = buf; + ssize_t n = 0; + size_t ncopy; - while ( count ) { - if ( fp->i.nbytes == 0 ) { - if ( fp->i.offset >= fp->i.length || !fp->i.filedes ) - return n; /* As good as it gets... */ + while (count) { + if (fp->i.nbytes == 0) { + if (fp->i.offset >= fp->i.length || !fp->i.filedes) + return n; /* As good as it gets... */ - if ( __file_get_block(fp) ) - return n ? n : -1; - } + if (__file_get_block(fp)) + return n ? n : -1; + } - ncopy = min(count, fp->i.nbytes); - memcpy(bufp, fp->i.datap, ncopy); + ncopy = min(count, fp->i.nbytes); + memcpy(bufp, fp->i.datap, ncopy); - n += ncopy; - bufp += ncopy; - count -= ncopy; - fp->i.datap += ncopy; - fp->i.offset += ncopy; - fp->i.nbytes -= ncopy; - } + n += ncopy; + bufp += ncopy; + count -= ncopy; + fp->i.datap += ncopy; + fp->i.offset += ncopy; + fp->i.nbytes -= ncopy; + } - return n; + return n; } -- 2.7.4