public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/azanella/clang] argp: Expand argp_usage, _option_is_short, and _option_is_end
@ 2022-10-04 12:57 Adhemerval Zanella
0 siblings, 0 replies; 3+ messages in thread
From: Adhemerval Zanella @ 2022-10-04 12:57 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=020525a2d2f54380a973e7472fe0a3935d7ec533
commit 020525a2d2f54380a973e7472fe0a3935d7ec533
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu Jul 21 14:12:01 2022 -0300
argp: Expand argp_usage, _option_is_short, and _option_is_end
Diff:
---
argp/argp-xinl.c | 34 +++++++++++++++++++++++-----------
argp/argp.h | 10 +++-------
2 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/argp/argp-xinl.c b/argp/argp-xinl.c
index 74b4971e44..e112fee31e 100644
--- a/argp/argp-xinl.c
+++ b/argp/argp-xinl.c
@@ -25,19 +25,31 @@
# include <features.h>
#endif
-#ifndef __USE_EXTERN_INLINES
-# define __USE_EXTERN_INLINES 1
-#endif
-#define ARGP_EI
-#undef __OPTIMIZE__
-#define __OPTIMIZE__ 1
#include <argp.h>
-/* Add weak aliases. */
-#if _LIBC - 0 && defined (weak_alias)
-
+void
+__argp_usage (const struct argp_state *__state)
+{
+ __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
+}
weak_alias (__argp_usage, argp_usage)
+
+int
+__option_is_short (const struct argp_option *__opt)
+{
+ if (__opt->flags & OPTION_DOC)
+ return 0;
+ else
+ {
+ int __key = __opt->key;
+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key);
+ }
+}
weak_alias (__option_is_short, _option_is_short)
-weak_alias (__option_is_end, _option_is_end)
-#endif
+int
+__option_is_end (const struct argp_option *__opt)
+{
+ return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
+}
+weak_alias (__option_is_end, _option_is_end)
diff --git a/argp/argp.h b/argp/argp.h
index d6a04069d5..f82196dfb2 100644
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -518,17 +518,13 @@ extern void *__argp_input (const struct argp *__restrict __argp,
# define __option_is_end _option_is_end
# endif
-# ifndef ARGP_EI
-# define ARGP_EI __extern_inline
-# endif
-
-ARGP_EI void
+__extern_inline void
__argp_usage (const struct argp_state *__state)
{
__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
}
-ARGP_EI int
+__extern_inline int
__NTH (__option_is_short (const struct argp_option *__opt))
{
if (__opt->flags & OPTION_DOC)
@@ -540,7 +536,7 @@ __NTH (__option_is_short (const struct argp_option *__opt))
}
}
-ARGP_EI int
+__extern_inline int
__NTH (__option_is_end (const struct argp_option *__opt))
{
return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
^ permalink raw reply [flat|nested] 3+ messages in thread
* [glibc/azanella/clang] argp: Expand argp_usage, _option_is_short, and _option_is_end
@ 2023-02-09 19:46 Adhemerval Zanella
0 siblings, 0 replies; 3+ messages in thread
From: Adhemerval Zanella @ 2023-02-09 19:46 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cc3ec44db317fd457bdfcd782d4a22cbf675754d
commit cc3ec44db317fd457bdfcd782d4a22cbf675754d
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu Jul 21 14:12:01 2022 -0300
argp: Expand argp_usage, _option_is_short, and _option_is_end
Diff:
---
argp/argp-xinl.c | 34 +++++++++++++++++++++++-----------
argp/argp.h | 10 +++-------
2 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/argp/argp-xinl.c b/argp/argp-xinl.c
index b7cd70cc51..ae41d3bdb4 100644
--- a/argp/argp-xinl.c
+++ b/argp/argp-xinl.c
@@ -25,19 +25,31 @@
# include <features.h>
#endif
-#ifndef __USE_EXTERN_INLINES
-# define __USE_EXTERN_INLINES 1
-#endif
-#define ARGP_EI
-#undef __OPTIMIZE__
-#define __OPTIMIZE__ 1
#include <argp.h>
-/* Add weak aliases. */
-#if _LIBC - 0 && defined (weak_alias)
-
+void
+__argp_usage (const struct argp_state *__state)
+{
+ __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
+}
weak_alias (__argp_usage, argp_usage)
+
+int
+__option_is_short (const struct argp_option *__opt)
+{
+ if (__opt->flags & OPTION_DOC)
+ return 0;
+ else
+ {
+ int __key = __opt->key;
+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key);
+ }
+}
weak_alias (__option_is_short, _option_is_short)
-weak_alias (__option_is_end, _option_is_end)
-#endif
+int
+__option_is_end (const struct argp_option *__opt)
+{
+ return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
+}
+weak_alias (__option_is_end, _option_is_end)
diff --git a/argp/argp.h b/argp/argp.h
index 77d696c65d..b899a53bd8 100644
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -518,17 +518,13 @@ extern void *__argp_input (const struct argp *__restrict __argp,
# define __option_is_end _option_is_end
# endif
-# ifndef ARGP_EI
-# define ARGP_EI __extern_inline
-# endif
-
-ARGP_EI void
+__extern_inline void
__argp_usage (const struct argp_state *__state)
{
__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
}
-ARGP_EI int
+__extern_inline int
__NTH (__option_is_short (const struct argp_option *__opt))
{
if (__opt->flags & OPTION_DOC)
@@ -540,7 +536,7 @@ __NTH (__option_is_short (const struct argp_option *__opt))
}
}
-ARGP_EI int
+__extern_inline int
__NTH (__option_is_end (const struct argp_option *__opt))
{
return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
^ permalink raw reply [flat|nested] 3+ messages in thread
* [glibc/azanella/clang] argp: Expand argp_usage, _option_is_short, and _option_is_end
@ 2022-10-28 17:39 Adhemerval Zanella
0 siblings, 0 replies; 3+ messages in thread
From: Adhemerval Zanella @ 2022-10-28 17:39 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f29c0d57aadf988c5b9a14c8712502109cb22533
commit f29c0d57aadf988c5b9a14c8712502109cb22533
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu Jul 21 14:12:01 2022 -0300
argp: Expand argp_usage, _option_is_short, and _option_is_end
Diff:
---
argp/argp-xinl.c | 34 +++++++++++++++++++++++-----------
argp/argp.h | 10 +++-------
2 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/argp/argp-xinl.c b/argp/argp-xinl.c
index 74b4971e44..e112fee31e 100644
--- a/argp/argp-xinl.c
+++ b/argp/argp-xinl.c
@@ -25,19 +25,31 @@
# include <features.h>
#endif
-#ifndef __USE_EXTERN_INLINES
-# define __USE_EXTERN_INLINES 1
-#endif
-#define ARGP_EI
-#undef __OPTIMIZE__
-#define __OPTIMIZE__ 1
#include <argp.h>
-/* Add weak aliases. */
-#if _LIBC - 0 && defined (weak_alias)
-
+void
+__argp_usage (const struct argp_state *__state)
+{
+ __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
+}
weak_alias (__argp_usage, argp_usage)
+
+int
+__option_is_short (const struct argp_option *__opt)
+{
+ if (__opt->flags & OPTION_DOC)
+ return 0;
+ else
+ {
+ int __key = __opt->key;
+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key);
+ }
+}
weak_alias (__option_is_short, _option_is_short)
-weak_alias (__option_is_end, _option_is_end)
-#endif
+int
+__option_is_end (const struct argp_option *__opt)
+{
+ return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
+}
+weak_alias (__option_is_end, _option_is_end)
diff --git a/argp/argp.h b/argp/argp.h
index d6a04069d5..f82196dfb2 100644
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -518,17 +518,13 @@ extern void *__argp_input (const struct argp *__restrict __argp,
# define __option_is_end _option_is_end
# endif
-# ifndef ARGP_EI
-# define ARGP_EI __extern_inline
-# endif
-
-ARGP_EI void
+__extern_inline void
__argp_usage (const struct argp_state *__state)
{
__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
}
-ARGP_EI int
+__extern_inline int
__NTH (__option_is_short (const struct argp_option *__opt))
{
if (__opt->flags & OPTION_DOC)
@@ -540,7 +536,7 @@ __NTH (__option_is_short (const struct argp_option *__opt))
}
}
-ARGP_EI int
+__extern_inline int
__NTH (__option_is_end (const struct argp_option *__opt))
{
return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-09 19:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-04 12:57 [glibc/azanella/clang] argp: Expand argp_usage, _option_is_short, and _option_is_end Adhemerval Zanella
2022-10-28 17:39 Adhemerval Zanella
2023-02-09 19:46 Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).