diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-04-13 17:32:16 +0400 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-04-13 17:32:16 +0400 |
commit | 6b4377f3337d7d3e21e63aa1341d33fd51c2f97c (patch) | |
tree | 6dbc501701a7fc5d1f2e62e6c5cba3fb44af8174 /archival/libunarchive/filter_accept_reject_list.c | |
parent | c2cb0f32b44a9918364af39c24b5643388c553f6 (diff) |
- remove unneeded include, use shorter boilerplate while at it and also
shrink filter_accept_reject_list() a tiny bit while at it.
text data bss dec hex filename
59 0 0 59 3b filter_accept_reject_list.o
62 0 0 62 3e filter_accept_reject_list.o.orig
Diffstat (limited to 'archival/libunarchive/filter_accept_reject_list.c')
-rw-r--r-- | archival/libunarchive/filter_accept_reject_list.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/archival/libunarchive/filter_accept_reject_list.c b/archival/libunarchive/filter_accept_reject_list.c index 1ac414675..be56a446f 100644 --- a/archival/libunarchive/filter_accept_reject_list.c +++ b/archival/libunarchive/filter_accept_reject_list.c @@ -1,24 +1,11 @@ +/* vi: set sw=4 ts=4: */ /* - * Copyright (C) 2002 by Glenn McGrath + * Copyright (C) 2002 by Glenn McGrath * - * 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 <fnmatch.h> #include <stdlib.h> - #include "unarchive.h" /* @@ -27,16 +14,17 @@ char filter_accept_reject_list(archive_handle_t *archive_handle) { const char *key = archive_handle->file_header->name; - const llist_t *accept_entry = find_list_entry(archive_handle->accept, key); const llist_t *reject_entry = find_list_entry(archive_handle->reject, key); + const llist_t *accept_entry; /* If the key is in a reject list fail */ if (reject_entry) { return(EXIT_FAILURE); } + accept_entry = find_list_entry(archive_handle->accept, key); /* Fail if an accept list was specified and the key wasnt in there */ - if (archive_handle->accept && (accept_entry == NULL)) { + if ((accept_entry == NULL) && archive_handle->accept) { return(EXIT_FAILURE); } |