From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4402 invoked by alias); 19 Jun 2009 21:04:13 -0000 Received: (qmail 4395 invoked by alias); 19 Jun 2009 21:04:12 -0000 X-SWARE-Spam-Status: No, hits=-0.2 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_23,J_CHICKENPOX_33,J_CHICKENPOX_35,J_CHICKENPOX_45,SPF_HELO_PASS X-Spam-Status: No, hits=-0.2 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_23,J_CHICKENPOX_33,J_CHICKENPOX_35,J_CHICKENPOX_45,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - Fixed compiler warnings and errors that crept in. To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 431bbd8ef5856574e0b3400ac9cda6c01b8ad644 X-Git-Newrev: f8554a9f040199784223147b846b76bc0aedb135 From: Bob Peterson Message-Id: <20090619210341.835A612026C@lists.fedorahosted.org> Date: Fri, 19 Jun 2009 21:04:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00573.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f8554a9f040199784223147b846b76bc0aedb135 Commit: f8554a9f040199784223147b846b76bc0aedb135 Parent: 431bbd8ef5856574e0b3400ac9cda6c01b8ad644 Author: Bob Peterson AuthorDate: Fri Jun 19 15:57:25 2009 -0500 Committer: Bob Peterson CommitterDate: Fri Jun 19 16:03:17 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 8de3bb8..7fe1a19 100644 --- a/gfs2/edit/gfs2hex.c +++ b/gfs2/edit/gfs2hex.c @@ -102,7 +102,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 d579b91..ee5ff04 100644 --- a/gfs2/edit/savemeta.c +++ b/gfs2/edit/savemeta.c @@ -259,7 +259,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; @@ -469,14 +469,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); @@ -493,7 +493,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 022521b..5abe00d 100644 --- a/gfs2/fsck/pass1.c +++ b/gfs2/fsck/pass1.c @@ -196,8 +196,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 7f96227..ed459af 100644 --- a/gfs2/libgfs2/fs_bits.c +++ b/gfs2/libgfs2/fs_bits.c @@ -158,8 +158,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 49dd2e2..41f4faa 100644 --- a/gfs2/libgfs2/gfs2_log.c +++ b/gfs2/libgfs2/gfs2_log.c @@ -27,8 +27,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 48c8f56..9ac9645 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -342,7 +342,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;