From: Eryu Guan <guaneryu@gmail.com>
To: Kusanagi Kouichi <slash@ac.auone-net.jp>
Cc: fstests@vger.kernel.org
Subject: Re: [PATCH] common/filter: Don't use strtonum
Date: Sun, 8 Dec 2019 23:50:26 +0800 [thread overview]
Message-ID: <20191208155026.GM8664@desktop> (raw)
In-Reply-To: <20191202094302206.XGZM.12759.ppp.dion.ne.jp@dmta0004.auone-net.jp>
On Mon, Dec 02, 2019 at 06:43:01PM +0900, Kusanagi Kouichi wrote:
> It's a gawk extension and not needed. Make tests pass with non-gawk.
gawk is listed in README as one of the "prerequisite packages", so I
think using gawk extention is fine. But if we could get rid of it
easily, that will be better.
Thanks for the fix!
Eryu
>
> Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
> ---
> common/filter | 23 +++++++++++++----------
> tests/generic/386 | 2 +-
> tests/xfs/009 | 10 +++++-----
> 3 files changed, 19 insertions(+), 16 deletions(-)
>
> diff --git a/common/filter b/common/filter
> index 2477f386..e02cc0b9 100644
> --- a/common/filter
> +++ b/common/filter
> @@ -241,9 +241,9 @@ _filter_xfs_io_units_modified()
> /wrote/ {
> split($2, bytes, "/")
>
> - bytes_written = strtonum(bytes[1])
> + bytes_written = bytes[1]
>
> - offset = strtonum($NF)
> + offset = $NF
>
> unit_start = offset / unit_size
> unit_start = int(unit_start)
> @@ -487,14 +487,17 @@ _filter_busy_mount()
> _filter_od()
> {
> BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT)
> - $AWK_PROG -v block_size=$BLOCK_SIZE '
> - /^[0-9]+/ {
> - offset = strtonum("0"$1);
> - $1 = sprintf("%o", offset / block_size);
> - print $0;
> - }
> - /\*/
> - '
> + while read line
> + do
> + if test "$line" = '*'
> + then
> + printf '*\n'
> + continue
> + fi
> +
> + offset="${line%% *}"
> + printf '%o%s\n' $((offset / BLOCK_SIZE)) "${line#$offset}"
> + done
> }
>
> # Remove quotes from failed mknod calls. Starting with Coreutils v8.25,
> diff --git a/tests/generic/386 b/tests/generic/386
> index 462c5869..ba6e654e 100755
> --- a/tests/generic/386
> +++ b/tests/generic/386
> @@ -75,7 +75,7 @@ _filter_quota_rpt() {
> # This function parses the human-readable values produced
> # by xfs_quota output
> function byte_size(value, result) {
> - result = strtonum(value);
> + result = value;
> unit = value;
> gsub("[0-9][0-9]*", "", unit);
> shift = index("KMGTPE", unit);
> diff --git a/tests/xfs/009 b/tests/xfs/009
> index 6a31514c..956c4772 100755
> --- a/tests/xfs/009
> +++ b/tests/xfs/009
> @@ -66,12 +66,12 @@ _block_filter()
>
> /CMD/ {
> split($3, off, "=")
> - offset = strtonum(off[2])
> + offset = off[2]
> if (offset != -1)
> offset = offset / bsize
>
> split($4, len, "=")
> - nr_blocks = strtonum(len[2])
> + nr_blocks = len[2]
> if (nr_blocks != -1)
> nr_blocks = nr_blocks / bsize
>
> @@ -82,13 +82,13 @@ _block_filter()
>
> /MAP/ {
> split($2, off, "=")
> - offset = strtonum(off[2])
> + offset = off[2]
> if (offset != -1)
> offset = offset / bsize
>
> split($3, len, "=")
>
> - nr_blocks = strtonum(len[2])
> + nr_blocks = len[2]
>
> if (nr_blocks != -1)
> nr_blocks = nr_blocks / bsize
> @@ -100,7 +100,7 @@ _block_filter()
>
> /TRUNCATE/ {
> split($2, off, "=")
> - offset = strtonum(off[2]) / bsize
> + offset = off[2] / bsize
>
> printf(" %s off=%s\n", $1, offset)
>
> --
> 2.24.0
>
next prev parent reply other threads:[~2019-12-08 15:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-02 9:43 [PATCH] common/filter: Don't use strtonum Kusanagi Kouichi
2019-12-08 15:50 ` Eryu Guan [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-29 7:21 Kusanagi Kouichi
2019-12-01 15:47 ` Eryu Guan
2019-12-02 9:34 ` Kusanagi Kouichi
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=20191208155026.GM8664@desktop \
--to=guaneryu@gmail.com \
--cc=fstests@vger.kernel.org \
--cc=slash@ac.auone-net.jp \
/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: link
Be 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 NNTP newsgroup(s).