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/init_handle.c | 29 ++++++---------------- 1 file changed, 7 insertions(+), 22 deletions(-) (limited to 'release/src/router/busybox/archival/libunarchive/init_handle.c') diff --git a/release/src/router/busybox/archival/libunarchive/init_handle.c b/release/src/router/busybox/archival/libunarchive/init_handle.c index 2659aa3e..ff7d484e 100644 --- a/release/src/router/busybox/archival/libunarchive/init_handle.c +++ b/release/src/router/busybox/archival/libunarchive/init_handle.c @@ -1,37 +1,22 @@ +/* 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 "libbb.h" #include "unarchive.h" -archive_handle_t *init_handle(void) +archive_handle_t* FAST_FUNC init_handle(void) { archive_handle_t *archive_handle; - /* Initialise default values */ - archive_handle = xmalloc(sizeof(archive_handle_t)); - memset(archive_handle, 0, sizeof(archive_handle_t)); - archive_handle->file_header = xmalloc(sizeof(file_header_t)); + /* Initialize default values */ + archive_handle = xzalloc(sizeof(archive_handle_t)); + archive_handle->file_header = xzalloc(sizeof(file_header_t)); archive_handle->action_header = header_skip; archive_handle->action_data = data_skip; archive_handle->filter = filter_accept_all; - archive_handle->read = bb_full_read; archive_handle->seek = seek_by_jump; - return(archive_handle); + return archive_handle; } -- cgit v1.2.3-54-g00ecf