i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

type fix: replaced int type with proper wchar_t type for several functions (tsk, tsk, tsk)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1647 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Daniel Reinhold
2002-10-25 11:23:30 +00:00
parent 3b5b78dee6
commit afaca44046
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/libroot/posix/stdlib/multibyte.c
+19 -22
View File
@@ -33,43 +33,46 @@
#include <stdlib.h> #include <stdlib.h>
/* /*
* Stub multibyte character functions. * Stub multibyte character functions.
* This cheezy implementation is fixed to the native single-byte * This cheezy implementation is fixed to the native single-byte
* character set. * character set.
*/ */
int int
mblen(s, n) mblen(const char *s, size_t n)
const char *s;
size_t n;
{ {
if (s == NULL || *s == '\0') if (s == NULL || *s == '\0')
return 0; return 0;
if (n == 0) if (n == 0)
return -1; return -1;
return 1; return 1;
} }
/*ARGSUSED*/
int int
mbtowc(pwc, s, n) mbtowc(wchar_t *pwc, const char *s, size_t n)
int *pwc;
const char *s;
size_t n;
{ {
if (s == NULL) if (s == NULL)
return 0; return 0;
if (n == 0) if (n == 0)
return -1; return -1;
if (pwc) if (pwc)
*pwc = (int) *s; *pwc = (wchar_t) *s;
return (*s != '\0'); return (*s != '\0');
} }
/*ARGSUSED*/
int int
wctomb(char *s, int wchar) wctomb(char *s, wchar_t wchar)
{ {
if (s == NULL) if (s == NULL)
return 0; return 0;
@@ -78,18 +81,15 @@ wctomb(char *s, int wchar)
return 1; return 1;
} }
/*ARGSUSED*/
size_t size_t
mbstowcs(pwcs, s, n) mbstowcs(wchar_t *pwcs, const char *s, size_t n)
int *pwcs;
const char *s;
size_t n;
{ {
int count = 0; int count = 0;
if (n != 0) { if (n != 0) {
do { do {
if ((*pwcs++ = (int) *s++) == 0) if ((*pwcs++ = (wchar_t) *s++) == 0)
break; break;
count++; count++;
} while (--n != 0); } while (--n != 0);
@@ -98,12 +98,9 @@ mbstowcs(pwcs, s, n)
return count; return count;
} }
/*ARGSUSED*/
size_t size_t
wcstombs(s, pwcs, n) wcstombs(char *s, const wchar_t *pwcs, size_t n)
char *s;
const int *pwcs;
size_t n;
{ {
int count = 0; int count = 0;