From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- .../busybox/archival/libunarchive/data_align.c | 27 ++++------------------ 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'release/src/router/busybox/archival/libunarchive/data_align.c') diff --git a/release/src/router/busybox/archival/libunarchive/data_align.c b/release/src/router/busybox/archival/libunarchive/data_align.c index 037242f2..9f2e8432 100644 --- a/release/src/router/busybox/archival/libunarchive/data_align.c +++ b/release/src/router/busybox/archival/libunarchive/data_align.c @@ -1,34 +1,15 @@ +/* vi: set sw=4 ts=4: */ /* - * 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 GPLv2 or later, see file LICENSE in this tarball for details. */ -#include - -#include -#include - #include "libbb.h" #include "unarchive.h" -extern void data_align(archive_handle_t *archive_handle, const unsigned short boundary) +void FAST_FUNC data_align(archive_handle_t *archive_handle, unsigned boundary) { - const unsigned short skip_amount = (boundary - (archive_handle->offset % boundary)) % boundary; + unsigned skip_amount = (boundary - (archive_handle->offset % boundary)) % boundary; archive_handle->seek(archive_handle, skip_amount); - archive_handle->offset += skip_amount; - - return; } -- cgit v1.2.3-54-g00ecf