Fix up some silly macros and use xmalloc and friends exclusively.

[oweals/busybox.git] / dd.c

diff --git a/dd.c b/dd.c
index 582310681eb83f781ee10427f9c62a142fbe2398..1618dd102a81c50a8442691136ff169496c80936 100644 (file)
--- a/dd.c
+++ b/dd.c
@@ -21,16 +21,16 @@
  *
  */
 
-#include "busybox.h"
-
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
+#include "busybox.h"
+
 
-static struct suffix_mult dd_suffixes[] = {
+static const struct suffix_mult dd_suffixes[] = {
        { "c", 1 },
        { "w", 2 },
        { "b", 512 },
@@ -84,7 +84,7 @@ int dd_main(int argc, char **argv)
                                        buf++;
                        }
                } else
-                       usage(dd_usage);
+                       show_usage();
        }
 
        buf = xmalloc(bs);