diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-01-22 22:55:11 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-01-22 22:55:11 +0000 |
| commit | 86f5c9906beac527f3d7966f24811b571a589e08 (patch) | |
| tree | 1c9eba853c728b5d734506e1c66c269d96fe46ea /archival | |
| parent | 2edf52643d3eb3d13f26d31f9678cf122f2063bc (diff) | |
| download | busybox-86f5c9906beac527f3d7966f24811b571a589e08.tar.gz | |
- add platform.h.
- use shorter boilerplate while at it.
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/libunarchive/header_skip.c | 2 | ||||
| -rw-r--r-- | archival/unzip.c | 23 |
2 files changed, 6 insertions, 19 deletions
diff --git a/archival/libunarchive/header_skip.c b/archival/libunarchive/header_skip.c index 0b153980e..963d113a4 100644 --- a/archival/libunarchive/header_skip.c +++ b/archival/libunarchive/header_skip.c @@ -1,6 +1,6 @@ #include <stdio.h> #include "unarchive.h" -extern void header_skip(const file_header_t *file_header __attribute__((unused))) +extern void header_skip(const file_header_t *file_header ATTRIBUTE_UNUSED) { } diff --git a/archival/unzip.c b/archival/unzip.c index 50d148692..caac716cc 100644 --- a/archival/unzip.c +++ b/archival/unzip.c @@ -7,20 +7,7 @@ * Loosely based on original busybox unzip applet by Laurence Anderson. * All options and features should work in this version. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ /* For reference see @@ -79,12 +66,12 @@ typedef union { unsigned short method; /* 4-5 */ unsigned short modtime; /* 6-7 */ unsigned short moddate; /* 8-9 */ - unsigned int crc32 __attribute__ ((packed)); /* 10-13 */ - unsigned int cmpsize __attribute__ ((packed)); /* 14-17 */ - unsigned int ucmpsize __attribute__ ((packed)); /* 18-21 */ + unsigned int crc32 ATTRIBUTE_PACKED; /* 10-13 */ + unsigned int cmpsize ATTRIBUTE_PACKED; /* 14-17 */ + unsigned int ucmpsize ATTRIBUTE_PACKED; /* 18-21 */ unsigned short filename_len; /* 22-23 */ unsigned short extra_len; /* 24-25 */ - } formated __attribute__ ((packed)); + } formated ATTRIBUTE_PACKED; } zip_header_t; static void unzip_skip(int fd, off_t skip) |