public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] ctype.h: Fix unused variable warnings
Date: Thu, 16 Jul 2020 09:30:48 +0000 (GMT)	[thread overview]
Message-ID: <20200716093048.746A7388A82B@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=0ee972d1b095bfea89499b358646e44d60aa4a4b

commit 0ee972d1b095bfea89499b358646e44d60aa4a4b
Author: Aschref Ben Thabet <aschref.ben-thabet@embedded-brains.de>
Date:   Thu Jul 16 10:28:49 2020 +0200

    ctype.h: Fix unused variable warnings
    
    If __HAVE_LOCALE_INFO__ is not defined, then the locale in the
    locale-specific ctype functions is ignored.  In the previous
    implementation this resulted in compiler warnings.  For example:
    
    int main()
    {
      locale_t locale;
      locale = duplocale(uselocale((locale_t)0));
      isspace_l('x', locale);
      return 0;
    }
    
    gcc -Wall main.c
    main.c: In function 'main':
    main.c:6:11: warning: variable 'locale' set but not used [-Wunused-but-set-variable]
        6 |  locale_t locale;
          |           ^~~~~~

Diff:
---
 newlib/libc/include/ctype.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h
index a0009af17..8b1013ac0 100644
--- a/newlib/libc/include/ctype.h
+++ b/newlib/libc/include/ctype.h
@@ -66,6 +66,9 @@ extern int toascii_l (int __c, locale_t __l);
 #define _X	0100
 #define	_B	0200
 
+/* For C++ backward-compatibility only.  */
+extern	__IMPORT const char	_ctype_[];
+
 #ifdef __HAVE_LOCALE_INFO__
 const char *__locale_ctype_ptr (void);
 #else
@@ -108,7 +111,12 @@ const char *__locale_ctype_ptr (void);
 #ifdef __HAVE_LOCALE_INFO__
 const char *__locale_ctype_ptr_l (locale_t);
 #else
-#define __locale_ctype_ptr_l(l)	_ctype_
+static __inline char *
+__locale_ctype_ptr_l(locale_t _l)
+{
+	(void)_l;
+	return __locale_ctype_ptr();
+}
 #endif
 #define __ctype_lookup_l(__c,__l) ((__locale_ctype_ptr_l(__l)+sizeof(""[__c]))[(int)(__c)])
 
@@ -170,9 +178,6 @@ const char *__locale_ctype_ptr_l (locale_t);
 
 #endif /* !__cplusplus */
 
-/* For C++ backward-compatibility only.  */
-extern	__IMPORT const char	_ctype_[];
-
 _END_STD_C
 
 #endif /* _CTYPE_H_ */


                 reply	other threads:[~2020-07-16  9:30 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20200716093048.746A7388A82B@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=newlib-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).