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/self_exec.c b/lib/self_exec.c
index 31ccdaa..06af313 100644
--- a/lib/self_exec.c
+++ b/lib/self_exec.c
@@ -22,7 +22,7 @@
* 55 Byward Market Square, 2nd Floor North, Ottawa, ON K1N 9C3, Canada
*/
-#define _GNU_SOURCE /* for asprintf */
+#define _GNU_SOURCE /* for asprintf */
#include "config.h"
@@ -34,176 +34,187 @@
#include "test.h"
/* Set from parse_opts.c: */
-char *child_args; /* Arguments to child when -C is used */
+char *child_args; /* Arguments to child when -C is used */
-static char *start_cwd; /* Stores the starting directory for self_exec */
+static char *start_cwd; /* Stores the starting directory for self_exec */
int asprintf(char **app, const char *fmt, ...)
{
- va_list ptr;
- int rv;
- char *p;
+ va_list ptr;
+ int rv;
+ char *p;
- /*
- * First iteration - find out size of buffer required and allocate it.
- */
- va_start(ptr, fmt);
- rv = vsnprintf(NULL, 0, fmt, ptr);
- va_end(ptr);
+ /*
+ * First iteration - find out size of buffer required and allocate it.
+ */
+ va_start(ptr, fmt);
+ rv = vsnprintf(NULL, 0, fmt, ptr);
+ va_end(ptr);
- p = malloc(++rv); /* allocate the buffer */
- *app = p;
- if (!p) {
- return -1;
- }
+ p = malloc(++rv); /* allocate the buffer */
+ *app = p;
+ if (!p) {
+ return -1;
+ }
- /*
- * Second iteration - actually produce output.
- */
- va_start(ptr, fmt);
- rv = vsnprintf(p, rv, fmt, ptr);
- va_end(ptr);
+ /*
+ * Second iteration - actually produce output.
+ */
+ va_start(ptr, fmt);
+ rv = vsnprintf(p, rv, fmt, ptr);
+ va_end(ptr);
- return rv;
+ return rv;
}
-void
-maybe_run_child(void (*child)(), char *fmt, ...)
+void maybe_run_child(void (*child) (), char *fmt, ...)
{
- va_list ap;
- char *child_dir;
- char *p, *tok;
- int *iptr, i, j;
- char *s;
- char **sptr;
- char *endptr;
+ va_list ap;
+ char *child_dir;
+ char *p, *tok;
+ int *iptr, i, j;
+ char *s;
+ char **sptr;
+ char *endptr;
- /* Store the current directory for later use. */
- start_cwd = getcwd(NULL, 0);
+ /* Store the current directory for later use. */
+ start_cwd = getcwd(NULL, 0);
- if (child_args) {
- char *args = strdup(child_args);
+ if (child_args) {
+ char *args = strdup(child_args);
- child_dir = strtok(args, ",");
- if (strlen(child_dir) == 0) {
- tst_brkm(TBROK, NULL, "Could not get directory from -C option");
+ child_dir = strtok(args, ",");
+ if (strlen(child_dir) == 0) {
+ tst_brkm(TBROK, NULL,
+ "Could not get directory from -C option");
+ }
+
+ va_start(ap, fmt);
+
+ for (p = fmt; *p; p++) {
+ tok = strtok(NULL, ",");
+ if (!tok || strlen(tok) == 0) {
+ tst_brkm(TBROK, NULL,
+ "Invalid argument to -C option");
+ }
+
+ switch (*p) {
+ case 'd':
+ iptr = va_arg(ap, int *);
+ i = strtol(tok, &endptr, 10);
+ if (*endptr != '\0') {
+ tst_brkm(TBROK, NULL,
+ "Invalid argument to -C option");
+ }
+ *iptr = i;
+ break;
+ case 'n':
+ j = va_arg(ap, int);
+ i = strtol(tok, &endptr, 10);
+ if (*endptr != '\0') {
+ tst_brkm(TBROK, NULL,
+ "Invalid argument to -C option");
+ }
+ if (j != i) {
+ va_end(ap);
+ return;
+ }
+ break;
+ case 's':
+ s = va_arg(ap, char *);
+ if (!strncpy(s, tok, strlen(tok) + 1)) {
+ tst_brkm(TBROK, NULL,
+ "Could not strncpy for -C option");
+ }
+ break;
+ case 'S':
+ sptr = va_arg(ap, char **);
+ *sptr = strdup(tok);
+ if (!*sptr) {
+ tst_brkm(TBROK, NULL,
+ "Could not strdup for -C option");
+ }
+ break;
+ default:
+ tst_brkm(TBROK, NULL,
+ "Format string option %c not implemented",
+ *p);
+ break;
+ }
+ }
+
+ va_end(ap);
+
+ if (chdir(child_dir) < 0)
+ tst_brkm(TBROK, NULL,
+ "Could not change to %s for child", child_dir);
+
+ (*child) ();
+ tst_resm(TWARN, "Child function returned unexpectedly");
+ /* Exit here? or exit silently? */
+ }
+}
+
+int self_exec(char *argv0, char *fmt, ...)
+{
+ va_list ap;
+ char *p;
+ char *tmp_cwd;
+ char *arg;
+ int ival;
+ char *str;
+
+ if ((tmp_cwd = getcwd(NULL, 0)) == NULL) {
+ tst_resm(TBROK, "Could not getcwd()");
+ return -1;
+ }
+
+ arg = strdup(tmp_cwd);
+
+ if ((arg = strdup(tmp_cwd)) == NULL) {
+ tst_resm(TBROK, "Could not produce self_exec string");
+ return -1;
}
va_start(ap, fmt);
for (p = fmt; *p; p++) {
- tok = strtok(NULL, ",");
- if (!tok || strlen(tok) == 0) {
- tst_brkm(TBROK, NULL, "Invalid argument to -C option");
- }
-
- switch (*p) {
- case 'd':
- iptr = va_arg(ap, int *);
- i = strtol(tok, &endptr, 10);
- if (*endptr != '\0') {
- tst_brkm(TBROK, NULL, "Invalid argument to -C option");
+ switch (*p) {
+ case 'd':
+ case 'n':
+ ival = va_arg(ap, int);
+ if (asprintf(&arg, "%s,%d", arg, ival) < 0) {
+ tst_resm(TBROK,
+ "Could not produce self_exec string");
+ return -1;
+ }
+ break;
+ case 's':
+ case 'S':
+ str = va_arg(ap, char *);
+ if (asprintf(&arg, "%s,%s", arg, str) < 0) {
+ tst_resm(TBROK,
+ "Could not produce self_exec string");
+ return -1;
+ }
+ break;
+ default:
+ tst_resm(TBROK,
+ "Format string option %c not implemented", *p);
+ return -1;
+ break;
}
- *iptr = i;
- break;
- case 'n':
- j = va_arg(ap, int);
- i = strtol(tok, &endptr, 10);
- if (*endptr != '\0') {
- tst_brkm(TBROK, NULL, "Invalid argument to -C option");
- }
- if (j != i) {
- va_end(ap);
- return;
- }
- break;
- case 's':
- s = va_arg(ap, char *);
- if (!strncpy(s, tok, strlen(tok)+1)) {
- tst_brkm(TBROK, NULL, "Could not strncpy for -C option");
- }
- break;
- case 'S':
- sptr = va_arg(ap, char **);
- *sptr = strdup(tok);
- if (!*sptr) {
- tst_brkm(TBROK, NULL, "Could not strdup for -C option");
- }
- break;
- default:
- tst_brkm(TBROK, NULL, "Format string option %c not implemented", *p);
- break;
- }
}
va_end(ap);
- if (chdir(child_dir) < 0)
- tst_brkm(TBROK, NULL, "Could not change to %s for child", child_dir);
-
- (*child)();
- tst_resm(TWARN, "Child function returned unexpectedly");
- /* Exit here? or exit silently? */
- }
-}
-
-int
-self_exec(char *argv0, char *fmt, ...)
-{
- va_list ap;
- char *p;
- char *tmp_cwd;
- char *arg;
- int ival;
- char *str;
-
- if ((tmp_cwd = getcwd(NULL, 0)) == NULL) {
- tst_resm(TBROK, "Could not getcwd()");
- return -1;
- }
-
- arg = strdup( tmp_cwd );
-
- if (( arg = strdup( tmp_cwd )) == NULL) {
- tst_resm(TBROK, "Could not produce self_exec string");
- return -1;
- }
-
- va_start(ap, fmt);
-
- for (p = fmt; *p; p++) {
- switch (*p) {
- case 'd':
- case 'n':
- ival = va_arg(ap, int);
- if (asprintf(&arg, "%s,%d", arg, ival) < 0) {
- tst_resm(TBROK, "Could not produce self_exec string");
+ if (chdir(start_cwd) < 0) {
+ tst_resm(TBROK, "Could not change to %s for self_exec",
+ start_cwd);
return -1;
- }
- break;
- case 's':
- case 'S':
- str = va_arg(ap, char *);
- if (asprintf(&arg, "%s,%s", arg, str) < 0) {
- tst_resm(TBROK, "Could not produce self_exec string");
- return -1;
- }
- break;
- default:
- tst_resm(TBROK, "Format string option %c not implemented", *p);
- return -1;
- break;
}
- }
- va_end(ap);
-
- if (chdir(start_cwd) < 0) {
- tst_resm(TBROK, "Could not change to %s for self_exec", start_cwd);
- return -1;
- }
-
- return execlp(argv0, argv0, "-C", arg, (char *) NULL);
+ return execlp(argv0, argv0, "-C", arg, (char *)NULL);
}
#endif /* UCLINUX */