At Sat, 18 Jun 2011 19:28:49 +0100,
Chris Webb wrote:
>
> Signed-off-by: Chris Webb <[email protected]>
> ---
> I'm pretty sure this is a typo and is meant to be get_vdi_info isn't it?
Yes, exactly. :) Applied.
Thanks,
Kazutaka
>
> This patch applies on top of the other ones I've submitted, but I can rebase
> to before them if you prefer.
>
>
> collie/collie.c | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/collie/collie.c b/collie/collie.c
> index 5b7f091..853d8b6 100644
> --- a/collie/collie.c
> +++ b/collie/collie.c
> @@ -365,7 +365,7 @@ static int parse_vdi(vdi_parser_func_t func, size_t size,
> void *data)
> return 0;
> }
>
> -struct get_vid_info {
> +struct get_vdi_info {
> char *name;
> char *tag;
> uint32_t vid;
> @@ -381,7 +381,7 @@ static void print_vdi_list(uint32_t vid, char *name, char
> *tag, uint32_t snapid,
> time_t ti;
> struct tm tm;
> char dbuf[128];
> - struct get_vid_info *info = data;
> + struct get_vdi_info *info = data;
>
> if (info && strcmp(name, info->name) != 0)
> return;
> @@ -492,7 +492,7 @@ static void cal_total_vdi_size(uint32_t vid, char *name,
> char * tag,
> static void get_oid(uint32_t vid, char *name, char *tag, uint32_t snapid,
> uint32_t flags, struct sheepdog_inode *i, void *data)
> {
> - struct get_vid_info *info = data;
> + struct get_vdi_info *info = data;
>
> if (info->name) {
> if (info->tag) {
> @@ -731,7 +731,7 @@ static int vdi_list(int argc, char **argv)
> }
>
> if (vdiname) {
> - struct get_vid_info info;
> + struct get_vdi_info info;
> memset(&info, 0, sizeof(info));
> info.name = vdiname;
> parse_vdi(print_vdi_list, SD_INODE_SIZE, &info);
> @@ -818,7 +818,7 @@ static int vdi_object(int argc, char **argv)
> char *vdiname = argv[optind];
> unsigned idx = vdi_cmd_data.index;
> int ret;
> - struct get_vid_info info;
> + struct get_vdi_info info;
> uint32_t vid;
>
> memset(&info, 0, sizeof(info));
> --
> 1.7.4.1
>
> --
> sheepdog mailing list
> [email protected]
> http://lists.wpkg.org/mailman/listinfo/sheepdog
--
sheepdog mailing list
[email protected]
http://lists.wpkg.org/mailman/listinfo/sheepdog
