From 6d5ba60378dbadcbf973793aa39f74aafef38f2a Mon Sep 17 00:00:00 2001 From: "flatcap.org!flatcap" Date: Fri, 10 Jan 2003 01:06:19 +0000 Subject: [PATCH] some functions moved to utils (Logical change 1.85) --- ntfsprogs/ntfswipe.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/ntfsprogs/ntfswipe.c b/ntfsprogs/ntfswipe.c index f98a51e2..dfa9f7f0 100644 --- a/ntfsprogs/ntfswipe.c +++ b/ntfsprogs/ntfswipe.c @@ -707,37 +707,26 @@ void print_summary (void) */ int main (int argc, char *argv[]) { - const char *locale; ntfs_volume *vol; int result = 1; int flags = 0; int i, j; enum action act = act_info; - locale = setlocale (LC_ALL, ""); - if (!locale) { - locale = setlocale (LC_ALL, NULL); - Vprintf ("Failed to set locale, using default '%s'.\n", locale); - } else { - Vprintf ("Using locale '%s'.\n", locale); - } + utils_set_locale(); if (!parse_options (argc, argv)) return 1; - if (!valid_device (opts.device, opts.force)) - goto free; - if (!opts.info) print_summary(); if (opts.info || opts.noaction) flags = MS_RDONLY; - vol = ntfs_mount (opts.device, flags); - if (!vol) { - Eprintf ("Couldn't mount device '%s': %s\n", opts.device, strerror (errno)); + + vol = utils_mount_volume (opts.device, flags, opts.force); + if (!vol) goto free; - } if (vol->flags & VOLUME_IS_DIRTY) { Iprintf ("Volume is dirty.\n");