Cherrypick upstream OpenBSD's vfwprintf.c revision 1.11.
revision 1.11 date: 2014/06/04 07:45:25; author: stsp; state: Exp; lines: +1 -7; commitid: zJPRH5RUO224FmQu; Remove assigned but unused local variables and macro from vfwprintf(). Found by Elliott @ google ok mpi@ Change-Id: I716edc0c4d736a484a5317942de8e87bd8c6fd26
This commit is contained in:
parent
38ed337c13
commit
be8df2e744
@ -709,7 +709,6 @@ LOCAL_CFLAGS := \
|
||||
$(libc_common_cflags) \
|
||||
-Wno-sign-compare -Wno-uninitialized -Wno-unused-parameter \
|
||||
-Werror \
|
||||
-Wno-error=unused-but-set-variable \
|
||||
-I$(LOCAL_PATH)/upstream-openbsd/android/include \
|
||||
-I$(LOCAL_PATH)/upstream-openbsd/lib/libc/include \
|
||||
-I$(LOCAL_PATH)/upstream-openbsd/lib/libc/gdtoa/ \
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: vfwprintf.c,v 1.10 2014/05/03 12:36:45 deraadt Exp $ */
|
||||
/* $OpenBSD: vfwprintf.c,v 1.11 2014/06/04 07:45:25 stsp Exp $ */
|
||||
/*-
|
||||
* Copyright (c) 1990 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
@ -324,9 +324,6 @@ __vfwprintf(FILE * __restrict fp, const wchar_t * __restrict fmt0, __va_list ap)
|
||||
int realsz; /* field size expanded by dprec */
|
||||
int size; /* size of converted field or string */
|
||||
const char *xdigs; /* digits for %[xX] conversion */
|
||||
#define NIOV 8
|
||||
struct __suio uio; /* output information: summary */
|
||||
struct __siov iov[NIOV];/* ... and individual io vectors */
|
||||
wchar_t buf[BUF]; /* buffer with space for digits of uintmax_t */
|
||||
wchar_t ox[2]; /* space for 0x; ox[1] is either x, X, or \0 */
|
||||
union arg *argtable; /* args, built due to positional arg */
|
||||
@ -463,9 +460,6 @@ __vfwprintf(FILE * __restrict fp, const wchar_t * __restrict fmt0, __va_list ap)
|
||||
argtable = NULL;
|
||||
nextarg = 1;
|
||||
va_copy(orgap, ap);
|
||||
uio.uio_iov = iov;
|
||||
uio.uio_resid = 0;
|
||||
uio.uio_iovcnt = 0;
|
||||
ret = 0;
|
||||
convbuf = NULL;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user