diff options
author | Andreas Baumann <mail@andreasbaumann.cc> | 2015-01-03 13:58:15 +0100 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2015-01-03 13:58:15 +0100 |
commit | 4aca87515a5083ae0e31ce3177189fd43b6d05ac (patch) | |
tree | 7b1d9a31393ca090757dc6f0d3859b4fcd93f271 /release/src/router/busybox/libbb/perror_nomsg_and_die.c | |
parent | 008d0be72b2f160382c6e880765e96b64a050c65 (diff) | |
download | tomato-4aca87515a5083ae0e31ce3177189fd43b6d05ac.tar.gz tomato-4aca87515a5083ae0e31ce3177189fd43b6d05ac.tar.bz2 |
patch to Vanilla Tomato 1.28
Diffstat (limited to 'release/src/router/busybox/libbb/perror_nomsg_and_die.c')
-rw-r--r-- | release/src/router/busybox/libbb/perror_nomsg_and_die.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/release/src/router/busybox/libbb/perror_nomsg_and_die.c b/release/src/router/busybox/libbb/perror_nomsg_and_die.c index bab22845..d56e05d3 100644 --- a/release/src/router/busybox/libbb/perror_nomsg_and_die.c +++ b/release/src/router/busybox/libbb/perror_nomsg_and_die.c @@ -4,27 +4,19 @@ * * Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org> * - * 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 <stddef.h> -#include "libbb.h" +/* gcc warns about a null format string, therefore we provide + * modified definition without "attribute (format)" + * instead of including libbb.h */ +//#include "libbb.h" +#include "platform.h" +extern void bb_perror_msg_and_die(const char *s, ...) FAST_FUNC; -extern void bb_perror_nomsg_and_die(void) +/* suppress gcc "no previous prototype" warning */ +void FAST_FUNC bb_perror_nomsg_and_die(void); +void FAST_FUNC bb_perror_nomsg_and_die(void) { - /* Ignore the gcc warning about a null format string. */ - bb_perror_msg_and_die(NULL); + bb_perror_msg_and_die(0); } |