Avoid compiler warnings with gcc -Wall -Wshadow.

* libparted/arch/linux.c (init_ide): Add missing "break" at end of
final case: stmt.
Add "default:" in the same switch to avoid a compiler warning.
* libparted/fs/fat/bootsector.c (fat_boot_sector_analyse): Likewise.
* libparted/fs/fat/resize.c (ask_type): Likewise.
* libparted/fs/fat/traverse.c (fat_dir_entry_set_first_cluster):
Likewise.
* debug/clearfat/clearfat.c (_calc_fat_entry_offset): Likewise.

* parted/parted.c (_timer_handler): Cast time_t values to "int"
to agree with %d printf format.
(g_timer): Rename file-scoped global from shadowed "timer".
Update all uses of the global.
(version_msg): Remove decl of unused global.

* parted/ui.c (current_exception_opt): Remove decl of unused global.

* libparted/filesys.c (ped_file_system_close): Remove unused label.
* libparted/unit.c (parse_chs): Likewise.

* libparted/debug.c (ped_assert): Use "int" as type of backtrace
return value, not size_t.

* libparted/fs/reiserfs/reiserfs.c (reiserfs_check):
Guard declaration of local with #ifdef HAVE_REISERFS_FS_CHECK,
since it's used only in a similarly-guarded block.
(reiserfs_fs_check): Likewise for this file-scoped global.

Avoid warnings about unused file-scoped global variables.
* libparted/fs/hfs/hfs.h (hfs_type, hfsplus_type): Remove these
declarations of file-scoped static variables.
* libparted/fs/hfs/hfs.c: Put them here, instead.

* libparted/fs/fat/table.c (_test_code_active): Remove unused function.

* libparted/arch/linux.c: Add casts to avoid performing
pointer arithmetic on "void *" pointers.

* libparted/fs/hfs/file_plus.c (hfsplus_file_read):
Don't do pointer arithmetic on a "void *" pointer.
(hfsplus_file_write): Likewise.

* libparted/fs/fat/count.c (flag_traverse_dir): Move decl of
unused local into #if-0'd block where it is referenced.
(print_chain): Guard definition with #ifdef PED_VERBOSE,
since the sole use of this function is guarded the same way.

* libparted/fs/amiga/amiga.c: (_amiga_valid_block_id):
Remove unused function.
(_amiga_get_bstr): Likewise.
(_amiga_set_bstr): Likewise.

Remove unused labels and/or declarations of unused variables.
* parted/ui.c (_readline): Likewise.
* libparted/cs/constraint.c (_constraint_get_canonical_start_range):
Likewise.
* libparted/cs/geom.c (ped_geometry_read): Likewise.
* libparted/fs/amiga/apfs.c (_generic_apfs_probe): Likewise.
* libparted/fs/ext2/ext2_mkfs.c (ext2_mkfs_write_meta): Likewise.
* libparted/disk.c: Likewise.
* libparted/fs/hfs/hfs.c: Likewise.
* libparted/fs/fat/fat.c: Likewise.
* libparted/fs/fat/clstdup.c: Likewise.
* libparted/fs/fat/calc.c: Likewise.
* libparted/fs/ext2/ext2.c: Likewise.
* libparted/fs/amiga/affs.c: Likewise.
* libparted/fs/amiga/asfs.c: Likewise.
* libparted/labels/aix.c: Likewise.
* libparted/labels/sun.c: Likewise.
* libparted/labels/pc98.c: Likewise.
* libparted/labels/mac.c: Likewise.
* libparted/labels/dos.c: Likewise.
* libparted/labels/loop.c (loop_alloc): Likewise.
* libparted/labels/gpt.c: Likewise.
* libparted/labels/dvh.c (dvh_alloc): Likewise.
(dvh_read) [!DISCOVER_ONLY]: Add "default:" in a switch.

* libparted/labels/fdasd.c (fdasd_reread_partition_table):
Remove decl of unused local(s).
(fdasd_get_partition_data): Likewise.
(fdasd_partition_type): Remove unused function.
(fdasd_write_vtoc_labels): Likewise.
(fdasd_change_volser): Likewise.
(fdasd_check_volser): Likewise.
(fdasd_reread_partition_table): Likewise.

Signed-off-by: Jim Meyering <jim@meyering.net>

1 files changed, 1 insertions, 2 deletions

diff --git a/libparted/filesys.c b/libparted/filesys.c
index 0cc64ac..fa5f98f 100644
--- a/libparted/filesys.c
+++ b/libparted/filesys.c
@@ -1,6 +1,6 @@
 /*
     libparted - a library for manipulating disk partitions
-    Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+    Copyright (C) 1999, 2000, 2001, 2007 Free Software Foundation, Inc.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -483,7 +483,6 @@ ped_file_system_close (PedFileSystem* fs)
 
 error_close_dev:
 	ped_device_close (dev);
-error:
 	return 0;
 }