Fix some compiler warnings emitted by gcc-4.8.0

[oweals/busybox.git] / util-linux / freeramdisk.c

diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index ae341b06641182eaeec94b6857fe1fe04bd80b7a..a89ae1a3910a555ff3787c12ec1bb4add5d9d508 100644 (file)
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -6,30 +6,40 @@
  * Adjusted a bit by Erik Andersen <andersen@codepoet.org>
  * Unified with fdflush by Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
-#include "busybox.h"
+//usage:#define freeramdisk_trivial_usage
+//usage:       "DEVICE"
+//usage:#define freeramdisk_full_usage "\n\n"
+//usage:       "Free all memory used by the specified ramdisk"
+//usage:
+//usage:#define freeramdisk_example_usage
+//usage:       "$ freeramdisk /dev/ram2\n"
+//usage:
+//usage:#define fdflush_trivial_usage
+//usage:       "DEVICE"
+//usage:#define fdflush_full_usage "\n\n"
+//usage:       "Force floppy disk drive to detect disk change"
+
+#include <sys/mount.h>
+#include "libbb.h"
 
 /* From <linux/fd.h> */
 #define FDFLUSH  _IO(2,0x4b)
 
-int freeramdisk_main(int argc, char **argv);
-int freeramdisk_main(int argc, char **argv)
+int freeramdisk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int freeramdisk_main(int argc UNUSED_PARAM, char **argv)
 {
-       int result;
        int fd;
 
-       if (argc != 2) bb_show_usage();
-
-       fd = xopen(argv[1], O_RDWR);
+       fd = xopen(single_argv(argv), O_RDWR);
 
        // Act like freeramdisk, fdflush, or both depending on configuration.
-       result = ioctl(fd, (ENABLE_FREERAMDISK && applet_name[1]=='r')
-                       || !ENABLE_FDFLUSH ? BLKFLSBUF : FDFLUSH);
+       ioctl_or_perror_and_die(fd, (ENABLE_FREERAMDISK && applet_name[1] == 'r')
+                       || !ENABLE_FDFLUSH ? BLKFLSBUF : FDFLUSH, NULL, "%s", argv[1]);
 
        if (ENABLE_FEATURE_CLEAN_UP) close(fd);
 
-       if (result) bb_perror_msg_and_die("%s", argv[1]);
        return EXIT_SUCCESS;
 }