X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Flibunarchive%2Fcheck_header_gzip.c;h=0cfa944540338c5a95720aef6de03075acc977c7;hb=666da5e2c6edec979966d16771818b32dcfafe04;hp=9e065c4fde5efde3a244e01bffdc1c2ad921e919;hpb=14f5c8d764ab7429367feb407ab86191054e6a8a;p=oweals%2Fbusybox.git

diff --git a/archival/libunarchive/check_header_gzip.c b/archival/libunarchive/check_header_gzip.c
index 9e065c4fd..0cfa94454 100644
--- a/archival/libunarchive/check_header_gzip.c
+++ b/archival/libunarchive/check_header_gzip.c
@@ -1,9 +1,13 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
 #include <stdlib.h>
 #include <unistd.h>
 #include "libbb.h"
 #include "unarchive.h" /* for external decl of check_header_gzip */
 
-extern void check_header_gzip(int src_fd)
+void check_header_gzip(int src_fd)
 {
 	union {
 		unsigned char raw[8];
@@ -13,45 +17,45 @@ extern void check_header_gzip(int src_fd)
 			unsigned int mtime;
 			unsigned char xtra_flags;
 			unsigned char os_flags;
-		} formated;
+		} formatted;
 	} header;
 
-	bb_xread_all(src_fd, header.raw, 8);
+	xread(src_fd, header.raw, 8);
 
 	/* Check the compression method */
-	if (header.formated.method != 8) {
-		bb_error_msg_and_die("Unknown compression method %d",
-						  header.formated.method);
+	if (header.formatted.method != 8) {
+		bb_error_msg_and_die("unknown compression method %d",
+						  header.formatted.method);
 	}
 
-	if (header.formated.flags & 0x04) {
+	if (header.formatted.flags & 0x04) {
 		/* bit 2 set: extra field present */
 		unsigned char extra_short;
 
-		extra_short = bb_xread_char(src_fd) + (bb_xread_char(src_fd) << 8);
+		extra_short = xread_char(src_fd) + (xread_char(src_fd) << 8);
 		while (extra_short > 0) {
 			/* Ignore extra field */
-			bb_xread_char(src_fd);
+			xread_char(src_fd);
 			extra_short--;
 		}
 	}
 
 	/* Discard original name if any */
-	if (header.formated.flags & 0x08) {
+	if (header.formatted.flags & 0x08) {
 		/* bit 3 set: original file name present */
-		while(bb_xread_char(src_fd) != 0);
+		while (xread_char(src_fd) != 0);
 	}
 
 	/* Discard file comment if any */
-	if (header.formated.flags & 0x10) {
+	if (header.formatted.flags & 0x10) {
 		/* bit 4 set: file comment present */
-		while(bb_xread_char(src_fd) != 0);
+		while (xread_char(src_fd) != 0);
 	}
 
 	/* Read the header checksum */
-	if (header.formated.flags & 0x02) {
-		bb_xread_char(src_fd);
-		bb_xread_char(src_fd);
+	if (header.formatted.flags & 0x02) {
+		xread_char(src_fd);
+		xread_char(src_fd);
 	}
 
 	return;