diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-10-17 10:36:28 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-10-17 10:36:28 -0400 |
| commit | f77180d803041f05d074ba8f26604f9d77c88b45 (patch) | |
| tree | 75033012031929d82654a8692deb674c2e840c4d /usr/src/lib/libc/port/stdio/doscan.c | |
| parent | f1e5b922ed8766e68b9264a57a94dd9a28cddd69 (diff) | |
| parent | e59cb7a82e3c588904c5b7ede8cba0bf3cd17eb1 (diff) | |
| download | illumos-joyent-f77180d803041f05d074ba8f26604f9d77c88b45.tar.gz | |
[illumos-gate merge]
commit e59cb7a82e3c588904c5b7ede8cba0bf3cd17eb1
15025 hald can't anymore receive events with newer glib versions than 2.63.4
commit 8a67df42cf817fc66635eb83ffe3fc2f8216300a
15046 libc: unused variable
commit 2067ad9da908e7634f4b17778a0523d3acca8102
15045 SMB should implement FSCTL_DFS_GET_REFERRALS_EX
commit a44ccde211b3554142d11535037f8ef996519c3b
15044 SMB should return NT_STATUS_FS_DRIVER_REQUIRED for DFS ioctls when DFS is not supported
Diffstat (limited to 'usr/src/lib/libc/port/stdio/doscan.c')
| -rw-r--r-- | usr/src/lib/libc/port/stdio/doscan.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr/src/lib/libc/port/stdio/doscan.c b/usr/src/lib/libc/port/stdio/doscan.c index fda4d5c2ea..7d49797578 100644 --- a/usr/src/lib/libc/port/stdio/doscan.c +++ b/usr/src/lib/libc/port/stdio/doscan.c @@ -596,7 +596,7 @@ charswitch: /* target of a goto 8-( */ /* ****************************************************************** */ static int number(int *chcount, int *flag_eof, int stow, int type, int len, int size, - FILE *iop, va_list *listp) + FILE *iop, va_list *listp) { char numbuf[64]; char *np = numbuf; @@ -841,7 +841,7 @@ readchar(FILE *iop, int *chcount) static int string(int *chcount, int *flag_eof, int stow, int type, int len, char *tab, - FILE *iop, va_list *listp) + FILE *iop, va_list *listp) { int ch; char *ptr; @@ -927,7 +927,6 @@ _mkarglst(const char *fmt, stva_list args, stva_list arglst[]) fmt += STRSPN(fmt, SPNSTR2); if (*fmt == '[') { - int i; fmt++; /* has to be at least on item in scan list */ if (*fmt == ']') { fmt++; @@ -943,6 +942,8 @@ _mkarglst(const char *fmt, stva_list args, stva_list arglst[]) } else if (isascii(*fmt)) { fmt++; } else { + int i; + i = mblen((const char *) fmt, MB_CUR_MAX); if (i <= 0) { @@ -972,12 +973,11 @@ _mkarglst(const char *fmt, stva_list args, stva_list arglst[]) #ifdef _WIDE static int wstring(int *chcount, int *flag_eof, int stow, int type, - int len, FILE *iop, va_list *listp) + int len, FILE *iop, va_list *listp) { wint_t wch; wchar_t *ptr; wchar_t *wstart; - int dummy; wstart = ptr = stow ? va_arg(*listp, wchar_t *) : NULL; @@ -1008,7 +1008,7 @@ wstring(int *chcount, int *flag_eof, int stow, int type, #else /* _WIDE */ static int wstring(int *chcount, int *flag_eof, int stow, int type, int len, FILE *iop, - va_list *listp) + va_list *listp) { int wch; wchar_t *ptr; @@ -1118,7 +1118,7 @@ _watoi(wchar_t *fmt) /* ARGSUSED3 */ static int wbrstring(int *chcount, int *flag_eof, int stow, int type, - int len, FILE *iop, unsigned char *brstr, va_list *listp) + int len, FILE *iop, unsigned char *brstr, va_list *listp) { wint_t wch; int i; @@ -1182,7 +1182,7 @@ wbrstring(int *chcount, int *flag_eof, int stow, int type, #ifdef _WIDE static int brstring(int *chcount, int *flag_eof, int stow, int type, - int len, FILE *iop, unsigned char *brstr, va_list *listp) + int len, FILE *iop, unsigned char *brstr, va_list *listp) { wint_t wch; int i; |