public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/test/lib harness.c Date: Thu, 10 Mar 2011 14:47:00 -0000 [thread overview] Message-ID: <20110310144725.22748.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2011-03-10 14:47:23 Modified files: test/lib : harness.c Log message: Indent spaces to tabs Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/lib/harness.c.diff?cvsroot=lvm2&r1=1.6&r2=1.7 --- LVM2/test/lib/harness.c 2011/01/28 16:05:38 1.6 +++ LVM2/test/lib/harness.c 2011/03/10 14:47:22 1.7 @@ -44,8 +44,8 @@ static int verbose = 0; struct subst { - const char *key; - char *value; + const char *key; + char *value; }; static struct subst subst[2]; @@ -62,52 +62,52 @@ } static int outline(char *buf, int start, int force) { - char *from = buf + start; - char *next = strchr(buf + start, '\n'); + char *from = buf + start; + char *next = strchr(buf + start, '\n'); - if (!next && !force) /* not a complete line yet... */ - return start; + if (!next && !force) /* not a complete line yet... */ + return start; - if (!next) - next = from + strlen(from); - else - ++next; - - if (!strncmp(from, "@TESTDIR=", 9)) { - subst[0].key = "@TESTDIR@"; - subst[0].value = strndup(from + 9, next - from - 9 - 1); - } else if (!strncmp(from, "@PREFIX=", 8)) { - subst[1].key = "@PREFIX@"; - subst[1].value = strndup(from + 8, next - from - 8 - 1); - } else { - char *line = strndup(from, next - from); - char *a = line, *b; - do { - int idx = -1; - int i; - b = line + strlen(line); - for ( i = 0; i < 2; ++i ) { - if (subst[i].key) { - // printf("trying: %s -> %s\n", subst[i].value, subst[i].key); - char *stop = strstr(a, subst[i].value); - if (stop && stop < b) { - idx = i; - b = stop; - } - } - } - fwrite(a, 1, b - a, stdout); - a = b; - - if ( idx >= 0 ) { - fprintf(stdout, "%s", subst[idx].key); - a += strlen(subst[idx].value); - } - } while (b < line + strlen(line)); - free(line); - } + if (!next) + next = from + strlen(from); + else + ++next; + + if (!strncmp(from, "@TESTDIR=", 9)) { + subst[0].key = "@TESTDIR@"; + subst[0].value = strndup(from + 9, next - from - 9 - 1); + } else if (!strncmp(from, "@PREFIX=", 8)) { + subst[1].key = "@PREFIX@"; + subst[1].value = strndup(from + 8, next - from - 8 - 1); + } else { + char *line = strndup(from, next - from); + char *a = line, *b; + do { + int idx = -1; + int i; + b = line + strlen(line); + for ( i = 0; i < 2; ++i ) { + if (subst[i].key) { + // printf("trying: %s -> %s\n", subst[i].value, subst[i].key); + char *stop = strstr(a, subst[i].value); + if (stop && stop < b) { + idx = i; + b = stop; + } + } + } + fwrite(a, 1, b - a, stdout); + a = b; + + if ( idx >= 0 ) { + fprintf(stdout, "%s", subst[idx].key); + a += strlen(subst[idx].value); + } + } while (b < line + strlen(line)); + free(line); + } - return next - buf + (force ? 0 : 1); + return next - buf + (force ? 0 : 1); } static void dump(void) { @@ -126,7 +126,7 @@ static void drain(void) { int sz; char buf[2048]; - memset(buf, 0, 2048); + memset(buf, 0, 2048); while (1) { sz = read(fds[1], buf, 2047); @@ -195,8 +195,8 @@ close(0); dup2(fds[0], 1); dup2(fds[0], 2); - close(fds[0]); - close(fds[1]); + close(fds[0]); + close(fds[1]); execlp("bash", "bash", f, NULL); perror("execlp"); fflush(stderr); @@ -257,11 +257,11 @@ } /* set up signal handlers */ - for (i = 0; i <= 32; ++i) { - if (i == SIGCHLD || i == SIGWINCH || i == SIGURG) - continue; - signal(i, handler); - } + for (i = 0; i <= 32; ++i) { + if (i == SIGCHLD || i == SIGWINCH || i == SIGURG) + continue; + signal(i, handler); + } /* run the tests */ for (i = 1; i < argc; ++ i) {
next reply other threads:[~2011-03-10 14:47 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-03-10 14:47 zkabelac [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-03-12 14:24 zkabelac 2012-02-15 1:31 mornfall 2011-11-07 17:02 mornfall 2011-09-24 21:12 zkabelac 2011-01-28 16:05 zkabelac 2011-01-13 15:03 zkabelac 2011-01-13 11:02 zkabelac 2011-01-10 13:25 zkabelac
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20110310144725.22748.qmail@sourceware.org \ --to=zkabelac@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).