[Libguestfs] [PATCH] btrfs: keep calloc and its error message match
Pino Toscano
ptoscano at redhat.com
Wed Jun 17 09:07:34 UTC 2015
On Wednesday 17 June 2015 10:44:09 Chen Hanxiao wrote:
> commit 3f4ba2e98d21746723d291939ccc2e1f1526aa6d
> left some error messages unchanged.
That commit was about converting a couple of malloc+memset to calloc,
not about replacing messages in other parts. Hence, this note is wrong.
>
> Signed-off-by: Chen Hanxiao <chenhanxiao at cn.fujitsu.com>
> ---
> daemon/btrfs.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/daemon/btrfs.c b/daemon/btrfs.c
> index 7b14bac..e8059db 100644
> --- a/daemon/btrfs.c
> +++ b/daemon/btrfs.c
> @@ -479,7 +479,7 @@ do_btrfs_subvolume_list (const mountable_t *fs)
> ret->guestfs_int_btrfssubvolume_list_val =
> calloc (nr_subvolumes, sizeof (struct guestfs_int_btrfssubvolume));
> if (ret->guestfs_int_btrfssubvolume_list_val == NULL) {
> - reply_with_perror ("malloc");
> + reply_with_perror ("calloc");
> goto error;
> }
>
> @@ -1292,7 +1292,7 @@ do_btrfs_qgroup_show (const char *path)
> ret->guestfs_int_btrfsqgroup_list_val =
> calloc (nr_qgroups, sizeof (struct guestfs_int_btrfsqgroup));
> if (ret->guestfs_int_btrfsqgroup_list_val == NULL) {
> - reply_with_perror ("malloc");
> + reply_with_perror ("calloc");
> goto error;
> }
LGTM, so pushed with the amend above to the commit message.
Thanks,
--
Pino Toscano
More information about the Libguestfs
mailing list