add compile-time check for correct DHCP packet size

[oweals/busybox.git] / e2fsprogs / util.c

diff --git a/e2fsprogs/util.c b/e2fsprogs/util.c
index aaee50ae6142078ef87cb94971436ecaa599a9bf..b30c294b8b654c9d79004fc00961c3f75660bbf6 100644 (file)
--- a/e2fsprogs/util.c
+++ b/e2fsprogs/util.c
@@ -33,12 +33,12 @@ void proceed_question(void)
 void check_plausibility(const char *device, int force)
 {
        int val;
-       STRUCT_STAT s;
-       val = STAT(device, &s);
+       struct stat s;
+       val = stat(device, &s);
        if (force)
                return;
        if(val == -1)
-               bb_perror_msg_and_die("Could not stat %s", device);
+               bb_perror_msg_and_die("cannot stat %s", device);
        if (!S_ISBLK(s.st_mode)) {
                printf("%s is not a block special device.\n", device);
                proceed_question();
@@ -82,7 +82,7 @@ void check_mount(const char *device, int force, const char *type)
 
        retval = ext2fs_check_if_mounted(device, &mount_flags);
        if (retval) {
-               bb_error_msg("Could not determine if %s is mounted", device);
+               bb_error_msg("cannot determine if %s is mounted", device);
                return;
        }
        if (mount_flags & EXT2_MF_MOUNTED) {
@@ -219,7 +219,7 @@ void make_journal_device(char *journal_device, ext2_filsys fs, int quiet, int fo
                                        EXT2_FLAG_JOURNAL_DEV_OK, 0,
                                        fs->blocksize, io_ptr, &jfs);
        if (retval)
-               bb_error_msg_and_die("Could not journal device %s", journal_device);
+               bb_error_msg_and_die("cannot journal device %s", journal_device);
        if(!quiet)
                printf("Adding journal to device %s: ", journal_device);
        fflush(stdout);
@@ -248,7 +248,7 @@ void make_journal_blocks(ext2_filsys fs, int journal_size, int journal_flags, in
        retval = ext2fs_add_journal_inode(fs, journal_blocks,
                                                  journal_flags);
        if(retval)
-               bb_error_msg_and_die("Could not create journal");
+               bb_error_msg_and_die("cannot create journal");
        if(!quiet)
                puts("done");
 }