| Message ID | 1307686290-11008-1-git-send-email-adilger@whamcloud.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri, Jun 10, 2011 at 12:11:30AM -0600, Andreas Dilger wrote: > This was reported as "control reaches end of non-void function", > but comparing to other similar functions it should be a void > function. Since it is only declared in the "private" ext2fsP.h > header, it should be OK to change the function prototype. > > Signed-off-by: Andreas Dilger <adilger@whamcloud.com> Applied to the next branch, thanks. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/lib/ext2fs/ext2fsP.h b/lib/ext2fs/ext2fsP.h index ab9ee76..b182d7f 100644 --- a/lib/ext2fs/ext2fsP.h +++ b/lib/ext2fs/ext2fsP.h @@ -138,6 +138,6 @@ extern errcode_t ext2fs_set_generic_bmap_range(ext2fs_generic_bitmap bitmap, extern errcode_t ext2fs_get_generic_bmap_range(ext2fs_generic_bitmap bitmap, __u64 start, unsigned int num, void *out); -extern int ext2fs_warn_bitmap32(ext2fs_generic_bitmap bitmap, const char *func); +extern void ext2fs_warn_bitmap32(ext2fs_generic_bitmap bitmap,const char *func); extern int ext2fs_mem_is_zero(const char *mem, size_t len); diff --git a/lib/ext2fs/gen_bitmap64.c b/lib/ext2fs/gen_bitmap64.c index 94809cd..294194c 100644 --- a/lib/ext2fs/gen_bitmap64.c +++ b/lib/ext2fs/gen_bitmap64.c @@ -548,7 +548,7 @@ void ext2fs_unmark_block_bitmap_range2(ext2fs_block_bitmap bmap, bmap->bitmap_ops->unmark_bmap_extent(bmap, block, num); } -int ext2fs_warn_bitmap32(ext2fs_generic_bitmap bitmap, const char *func) +void ext2fs_warn_bitmap32(ext2fs_generic_bitmap bitmap, const char *func) { #ifndef OMIT_COM_ERR if (bitmap && bitmap->description)
This was reported as "control reaches end of non-void function", but comparing to other similar functions it should be a void function. Since it is only declared in the "private" ext2fsP.h header, it should be OK to change the function prototype. Signed-off-by: Andreas Dilger <adilger@whamcloud.com> --- lib/ext2fs/ext2fsP.h | 2 +- lib/ext2fs/gen_bitmap64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)