public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/azanella/clang] argp: Expand argp_usage, _option_is_short, and _option_is_end
Date: Fri, 28 Oct 2022 17:39:48 +0000 (GMT)	[thread overview]
Message-ID: <20221028173948.8EE7C385700B@sourceware.org> (raw)

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;

             reply	other threads:[~2022-10-28 17:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-28 17:39 Adhemerval Zanella [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-17 20:05 Adhemerval Zanella
2024-04-02 15:51 Adhemerval Zanella
2024-02-09 17:29 Adhemerval Zanella
2024-02-07 14:05 Adhemerval Zanella
2024-01-29 17:55 Adhemerval Zanella
2023-12-21 18:51 Adhemerval Zanella
2023-09-28 17:50 Adhemerval Zanella
2023-08-30 12:34 Adhemerval Zanella
2023-02-09 19:46 Adhemerval Zanella
2022-10-04 12:57 Adhemerval Zanella

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221028173948.8EE7C385700B@sourceware.org \
    --to=azanella@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).