This is the mail archive of the
newlib-cvs@sourceware.org
mailing list for the newlib project.
[newlib-cygwin] Actually return value from __cp_index
- From: Corinna Vinschen <corinna at sourceware dot org>
- To: newlib-cvs at sourceware dot org
- Date: 22 Oct 2016 19:10:52 -0000
- Subject: [newlib-cygwin] Actually return value from __cp_index
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=8c6e4fec142b486531d2ac8da75250fa00a14e31
commit 8c6e4fec142b486531d2ac8da75250fa00a14e31
Author: Corinna Vinschen <corinna@vinschen.de>
Date: Sat Oct 22 21:08:44 2016 +0200
Actually return value from __cp_index
Fixes Coverty CID 153470
Also drop redundant declaration of __cp_index.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
newlib/libc/ctype/ctype_cp.h | 3 ---
newlib/libc/stdlib/sb_charsets.c | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/newlib/libc/ctype/ctype_cp.h b/newlib/libc/ctype/ctype_cp.h
index 7ce0ab3..004c1e2 100644
--- a/newlib/libc/ctype/ctype_cp.h
+++ b/newlib/libc/ctype/ctype_cp.h
@@ -470,9 +470,6 @@
_L, _L, _L, _L, _L, _L, _L
#define _CTYPE_PT154_255 _L
-
-extern int __cp_index (const char *charset_ext);
-
#if defined(ALLOW_NEGATIVE_CTYPE_INDEX)
#ifndef __CYGWIN__
diff --git a/newlib/libc/stdlib/sb_charsets.c b/newlib/libc/stdlib/sb_charsets.c
index 38583e5..961eb15 100644
--- a/newlib/libc/stdlib/sb_charsets.c
+++ b/newlib/libc/stdlib/sb_charsets.c
@@ -786,7 +786,7 @@ __cp_val_index (int val)
int
__cp_index (const char *charset_ext)
{
- int cp_idx = __cp_val_index (__micro_atoi (charset_ext));
+ return __cp_val_index (__micro_atoi (charset_ext));
}
#endif /* _MB_EXTENDED_CHARSETS_WINDOWS */