From: Steve D. <ste...@us...> - 2009-01-19 22:58:56
|
Update of /cvsroot/evms/evms2/engine/plugins/xfs In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21389 Modified Files: fs_xfs.c fsimxfs.c Log Message: Cleanup compiler warnings. Added bonus: My editor cleans up trailing whitespace. Index: fs_xfs.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/xfs/fs_xfs.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- fs_xfs.c 4 Jan 2008 18:17:47 -0000 1.47 +++ fs_xfs.c 19 Jan 2009 22:58:51 -0000 1.48 @@ -377,7 +377,7 @@ * to new_size, set new_size to the new_size of the filesystem. **/ static int xfs_expand(logical_volume_t * volume, - sector_count_t * new_size) + sector_count_t * UNUSED(new_size)) { char * argv[3]; char * buffer; @@ -508,9 +508,9 @@ * * Shrinking XFS filesystems is not currently supported. */ -static int xfs_shrink(logical_volume_t * volume, - sector_count_t requested_size, - sector_count_t * new_size) +static int xfs_shrink(logical_volume_t * UNUSED(volume), + sector_count_t UNUSED(requested_size), + sector_count_t * UNUSED(new_size)) { LOG_ENTRY(); LOG_EXIT_INT(ENOSYS); @@ -526,7 +526,7 @@ static int xfs_mkfs_setup(logical_volume_t * volume, option_array_t * options) { - int i; + uint i; char * ext_log_vol = NULL; list_anchor_t avail_ext_logs; list_element_t logs_list_iter; @@ -719,7 +719,8 @@ logical_volume_t * vol; list_anchor_t global_volumes; list_element_t vol_list_iter; - int rc, i, count; + int rc; + u_int i, count; LOG_ENTRY(); @@ -851,7 +852,7 @@ context->option_descriptors->count = 0; switch (context->action) { - + case EVMS_Task_mkfs: rc = fs_init_mkfs_acceptable_objects(context); @@ -1007,7 +1008,7 @@ static int xfs_set_option(task_context_t * context, u_int32_t index, value_t * value, - task_effect_t * effect) + task_effect_t * UNUSED(effect)) { option_descriptor_t * option = context->option_descriptors->option; int rc = 0; @@ -1015,10 +1016,10 @@ LOG_ENTRY(); switch (context->action) { - + case EVMS_Task_mkfs: switch (index) { - + case MKFS_SETVOL_INDEX: strncpy(option[index].value.s, value->s, LV_NAME_SIZE); break; @@ -1042,7 +1043,7 @@ case EVMS_Task_fsck: switch (index) { - + case FSCK_READONLY_INDEX: option[index].value.b = value->b; break; @@ -1080,7 +1081,7 @@ * settings have changed. **/ static int xfs_set_volumes(task_context_t * context, - list_anchor_t declined_volumes, + list_anchor_t UNUSED(declined_volumes), task_effect_t * effect) { logical_volume_t * vol; @@ -1362,7 +1363,7 @@ * * Returns Plugin specific information. **/ -static int xfs_get_plugin_info(char * descriptor_name, +static int xfs_get_plugin_info(char * UNUSED(descriptor_name), extended_info_array_t ** info) { extended_info_array_t * Info; @@ -1468,8 +1469,8 @@ * * How much can file system shrink? Currently unsupported in XFS. **/ -static int xfs_can_shrink_by(logical_volume_t * volume, - sector_count_t * delta) +static int xfs_can_shrink_by(logical_volume_t * UNUSED(volume), + sector_count_t * UNUSED(delta)) { LOG_ENTRY(); LOG_EXIT_INT(ENOSYS); Index: fsimxfs.c =================================================================== RCS file: /cvsroot/evms/evms2/engine/plugins/xfs/fsimxfs.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- fsimxfs.c 6 Oct 2004 20:47:57 -0000 1.20 +++ fsimxfs.c 19 Jan 2009 22:58:51 -0000 1.21 @@ -47,8 +47,8 @@ */ static int rw_diskblocks(logical_volume_t * volume, int fd, - int64_t start, - int32_t count, + u_int64_t start, + u_int32_t count, void * buffer, int mode) { @@ -117,7 +117,7 @@ memset(xfs_vol->log_sb, 0, sizeof(xlog_rec_header_t)); fd2 = EngFncs->open_volume(volume, O_RDWR|O_EXCL, 0); if (fd2 < 0) { - rw_diskblocks(volume, fd2, XFS_SUPER1_OFF, + rw_diskblocks(volume, fd2, XFS_SUPER1_OFF, SIZE_OF_SUPER, xfs_vol->log_sb, PUT); EngFncs->close_volume(volume, fd2); } @@ -157,7 +157,8 @@ char ** argv, logical_volume_t * volume) { - int rc, i = 0, opt_count = 0; + int rc; + uint i = 0, opt_count = 0; char buffer[EVMS_VOLUME_NAME_SIZE + 10]; LOG_ENTRY(); @@ -318,7 +319,8 @@ char ** argv, logical_volume_t * volume) { - int rc, i = 0, opt_count = 0; + int rc; + uint i = 0, opt_count = 0; xfs_volume_t * xfs_vol = volume->private_data; LOG_ENTRY(); @@ -593,7 +595,8 @@ char * buffer, * buf_ptr; int fds2[2]; int status, bytes_read; - int ver_string_size, rc; + uint ver_string_size; + int rc; LOG_ENTRY(); |