gfs2-utils: master - Fixed compiler warnings and errors that crept in.

[Bob Peterson <rpeterso at fedoraproject dot org>]

Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=4bda839ccd7ab919a12684e02551e334a41aecad
Commit:        4bda839ccd7ab919a12684e02551e334a41aecad
Parent:        6f706bf2d51acdf0c00e93f3f55baf49e4f5114c
Author:        Bob Peterson <rpeterso@redhat.com>
AuthorDate:    Fri Jun 19 15:57:25 2009 -0500
Committer:     Bob Peterson <rpeterso@redhat.com>
CommitterDate: Fri Jun 19 15:57:25 2009 -0500

Fixed compiler warnings and errors that crept in.

---
 gfs2/edit/gfs2hex.c     |    2 +-
 gfs2/edit/savemeta.c    |   11 ++++++-----
 gfs2/fsck/pass1.c       |    4 ++--
 gfs2/libgfs2/fs_bits.c  |    4 ++--
 gfs2/libgfs2/gfs2_log.c |    5 +++--
 gfs2/libgfs2/libgfs2.h  |    3 ++-
 gfs2/mkfs/main_mkfs.c   |    2 +-
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c
index 5cd05e3..72284e8 100644
--- a/gfs2/edit/gfs2hex.c
+++ b/gfs2/edit/gfs2hex.c
@@ -104,7 +104,7 @@ void eol(int col) /* end of line */
 	}
 }
 
-void print_gfs2(const char *fmt, ...)
+void __attribute__((format (printf, 1, 2))) print_gfs2(const char *fmt, ...)
 {
 	va_list args;
 	char string[NAME_MAX];
diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c
index 33c1f4c..d1b6984 100644
--- a/gfs2/edit/savemeta.c
+++ b/gfs2/edit/savemeta.c
@@ -261,7 +261,7 @@ static int save_block(int fd, int out_fd, uint64_t blk)
 /*
  * save_ea_block - save off an extended attribute block
  */
-void save_ea_block(int out_fd, struct gfs2_buffer_head *metabh)
+static void save_ea_block(int out_fd, struct gfs2_buffer_head *metabh)
 {
 	int i, e, ea_len = sbd.bsize;
 	struct gfs2_ea_header ea;
@@ -471,14 +471,14 @@ static void get_journal_inode_blocks(void)
 	}
 }
 
-int next_rg_freemeta(struct rgrp_list *rgd, uint64_t *block, int first)
+static int next_rg_freemeta(struct rgrp_list *rgd, uint64_t *nrfblock, int first)
 {
 	struct gfs2_bitmap *bits = NULL;
 	uint32_t length = rgd->ri.ri_length;
-	uint32_t blk = (first)? 0: (uint32_t)((*block+1)-rgd->ri.ri_data0);
+	uint32_t blk = (first)? 0: (uint32_t)((*nrfblock+1)-rgd->ri.ri_data0);
 	int i;
 
-	if(!first && (*block < rgd->ri.ri_data0)) {
+	if(!first && (*nrfblock < rgd->ri.ri_data0)) {
 		log_err("next_rg_freemeta:  Start block is outside rgrp "
 			"bounds.\n");
 		exit(1);
@@ -495,7 +495,8 @@ int next_rg_freemeta(struct rgrp_list *rgd, uint64_t *block, int first)
 				  bits->bi_offset, bits->bi_len, blk,
 				  GFS2_BLKST_UNLINKED);
 		if(blk != BFITNOENT){
-			*block = blk + (bits->bi_start * GFS2_NBBY) + rgd->ri.ri_data0;
+			*nrfblock = blk + (bits->bi_start * GFS2_NBBY) +
+				rgd->ri.ri_data0;
 			break;
 		}
 		blk=0;
diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c
index 2bcf1f8..6c3d3c6 100644
--- a/gfs2/fsck/pass1.c
+++ b/gfs2/fsck/pass1.c
@@ -198,8 +198,8 @@ static int check_data(struct gfs2_inode *ip, uint64_t block, void *private)
 
 		errors_found++;
 		log_err( _("Block %llu (0x%llx) seems to be data, but is "
-			   "marked as %s.\n", (unsigned long long)block,
-			   (unsigned long long)block, allocdesc[btype]));
+			   "marked as %s.\n"), (unsigned long long)block,
+			   (unsigned long long)block, allocdesc[btype]);
 		if(query(&opts, _("Okay to mark it as 'data'? (y/n)"))) {
 			errors_corrected++;
 			gfs2_set_bitmap(ip->i_sbd, block, GFS2_BLKST_USED);
diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c
index 98e5729..9b4b22d 100644
--- a/gfs2/libgfs2/fs_bits.c
+++ b/gfs2/libgfs2/fs_bits.c
@@ -160,8 +160,8 @@ int gfs2_set_bitmap(struct gfs2_sbd *sdp, uint64_t blkno, int state)
  *
  * Returns: state on success, -1 on error
  */
-static int gfs2_get_bitmap(struct gfs2_sbd *sdp, uint64_t blkno,
-					struct rgrp_list *rgd)
+int gfs2_get_bitmap(struct gfs2_sbd *sdp, uint64_t blkno,
+		    struct rgrp_list *rgd)
 {
 	int           i, val;
 	uint32_t        rgrp_block;
diff --git a/gfs2/libgfs2/gfs2_log.c b/gfs2/libgfs2/gfs2_log.c
index ba28fea..86d2089 100644
--- a/gfs2/libgfs2/gfs2_log.c
+++ b/gfs2/libgfs2/gfs2_log.c
@@ -29,8 +29,9 @@ void decrease_verbosity(void)
 	_state.print_level--;
 }
 
-static void print_msg(int priority, const char *file, int line, const char *format,
-		      va_list args) {
+static __attribute__((format (printf, 4, 0)))
+void print_msg(int priority, const char *file, int line,
+	       const char *format, va_list args) {
 
 	switch (priority) {
 
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 35560c8..558283d 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -69,7 +69,8 @@ __BEGIN_DECLS
 
 #endif  /*  __BYTE_ORDER == __LITTLE_ENDIAN  */
 
-static __inline__ __attribute__((noreturn)) void die(const char *fmt, ...)
+static __inline__ __attribute__((noreturn, format (printf, 1, 2)))
+void die(const char *fmt, ...)
 {
 	va_list ap;
 	fprintf(stderr, "%s: ", __FILE__);
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index 4e90841..91b9987 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -344,7 +344,7 @@ static void check_dev_content(const char *devname)
 {
 	struct sigaction sa;
 	char content[1024] = { 0, };
-	char * const args[] = { "/usr/bin/file", "-bs", (char *)devname, NULL };
+	char * args[] = { "/usr/bin/file", "-bs", (char *)devname, NULL };
 	int p[2];
 	int ret;
 	int pid;