From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Price <anprice@redhat.com>
Date: Mon, 17 Dec 2012 11:09:04 +0000
Subject: [Cluster-devel] [PATCH] gfs2-utils: Fix build warnings in
 Fedora 18
In-Reply-To: <1355524236-4829-1-git-send-email-kais58@sucs.org>
References: <1355524236-4829-1-git-send-email-kais58@sucs.org>
Message-ID: <50CEFD50.7070205@redhat.com>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Hi Callum,

On 14/12/12 22:30, Callum Massey wrote:
> Dropped the * from gzFile *gzin_fd because gzFile is no longer defined
> as a void pointer.
>
> Rearranged incldes in libgfs2/lang.c so parser.h gets passed struct
> lgfs2_lang_state correctly.
>
> Signed-off-by: Callum Massey <kais58@sucs.org>

This is now in gfs2-utils.git master.

> ---
>   gfs2/edit/savemeta.c | 2 +-
>   gfs2/libgfs2/lang.c  | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c
> index f35c35d..cfe18eb 100644
> --- a/gfs2/edit/savemeta.c
> +++ b/gfs2/edit/savemeta.c
> @@ -831,7 +831,7 @@ void savemeta(char *out_fn, int saveoption, int gziplevel)
>   	exit(0);
>   }
>
> -static int restore_data(int fd, gzFile *gzin_fd, int printblocksonly,
> +static int restore_data(int fd, gzFile gzin_fd, int printblocksonly,
>   			int find_highblk)

Nice catch!

Thanks,

Andy

>   {
>   	size_t rs;
> diff --git a/gfs2/libgfs2/lang.c b/gfs2/libgfs2/lang.c
> index ad9382f..40a4355 100644
> --- a/gfs2/libgfs2/lang.c
> +++ b/gfs2/libgfs2/lang.c
> @@ -7,8 +7,8 @@
>   #include <limits.h>
>   #include <ctype.h>
>
> -#include "parser.h"
>   #include "lang.h"
> +#include "parser.h"
>
>   const char* ast_type_string[] = {
>   	[AST_NONE] = "NONE",
>