tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Merge stdio/local.h and stdio/wcio.h." am: 3040a7a08c

Browse source 
am: 84de501af4

Change-Id: I13b097c4314cf353f39f382d2272df59d3e405f7
This commit is contained in:
Elliott Hughes 2018-03-02 04:05:25 +00:00 committed by android-build-merger
commit 3dedf2294d
2 changed files with 32 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libc/stdio/local.h
View file

@ -42,8 +42,6 @@
#include "private/bionic_fortify.h"
#endif
#include "wcio.h"
/*
* Information local to this implementation of stdio,
* in particular, macros and private variables.
@ -110,6 +108,19 @@ struct __sFILE {
// below, and accessed via `_EXT`.
};
/* minimal requirement of SUSv2 */
#define WCIO_UNGETWC_BUFSIZE 1
struct wchar_io_data {
mbstate_t wcio_mbstate_in;
mbstate_t wcio_mbstate_out;
wchar_t wcio_ungetwc_buf[WCIO_UNGETWC_BUFSIZE];
size_t wcio_ungetwc_inbuf;
int wcio_mode; /* orientation */
};
struct __sfileext {
// ungetc buffer.
struct __sbuf _ub;
@ -276,4 +287,23 @@ char* __hdtoa(double, const char*, int, int*, int*, char**);
char* __hldtoa(long double, const char*, int, int*, int*, char**);
char* __ldtoa(long double*, int, int, int*, int*, char**);
#define WCIO_GET(fp) \
(_EXT(fp) ? &(_EXT(fp)->_wcio) : (struct wchar_io_data *)0)
#define _SET_ORIENTATION(fp, mode) \
do {\
struct wchar_io_data *_wcio = WCIO_GET(fp); \
if (_wcio && _wcio->wcio_mode == 0) \
_wcio->wcio_mode = (mode);\
} while (0)
#define WCIO_FREE(fp) \
do {\
struct wchar_io_data *_wcio = WCIO_GET(fp); \
if (_wcio) { \
_wcio->wcio_mode = 0;\
_wcio->wcio_ungetwc_inbuf = 0;\
} \
} while (0)
__END_DECLS

81
libc/stdio/wcio.h
View file

@ -1,81 +0,0 @@
/* $OpenBSD: wcio.h,v 1.2 2013/04/17 17:40:35 tedu Exp $ */
/* $NetBSD: wcio.h,v 1.3 2003/01/18 11:30:00 thorpej Exp $ */
/*-
* Copyright (c)2001 Citrus Project,
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Citrus$
*/
#pragma once
#include <sys/cdefs.h>
__BEGIN_DECLS
/* minimal requirement of SUSv2 */
#define WCIO_UNGETWC_BUFSIZE 1
struct wchar_io_data {
mbstate_t wcio_mbstate_in;
mbstate_t wcio_mbstate_out;
wchar_t wcio_ungetwc_buf[WCIO_UNGETWC_BUFSIZE];
size_t wcio_ungetwc_inbuf;
int wcio_mode; /* orientation */
};
#define WCIO_GET(fp) \
(_EXT(fp) ? &(_EXT(fp)->_wcio) : (struct wchar_io_data *)0)
#define _SET_ORIENTATION(fp, mode) \
do {\
struct wchar_io_data *_wcio = WCIO_GET(fp); \
if (_wcio && _wcio->wcio_mode == 0) \
_wcio->wcio_mode = (mode);\
} while (0)
/*
* WCIO_FREE should be called by fclose
*/
#define WCIO_FREE(fp) \
do {\
struct wchar_io_data *_wcio = WCIO_GET(fp); \
if (_wcio) { \
_wcio->wcio_mode = 0;\
_wcio->wcio_ungetwc_inbuf = 0;\
} \
} while (0)
#define WCIO_FREEUB(fp) \
do {\
struct wchar_io_data *_wcio = WCIO_GET(fp); \
if (_wcio) { \
_wcio->wcio_ungetwc_inbuf = 0;\
} \
} while (0)
__END_DECLS