Re: [PATCH v4 1/3] pretty: make it easier to add new formats

From

Jonathan Nieder <jrnieder@gmail.com>

Date

May 2, 2010, 11:22 UTC

Message-ID

<20100502112231.GA2806@progeny.tock>

In-Reply-To

<1272798044-10487-2-git-send-email-wmpalmer@gmail.com>

Will Palmer wrote:

> As the first step towards creating aliases, we make it easier to add new
> formats to the list of builtin formats.

[...]

> +	commit_formats_len = ARRAY_SIZE(builtin_formats);
> +	commit_formats = xcalloc(commit_formats_len,
> +				 sizeof(*builtin_formats));
> +	memcpy(commit_formats, builtin_formats,
> +	       sizeof(*builtin_formats)*ARRAY_SIZE(builtin_formats));
> +}

nitpick: it should be safe to s/xcalloc/xmalloc/

With or without such a change, the patch looks good to me.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

Thanks for the clean patch.

diff --git a/pretty.c b/pretty.c
index ecac8f5..41c0145 100644
--- a/pretty.c
+++ b/pretty.c
@@ -40,7 +40,7 @@ static void setup_commit_formats(void)
 		{ "oneline",	CMIT_FMT_ONELINE,	1 }
 	};
 	commit_formats_len = ARRAY_SIZE(builtin_formats);
-	commit_formats = xcalloc(commit_formats_len,
+	commit_formats = xmalloc(commit_formats_len *
 				 sizeof(*builtin_formats));
 	memcpy(commit_formats, builtin_formats,
 	       sizeof(*builtin_formats)*ARRAY_SIZE(builtin_formats));