public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin/main] Cygwin: mbrtowi: fix return type
Date: Tue, 14 Feb 2023 19:29:17 +0000 (GMT)	[thread overview]
Message-ID: <20230214192917.CA5B73858D33@sourceware.org> (raw)

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

commit 1fc35f30bdc67592150592ea78f808d44c913faf
Author:     Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Tue Feb 14 20:18:42 2023 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Tue Feb 14 20:18:42 2023 +0100

    Cygwin: mbrtowi: fix return type
    
    bad typo: change wint_t to size_t
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/local_includes/wchar.h | 2 +-
 winsup/cygwin/strfuncs.cc            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/local_includes/wchar.h b/winsup/cygwin/local_includes/wchar.h
index 3d746c29b9bf..10b44791c505 100644
--- a/winsup/cygwin/local_includes/wchar.h
+++ b/winsup/cygwin/local_includes/wchar.h
@@ -41,7 +41,7 @@ extern wctomb_f __utf8_wctomb;
 
 /* replacement function for mbrtowc, returning a wint_t representing
    a UTF-32 value. Defined in strfuncs.cc */
-extern wint_t mbrtowi (wint_t *, const char *, size_t, mbstate_t *);
+extern size_t mbrtowi (wint_t *, const char *, size_t, mbstate_t *);
 
 #ifdef __cplusplus
 }
diff --git a/winsup/cygwin/strfuncs.cc b/winsup/cygwin/strfuncs.cc
index 0b9d8ac1f639..d62179a1de06 100644
--- a/winsup/cygwin/strfuncs.cc
+++ b/winsup/cygwin/strfuncs.cc
@@ -114,7 +114,7 @@ transform_chars_af_unix (PWCHAR out, const char *path, __socklen_t len)
 
 /* replacement function for mbrtowc, returning a wint_t representing
    a UTF-32 value. */
-extern "C" wint_t
+extern "C" size_t
 mbrtowi (wint_t *pwi, const char *s, size_t n, mbstate_t *ps)
 {
   size_t len, len2;

                 reply	other threads:[~2023-02-14 19:29 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=20230214192917.CA5B73858D33@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=cygwin-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).