[PATCH] refs.c: let fprintf handle the formatting

Stefan Beller· Dec 5, 2014, 19:53 UTC · lore

Instead of calculating, whether to put a plus or minus sign, offload the responsibilty to the fprintf function.

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 refs.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Show changes to refs.c +2 −5

diff --git a/refs.c b/refs.c
index 40c5591..1147216 100644
--- a/refs.c
+++ b/refs.c
@@ -3972,12 +3972,9 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
 			printf("prune %s", message);
 	} else {
 		if (cb->newlog) {
-			char sign = (tz < 0) ? '-' : '+';
-			int zone = (tz < 0) ? (-tz) : tz;
-			fprintf(cb->newlog, "%s %s %s %lu %c%04d\t%s",
+			fprintf(cb->newlog, "%s %s %s %lu %+05d\t%s",
 				sha1_to_hex(osha1), sha1_to_hex(nsha1),
-				email, timestamp, sign, zone,
-				message);
+				email, timestamp, tz, message);
 			hashcpy(cb->last_kept_sha1, nsha1);
 		}
 		if (cb->flags & EXPIRE_REFLOGS_VERBOSE)

-- 
2.2.0

Stefan Beller· Dec 5, 2014, 19:54 UTC · re: Stefan Beller · lore

Re: [PATCH] refs.c: let fprintf handle the formatting

On Fri, Dec 5, 2014 at 11:53 AM, Stefan Beller <sbeller@google.com> wrote:

Show 5 quoted lines

> Instead of calculating, whether to put a plus or minus sign, offload
> the responsibilty to the fprintf function.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---

Ah! I forgot the --notes switch when sending out the email:

    Michael,

    please queue this on top of your reflog series.
    More to come.

    Thanks,
    Stefan

Show 25 quoted lines

>  refs.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index 40c5591..1147216 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3972,12 +3972,9 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
>                         printf("prune %s", message);
>         } else {
>                 if (cb->newlog) {
> -                       char sign = (tz < 0) ? '-' : '+';
> -                       int zone = (tz < 0) ? (-tz) : tz;
> -                       fprintf(cb->newlog, "%s %s %s %lu %c%04d\t%s",
> +                       fprintf(cb->newlog, "%s %s %s %lu %+05d\t%s",
>                                 sha1_to_hex(osha1), sha1_to_hex(nsha1),
> -                               email, timestamp, sign, zone,
> -                               message);
> +                               email, timestamp, tz, message);
>                         hashcpy(cb->last_kept_sha1, nsha1);
>                 }
>                 if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
> --
> 2.2.0
>

patchrefs.c: let fprintf handle the formatting