From 0deaa4d58cdd0af2b402e06df1edd0cf4d49074c Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sat, 12 Jun 2010 10:25:07 +0100 Subject: [PATCH] Formatting fixes Reformat the CopyOnWrite2 function to match our current coding style Change-Id: I9483c2d391932d675c6c76d6edbb2b8f519b2568 Reviewed-on: http://gerrit.openafs.org/2140 Reviewed-by: Russ Allbery Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/viced/afsfileprocs.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index 97e41309f..b49b4e44a 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -1262,8 +1262,10 @@ CopyOnWrite(Vnode * targetptr, Volume * volptr, afs_foff_t off, afs_fsize_t len) } /*CopyOnWrite */ static int -CopyOnWrite2(FdHandle_t *targFdP, FdHandle_t *newFdP, afs_foff_t off, afs_fsize_t size) { - char *buff = (char *)malloc(COPYBUFFSIZE); +CopyOnWrite2(FdHandle_t *targFdP, FdHandle_t *newFdP, afs_foff_t off, + afs_fsize_t size) +{ + char *buff = malloc(COPYBUFFSIZE); size_t length; ssize_t rdlen; ssize_t wrlen; @@ -1272,7 +1274,9 @@ CopyOnWrite2(FdHandle_t *targFdP, FdHandle_t *newFdP, afs_foff_t off, afs_fsize_ FDH_SEEK(targFdP, off, SEEK_SET); FDH_SEEK(newFdP, off, SEEK_SET); - if (size > FDH_SIZE(targFdP) - off) size = FDH_SIZE(targFdP) - off; + if (size > FDH_SIZE(targFdP) - off) + size = FDH_SIZE(targFdP) - off; + while (size > 0) { if (size > COPYBUFFSIZE) { /* more than a buffer */ length = COPYBUFFSIZE; @@ -1288,7 +1292,8 @@ CopyOnWrite2(FdHandle_t *targFdP, FdHandle_t *newFdP, afs_foff_t off, afs_fsize_ wrlen = 0; if ((rdlen != length) || (wrlen != length)) { - /* no error recovery, at the worst we'll have a "hole" in the file */ + /* no error recovery, at the worst we'll have a "hole" + * in the file */ rc = 1; break; } -- 2.39.5