cleanup code indent
Cleanup the code indent using:
find . -name *.c -exec Lindent {} \;
It's really a big change, but can fix almost all of
the indent problem in C code, although we can't
ensure all of the changes are right, but the error
changes are really few.
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
diff --git a/lib/safe_macros.c b/lib/safe_macros.c
index 9c50f89..0668584 100644
--- a/lib/safe_macros.c
+++ b/lib/safe_macros.c
@@ -13,177 +13,172 @@
#include "test.h"
#include "safe_macros.h"
-char *
-safe_basename(const char *file, const int lineno, void (*cleanup_fn)(void),
- char *path)
+char *safe_basename(const char *file, const int lineno,
+ void (*cleanup_fn) (void), char *path)
{
char *rval;
rval = basename(path);
if (rval == NULL)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "basename failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "basename failed at %s:%d",
+ file, lineno);
return (rval);
}
int
-safe_chdir(const char *file, const int lineno, void (*cleanup_fn)(void),
- const char *path)
+safe_chdir(const char *file, const int lineno, void (*cleanup_fn) (void),
+ const char *path)
{
int rval;
rval = chdir(path);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "chdir failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "chdir failed at %s:%d",
+ file, lineno);
return (rval);
}
int
-safe_close(const char *file, const int lineno, void (*cleanup_fn)(void),
- int fildes)
+safe_close(const char *file, const int lineno, void (*cleanup_fn) (void),
+ int fildes)
{
int rval;
rval = close(fildes);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "close failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "close failed at %s:%d",
+ file, lineno);
return (rval);
}
int
-safe_creat(const char *file, const int lineno, void (*cleanup_fn)(void),
- char *pathname, mode_t mode)
+safe_creat(const char *file, const int lineno, void (*cleanup_fn) (void),
+ char *pathname, mode_t mode)
{
int rval;
rval = creat(pathname, mode);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "pipe failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "pipe failed at %s:%d",
+ file, lineno);
return (rval);
}
-char *
-safe_dirname(const char *file, const int lineno, void (*cleanup_fn)(void),
- char *path)
+char *safe_dirname(const char *file, const int lineno,
+ void (*cleanup_fn) (void), char *path)
{
char *rval;
rval = dirname(path);
if (rval == NULL)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "dirname failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "dirname failed at %s:%d",
+ file, lineno);
return (rval);
}
-char *
-safe_getcwd(const char *file, const int lineno, void (*cleanup_fn)(void),
- char *buf, size_t size)
+char *safe_getcwd(const char *file, const int lineno, void (*cleanup_fn) (void),
+ char *buf, size_t size)
{
char *rval;
rval = getcwd(buf, size);
if (rval == NULL)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "getcwd failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "getcwd failed at %s:%d",
+ file, lineno);
return (rval);
}
-struct passwd*
-safe_getpwnam(const char *file, const int lineno, void (*cleanup_fn)(void),
- const char *name)
+struct passwd *safe_getpwnam(const char *file, const int lineno,
+ void (*cleanup_fn) (void), const char *name)
{
struct passwd *rval;
rval = getpwnam(name);
if (rval == NULL)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "getpwnam failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "getpwnam failed at %s:%d",
+ file, lineno);
return (rval);
}
int
-safe_getrusage(const char *file, const int lineno, void (*cleanup_fn)(void),
- int who, struct rusage *usage)
+safe_getrusage(const char *file, const int lineno, void (*cleanup_fn) (void),
+ int who, struct rusage *usage)
{
int rval;
rval = getrusage(who, usage);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "getrusage failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn,
+ "getrusage failed at %s:%d", file, lineno);
return rval;
}
-void*
-safe_malloc(const char *file, const int lineno, void (*cleanup_fn)(void),
- size_t size)
+void *safe_malloc(const char *file, const int lineno, void (*cleanup_fn) (void),
+ size_t size)
{
void *rval;
rval = malloc(size);
if (rval == NULL)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "malloc failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "malloc failed at %s:%d",
+ file, lineno);
return (rval);
}
int
-safe_mkdir(const char *file, const int lineno, void (*cleanup_fn)(void),
- const char *pathname, mode_t mode)
+safe_mkdir(const char *file, const int lineno, void (*cleanup_fn) (void),
+ const char *pathname, mode_t mode)
{
int rval;
rval = mkdir(pathname, mode);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "mkdir failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "mkdir failed at %s:%d",
+ file, lineno);
return (rval);
}
-void*
-safe_mmap(const char *file, const int lineno, void (*cleanup_fn)(void),
- void *addr, size_t length, int prot, int flags, int fd, off_t offset)
+void *safe_mmap(const char *file, const int lineno, void (*cleanup_fn) (void),
+ void *addr, size_t length, int prot, int flags, int fd,
+ off_t offset)
{
void *rval;
rval = mmap(addr, length, prot, flags, fd, offset);
if (rval == MAP_FAILED)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "mmap failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "mmap failed at %s:%d",
+ file, lineno);
return (rval);
}
int
-safe_munmap(const char *file, const int lineno, void (*cleanup_fn)(void),
- void *addr, size_t length)
+safe_munmap(const char *file, const int lineno, void (*cleanup_fn) (void),
+ void *addr, size_t length)
{
int rval;
rval = munmap(addr, length);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "munmap failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "munmap failed at %s:%d",
+ file, lineno);
return (rval);
}
int
-safe_open(const char *file, const int lineno, void (*cleanup_fn)(void),
- const char *pathname, int oflags, ...)
+safe_open(const char *file, const int lineno, void (*cleanup_fn) (void),
+ const char *pathname, int oflags, ...)
{
va_list ap;
int rval;
@@ -195,154 +190,154 @@
rval = open(pathname, oflags, mode);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "open failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "open failed at %s:%d",
+ file, lineno);
return (rval);
}
int
-safe_pipe(const char *file, const int lineno, void (*cleanup_fn)(void),
- int fildes[2])
+safe_pipe(const char *file, const int lineno, void (*cleanup_fn) (void),
+ int fildes[2])
{
int rval;
rval = pipe(fildes);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "pipe failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "pipe failed at %s:%d",
+ file, lineno);
return (rval);
}
ssize_t
-safe_read(const char *file, const int lineno, void (*cleanup_fn)(void),
- char len_strict, int fildes, void *buf, size_t nbyte)
+safe_read(const char *file, const int lineno, void (*cleanup_fn) (void),
+ char len_strict, int fildes, void *buf, size_t nbyte)
{
ssize_t rval;
rval = read(fildes, buf, nbyte);
if (rval == -1 || (len_strict && rval != nbyte))
- tst_brkm(TBROK|TERRNO, cleanup_fn, "read failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "read failed at %s:%d",
+ file, lineno);
return (rval);
}
- int
-safe_setegid(const char *file, const int lineno, void (*cleanup_fn)(void),
- gid_t egid)
+int
+safe_setegid(const char *file, const int lineno, void (*cleanup_fn) (void),
+ gid_t egid)
{
int rval;
rval = setegid(egid);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "setegid failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "setegid failed at %s:%d",
+ file, lineno);
return (rval);
}
int
-safe_seteuid(const char *file, const int lineno, void (*cleanup_fn)(void),
- uid_t euid)
+safe_seteuid(const char *file, const int lineno, void (*cleanup_fn) (void),
+ uid_t euid)
{
int rval;
rval = seteuid(euid);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "seteuid failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "seteuid failed at %s:%d",
+ file, lineno);
return (rval);
}
int
-safe_setgid(const char *file, const int lineno, void (*cleanup_fn)(void),
- gid_t gid)
+safe_setgid(const char *file, const int lineno, void (*cleanup_fn) (void),
+ gid_t gid)
{
int rval;
rval = setgid(gid);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "setgid failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "setgid failed at %s:%d",
+ file, lineno);
return (rval);
}
int
-safe_setuid(const char *file, const int lineno, void (*cleanup_fn)(void),
- uid_t uid)
+safe_setuid(const char *file, const int lineno, void (*cleanup_fn) (void),
+ uid_t uid)
{
int rval;
rval = setuid(uid);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "setuid failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "setuid failed at %s:%d",
+ file, lineno);
return (rval);
}
int
-safe_unlink(const char *file, const int lineno, void (*cleanup_fn)(void),
- const char *pathname)
+safe_unlink(const char *file, const int lineno, void (*cleanup_fn) (void),
+ const char *pathname)
{
int rval;
rval = unlink(pathname);
if (rval == -1)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "unlink failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "unlink failed at %s:%d",
+ file, lineno);
return (rval);
}
ssize_t
-safe_write(const char *file, const int lineno, void (cleanup_fn)(void),
- char len_strict, int fildes, const void *buf, size_t nbyte)
+safe_write(const char *file, const int lineno, void (cleanup_fn) (void),
+ char len_strict, int fildes, const void *buf, size_t nbyte)
{
ssize_t rval;
rval = write(fildes, buf, nbyte);
if ((len_strict == 0 && rval == -1) || rval != nbyte)
- tst_brkm(TBROK|TERRNO, cleanup_fn, "write failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "write failed at %s:%d",
+ file, lineno);
return (rval);
}
int safe_ftruncate(const char *file, const int lineno,
- void (cleanup_fn)(void), int fd, off_t length)
+ void (cleanup_fn) (void), int fd, off_t length)
{
int rval;
rval = ftruncate(fd, length);
if (rval == -1) {
- tst_brkm(TBROK|TERRNO, cleanup_fn, "ftruncate failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn,
+ "ftruncate failed at %s:%d", file, lineno);
}
return rval;
}
int safe_truncate(const char *file, const int lineno,
- void (cleanup_fn)(void), const char *path, off_t length)
+ void (cleanup_fn) (void), const char *path, off_t length)
{
int rval;
rval = truncate(path, length);
if (rval == -1) {
- tst_brkm(TBROK|TERRNO, cleanup_fn, "truncate failed at %s:%d",
- file, lineno);
+ tst_brkm(TBROK | TERRNO, cleanup_fn, "truncate failed at %s:%d",
+ file, lineno);
}
return rval;
}
long safe_strtol(const char *file, const int lineno,
- void (cleanup_fn)(void), char *str, long min, long max)
+ void (cleanup_fn) (void), char *str, long min, long max)
{
long rval;
char *endptr;
@@ -350,8 +345,8 @@
errno = 0;
rval = strtol(str, &endptr, 10);
if ((errno == ERANGE && (rval == LONG_MAX || rval == LONG_MIN))
- || (errno != 0 && rval == 0))
- tst_brkm(TBROK|TERRNO, cleanup_fn,
+ || (errno != 0 && rval == 0))
+ tst_brkm(TBROK | TERRNO, cleanup_fn,
"strtol failed at %s:%d", file, lineno);
if (rval > max || rval < min)
tst_brkm(TBROK, cleanup_fn,
@@ -364,8 +359,9 @@
return rval;
}
-unsigned long safe_strtoul(const char *file, const int lineno, void (cleanup_fn)(void),
- char *str, unsigned long min, unsigned long max)
+unsigned long safe_strtoul(const char *file, const int lineno,
+ void (cleanup_fn) (void), char *str,
+ unsigned long min, unsigned long max)
{
unsigned long rval;
char *endptr;
@@ -373,22 +369,22 @@
errno = 0;
rval = strtoul(str, &endptr, 10);
if ((errno == ERANGE && rval == ULONG_MAX)
- || (errno != 0 && rval == 0))
- tst_brkm(TBROK|TERRNO, cleanup_fn,
- "strtol failed at %s:%d", file, lineno);
+ || (errno != 0 && rval == 0))
+ tst_brkm(TBROK | TERRNO, cleanup_fn,
+ "strtol failed at %s:%d", file, lineno);
if (rval > max || rval < min)
tst_brkm(TBROK, cleanup_fn,
- "converted value out of range (%lu - %lu at %s:%d",
- min, max, file, lineno);
+ "converted value out of range (%lu - %lu at %s:%d",
+ min, max, file, lineno);
if (endptr == str || (*endptr != '\0' && *endptr != '\n'))
tst_brkm(TBROK, cleanup_fn,
- "Invalid value: '%s' at %s:%d", str, file, lineno);
+ "Invalid value: '%s' at %s:%d", str, file, lineno);
return rval;
}
long safe_sysconf(const char *file, const int lineno,
- void (cleanup_fn)(void), int name)
+ void (cleanup_fn) (void), int name)
{
long rval;
errno = 0;
@@ -397,7 +393,7 @@
if (rval == -1) {
if (errno == EINVAL)
- tst_brkm(TBROK|TERRNO, cleanup_fn,
+ tst_brkm(TBROK | TERRNO, cleanup_fn,
"sysconf failed at %s:%d", file, lineno);
else
tst_resm(TINFO, "queried option is not available"