mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-05 12:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

#if 0 out code for non-ASCII chars until the locale data format is implemented.

Browse Source
This commit is contained in:
Roland McGrath 1995-03-13 03:41:42 +00:00
parent 7782ca54e1
commit 4ca6860994
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stdlib/mbtowc.c
View File

@ -17,7 +17,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */ Cambridge, MA 02139, USA. */
#include <ansidecl.h> #include <ansidecl.h>
#include <localeinfo.h> #include "../locale/localeinfo.h"
#include <ctype.h> #include <ctype.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
@ -33,8 +33,10 @@ long int _mb_shift = 0;
int int
DEFUN(mbtowc, (pwc, s, n), wchar_t *pwc AND CONST char *s AND size_t n) DEFUN(mbtowc, (pwc, s, n), wchar_t *pwc AND CONST char *s AND size_t n)
{ {
#if 0
register CONST mb_char *mb; register CONST mb_char *mb;
register wchar_t i; register wchar_t i;
#endif
if (s == NULL) if (s == NULL)
return _mb_shift != 0; return _mb_shift != 0;
@ -51,6 +53,7 @@ DEFUN(mbtowc, (pwc, s, n), wchar_t *pwc AND CONST char *s AND size_t n)
return 1; return 1;
} }
#if 0
if (_ctype_info->mbchar == NULL || if (_ctype_info->mbchar == NULL ||
_ctype_info->mbchar->mb_chars == NULL) _ctype_info->mbchar->mb_chars == NULL)
return -1; return -1;
@ -79,6 +82,7 @@ DEFUN(mbtowc, (pwc, s, n), wchar_t *pwc AND CONST char *s AND size_t n)
return mb->len; return mb->len;
} }
} }
#endif
return -1; return -1;
} }

8
stdlib/wctomb.c
View File

@ -17,7 +17,7 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */ Cambridge, MA 02139, USA. */
#include <ansidecl.h> #include <ansidecl.h>
#include <localeinfo.h> #include "../locale/localeinfo.h"
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -32,12 +32,14 @@ extern long int _mb_shift; /* Defined in mbtowc.c. */
int int
DEFUN(wctomb, (s, wchar), register char *s AND wchar_t wchar) DEFUN(wctomb, (s, wchar), register char *s AND wchar_t wchar)
{ {
#if 0
register CONST mb_char *mb; register CONST mb_char *mb;
if (_ctype_info->mbchar == NULL) if (_ctype_info->mbchar == NULL)
mb = NULL; mb = NULL;
else else
mb = _ctype_info->mbchar->mb_chars; mb = _ctype_info->mbchar->mb_chars;
#endif
/* If S is NULL, just say if we're shifted or not. */ /* If S is NULL, just say if we're shifted or not. */
if (s == NULL) if (s == NULL)
@ -63,10 +65,14 @@ DEFUN(wctomb, (s, wchar), register char *s AND wchar_t wchar)
return -1; return -1;
} }
#if 1
return -1;
#else
mb += wchar + _mb_shift; mb += wchar + _mb_shift;
if (mb->string == NULL || mb->len == 0) if (mb->string == NULL || mb->len == 0)
return -1; return -1;
memcpy((PTR) s, (CONST PTR) mb->string, mb->len + 1); memcpy((PTR) s, (CONST PTR) mb->string, mb->len + 1);
_mb_shift += mb->shift; _mb_shift += mb->shift;
return mb->len; return mb->len;
#endif
} }