mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-09 16:26:55 +00:00
b153dbf046
Refresh patches to tidy up fuzz. No functional changes Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
80 lines
2.4 KiB
Diff
80 lines
2.4 KiB
Diff
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
#
|
|
# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
|
|
# Copyright (C) 2006 The T2 SDE Project
|
|
#
|
|
# More information can be found in the files COPYING and README.
|
|
#
|
|
# This patch file is dual-licensed. It is available under the license the
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
|
|
# --- T2-COPYRIGHT-NOTE-END ---
|
|
|
|
|
|
No __THROW in function implementation.
|
|
--jsaw
|
|
|
|
--- a/argp.h
|
|
+++ b/argp.h
|
|
@@ -560,17 +560,17 @@ __argp_short_program_name(const struct a
|
|
# endif
|
|
|
|
# ifndef ARGP_EI
|
|
-# define ARGP_EI extern __inline__
|
|
+# define ARGP_EI extern inline
|
|
# endif
|
|
|
|
ARGP_EI void
|
|
-__argp_usage (__const struct argp_state *__state) __THROW
|
|
+__argp_usage (__const struct argp_state *__state)
|
|
{
|
|
__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
|
|
}
|
|
|
|
ARGP_EI int
|
|
-__option_is_short (__const struct argp_option *__opt) __THROW
|
|
+__option_is_short (__const struct argp_option *__opt)
|
|
{
|
|
if (__opt->flags & OPTION_DOC)
|
|
return 0;
|
|
@@ -582,7 +582,7 @@ __option_is_short (__const struct argp_o
|
|
}
|
|
|
|
ARGP_EI int
|
|
-__option_is_end (__const struct argp_option *__opt) __THROW
|
|
+__option_is_end (__const struct argp_option *__opt)
|
|
{
|
|
return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
|
|
}
|
|
--- a/argp-parse.c
|
|
+++ b/argp-parse.c
|
|
@@ -1277,13 +1277,13 @@ weak_alias (__argp_input, _argp_input)
|
|
/* Defined here, in case a user is not inlining the definitions in
|
|
* argp.h */
|
|
void
|
|
-__argp_usage (__const struct argp_state *__state) __THROW
|
|
+__argp_usage (__const struct argp_state *__state)
|
|
{
|
|
__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
|
|
}
|
|
|
|
int
|
|
-__option_is_short (__const struct argp_option *__opt) __THROW
|
|
+__option_is_short (__const struct argp_option *__opt)
|
|
{
|
|
if (__opt->flags & OPTION_DOC)
|
|
return 0;
|
|
@@ -1297,7 +1297,7 @@ __option_is_short (__const struct argp_o
|
|
}
|
|
|
|
int
|
|
-__option_is_end (__const struct argp_option *__opt) __THROW
|
|
+__option_is_end (__const struct argp_option *__opt)
|
|
{
|
|
return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
|
|
}
|