gz_open and gz_close were left in, even when BB_FEATURE_TAR_GZIP was disabled.

[oweals/busybox.git] / loadfont.c

diff --git a/loadfont.c b/loadfont.c
index ec3e50560777e298233e535200fd5ff54f2d9a00..1a724ca85e17cc07356a17844af904bc365641fb 100644 (file)
--- a/loadfont.c
+++ b/loadfont.c
@@ -7,7 +7,6 @@
  * Loads the console font, and possibly the corresponding screen map(s).
  * (Adapted for busybox by Matej Vela.)
  */
-#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
@@ -20,6 +19,7 @@
 #include <sys/ioctl.h>
 #include <sys/kd.h>
 #include <endian.h>
+#include "busybox.h"
 
 static const int PSF_MAGIC1 = 0x36;
 static const int PSF_MAGIC2 = 0x04;
@@ -44,7 +44,7 @@ extern int loadfont_main(int argc, char **argv)
        int fd;
 
        if (argc != 1)
-               usage(loadfont_usage);
+               show_usage();
 
        fd = open("/dev/tty0", O_RDWR);
        if (fd < 0)