From: Junio C Hamano <gitster@pobox•com>
To: Karthik Nayak <karthik.188@gmail•com>
Cc: git@vger•kernel.org, sunshine@sunshineco•com
Subject: Re: [PATCH v3 11/15] ref-filter: convert variable 'width' to an unsigned int
Date: Tue, 05 Jan 2016 13:12:32 -0800 [thread overview]
Message-ID: <xmqqmvsjivcv.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1451980994-26865-12-git-send-email-Karthik.188@gmail.com> (Karthik Nayak's message of "Tue, 5 Jan 2016 13:33:10 +0530")
Karthik Nayak <karthik.188@gmail•com> writes:
> In align_atom_parser() the 'width' variable is an int, which requires
> an explicit type conversion when used in strtoul_ui(). Hence make it
> an unsigned int.
>
> Helped-by: Eric Sunshine <sunshine@sunshineco•com>
> Signed-off-by: Karthik Nayak <Karthik.188@gmail•com>
> ---
Shouldn't this be done in [09/15] from the beginning? As it's not
like [09/15] was a pure code movement, this step looks like "Oops,
I screwed up earlier, and here is a fixup".
If we want to do this as a separate step, it would be easier to
follow if it is done _before_ 09/15 to the original of the code
movement, I think.
> ref-filter.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/ref-filter.c b/ref-filter.c
> index ccad4c3..4f623a0 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -90,7 +90,7 @@ static void align_atom_parser(struct used_atom *atom)
> struct align *align = &atom->u.align;
> const char *buf = NULL;
> struct strbuf **s, **to_free;
> - int width = -1;
> + unsigned int width = ~0U;
>
> if (!match_atom_name(atom->name, "align", &buf))
> die("BUG: parsing non-'align'");
> @@ -104,7 +104,7 @@ static void align_atom_parser(struct used_atom *atom)
> int position;
> buf = s[0]->buf;
>
> - if (!strtoul_ui(buf, 10, (unsigned int *)&width))
> + if (!strtoul_ui(buf, 10, &width))
> ;
> else if ((position = parse_align_position(buf)) >= 0)
> align->position = position;
> @@ -113,7 +113,7 @@ static void align_atom_parser(struct used_atom *atom)
> s++;
> }
>
> - if (width < 0)
> + if (width == ~0U)
> die(_("positive width expected with the %%(align) atom"));
> align->width = width;
> strbuf_list_free(to_free);
next prev parent reply other threads:[~2016-01-05 21:12 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-05 8:02 [PATCH v3 00/15] ref-filter: use parsing functions Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 01/15] strbuf: introduce strbuf_split_str_omit_term() Karthik Nayak
2016-01-05 19:24 ` Junio C Hamano
2016-01-06 7:27 ` Karthik Nayak
2016-01-21 19:47 ` Eric Sunshine
2016-01-25 6:12 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 02/15] ref-filter: use strbuf_split_str_omit_term() Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 03/15] ref-filter: bump 'used_atom' and related code to the top Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 04/15] ref-filter: introduce struct used_atom Karthik Nayak
2016-01-21 19:04 ` Eric Sunshine
2016-01-25 6:13 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 05/15] ref-filter: introduce parsing functions for each valid atom Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 06/15] ref-fitler: bump match_atom() name to the top Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 07/15] ref-filter: skip deref specifier in match_atom_name() Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 08/15] ref-filter: introduce color_atom_parser() Karthik Nayak
2016-01-05 20:49 ` Junio C Hamano
2016-01-06 7:52 ` Karthik Nayak
2016-01-05 21:06 ` Junio C Hamano
2016-01-06 10:16 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 09/15] ref-filter: introduce align_atom_parser() Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 10/15] ref-filter: introduce parse_align_position() Karthik Nayak
2016-01-25 21:49 ` Eric Sunshine
2016-01-26 11:34 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 11/15] ref-filter: convert variable 'width' to an unsigned int Karthik Nayak
2016-01-05 21:12 ` Junio C Hamano [this message]
2016-01-06 10:17 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 12/15] ref-filter: align: introduce long-form syntax Karthik Nayak
2016-01-25 22:58 ` Eric Sunshine
2016-01-25 23:45 ` Junio C Hamano
2016-01-26 9:40 ` Karthik Nayak
2016-01-26 9:30 ` Karthik Nayak
2016-01-26 5:16 ` Christian Couder
2016-01-26 9:39 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 13/15] ref-filter: introduce remote_ref_atom_parser() Karthik Nayak
2016-01-26 0:28 ` Eric Sunshine
2016-01-26 10:02 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 14/15] ref-filter: introduce contents_atom_parser() Karthik Nayak
2016-01-05 21:22 ` Junio C Hamano
2016-01-06 18:22 ` Karthik Nayak
2016-01-07 18:04 ` Junio C Hamano
2016-01-07 20:03 ` Karthik Nayak
2016-01-05 8:03 ` [PATCH v3 15/15] ref-filter: introduce objectname_atom_parser() Karthik Nayak
2016-01-05 21:31 ` Junio C Hamano
2016-01-06 18:27 ` Karthik Nayak
2016-01-06 21:14 ` [PATCH v3 00/15] ref-filter: use parsing functions Eric Sunshine
2016-01-07 14:25 ` Karthik Nayak
2016-01-07 18:43 ` Junio C Hamano
2016-01-07 20:20 ` Karthik Nayak
2016-01-07 20:36 ` Eric Sunshine
2016-01-07 20:44 ` Karthik Nayak
2016-01-07 21:28 ` Junio C Hamano
2016-01-09 9:00 ` Karthik Nayak
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=xmqqmvsjivcv.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=karthik.188@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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