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: Sat, 24 Sep 2011 21:12:00 -0000 [thread overview] Message-ID: <20110924211236.3175.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2011-09-24 21:12:35 Modified files: test/lib : harness.c Log message: Avoid sending garbage to terminal in verbose mode. When read in drain returned <0 value, terminal content has been trashed. Remove unneeded memset() and use whole buffer. Free readbuf before exit (valgrind). Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/lib/harness.c.diff?cvsroot=lvm2&r1=1.7&r2=1.8 --- LVM2/test/lib/harness.c 2011/03/10 14:47:22 1.7 +++ LVM2/test/lib/harness.c 2011/09/24 21:12:35 1.8 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Red Hat, Inc. All rights reserved. + * Copyright (C) 2010-2011 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. * @@ -126,14 +126,13 @@ static void drain(void) { int sz; char buf[2048]; - memset(buf, 0, 2048); while (1) { - sz = read(fds[1], buf, 2047); - if (verbose) - write(1, buf, sz); + sz = read(fds[1], buf, sizeof(buf)); if (sz <= 0) return; + if (verbose) + write(1, buf, sz); if (readbuf_used + sz >= readbuf_sz) { readbuf_sz = readbuf_sz ? 2 * readbuf_sz : 4096; readbuf = realloc(readbuf, readbuf_sz); @@ -291,5 +290,7 @@ return s.nfailed > 0 || die; } + free(readbuf); + return die; }
next reply other threads:[~2011-09-24 21:12 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-09-24 21:12 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-03-10 14:47 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=20110924211236.3175.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).