100.0 * s->s_r_blocks_count / s->s_blocks_count);
printf(_("First data block=%u\n"), s->s_first_data_block);
if (fs->group_desc_count > 1)
- printf(_("%lu block groups\n"), fs->group_desc_count);
+ printf(_("%u block groups\n"), fs->group_desc_count);
else
- printf(_("%lu block group\n"), fs->group_desc_count);
+ printf(_("%u block group\n"), fs->group_desc_count);
printf(_("%u blocks per group, %u fragments per group\n"),
s->s_blocks_per_group, s->s_frags_per_group);
printf(_("%u inodes per group\n"), s->s_inodes_per_group);
const char * program_name = "tune2fs";
char * device_name;
-char * new_label, *new_last_mounted, *new_UUID, *journal_opts;
+char * new_label, *new_last_mounted, *new_UUID;
+const char *journal_opts;
static int c_flag, C_flag, e_flag, g_flag, i_flag, l_flag, L_flag;
static int m_flag, M_flag, r_flag, s_flag = -1, u_flag, U_flag;
static int print_label;
/*
* Update the feature set as provided by the user.
*/
-static void update_feature_set(ext2_filsys fs, char *features_cmd)
+static void update_feature_set(ext2_filsys fs, char *features)
{
int sparse, old_sparse, filetype, old_filetype;
int journal, old_journal;
EXT2_FEATURE_INCOMPAT_FILETYPE;
old_journal = sb->s_feature_compat &
EXT3_FEATURE_COMPAT_HAS_JOURNAL;
- if (e2p_edit_feature(features_cmd, &sb->s_feature_compat,
+ if (e2p_edit_feature(features, &sb->s_feature_compat,
ok_features)) {
fprintf(stderr, _("Invalid filesystem option set: %s\n"),
- features_cmd);
+ features);
exit(1);
}
sparse = sb->s_feature_ro_compat &
}
printf(_("done\n"));
} else if (journal_size) {
- errcode_t retval;
- int mount_flags;
-
printf(_("Creating journal inode: "));
fflush(stdout);
retval = ext2fs_add_journal_inode(fs, journal_blocks,
/*
* Given argv[0], return the program name.
*/
-char *get_progname(char *argv_zero)
+static char *get_progname(char *argv_zero)
{
char *cp;
}
-void parse_e2label_options(int argc, char ** argv)
+static void parse_e2label_options(int argc, char ** argv)
{
if ((argc < 2) || (argc > 3)) {
fprintf(stderr, _("Usage: e2label device [newlabel]\n"));
}
-void parse_tune2fs_options(int argc, char **argv)
+static void parse_tune2fs_options(int argc, char **argv)
{
int c;
char * tmp;
sb = fs->super;
if (print_label) {
/* For e2label emulation */
- printf("%.*s\n", sizeof(sb->s_volume_name), sb->s_volume_name);
+ printf("%.*s\n", (int) sizeof(sb->s_volume_name),
+ sb->s_volume_name);
exit(0);
}
retval = ext2fs_check_if_mounted(device_name, &mount_flags);
com_err("ext2fs_check_if_mount", retval,
_("while determining whether %s is mounted."),
device_name);
- return;
+ exit(0);
}
/* Normally we only need to write out the superblock */
fs->flags |= EXT2_FLAG_SUPER_ONLY;