gfs2-utils: Fix build warnings in Fedora 18

PATCH New Callum Massey 2 participants 2 messages Dec 14, 2012 – Dec 17, 2012

lore

Share & tools

lore

Callum Massey

author

2012-12-14 22:30 UTC #0 lore raw

PATCH 1/1 gfs2-utils: Fix build warnings in Fedora 18

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 <[email protected]>

---
 gfs2/edit/savemeta.c | 2 +-
 gfs2/libgfs2/lang.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

gfs2/edit/savemeta.c +1 -1

index f35c35d..cfe18eb 100644
@@ -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)
 {
 	size_t rs;

gfs2/libgfs2/lang.c +1 -1

index ad9382f..40a4355 100644
@@ -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",

Signature · 1 line

1.8.0.2

Andrew Price

2012-12-17 11:09 UTC #1 lore raw

PATCH 1/1 gfs2-utils: Fix build warnings in Fedora 18

Hi Callum,

Quoted 7 lines · Callum Massey

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 <[email protected]>

This is now in gfs2-utils.git master.

Quoted 10 lines

---
  gfs2/edit/savemeta.c | 2 +-
  gfs2/libgfs2/lang.c  | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

gfs2/edit/savemeta.c +0 -0

index f35c35d..cfe18eb 100644

gfs2/edit/savemeta.c void savemeta(char *out_fn, int saveoption, int gziplevel) · line 835

Quoted 6 lines

gfs2/edit/savemeta.c +1 -1

@@ -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

Quoted 17 lines

gfs2/edit/savemeta.c +0 -0

  {
  	size_t rs;

gfs2/libgfs2/lang.c +1 -1

index ad9382f..40a4355 100644
@@ -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",