removed stdio.h stdio.c

This commit is contained in:
2013-11-03 16:48:20 +00:00
parent 91c9182ad7
commit be129e743b
24 changed files with 258 additions and 964 deletions

View File

@ -37,7 +37,6 @@ pkginclude_HEADERS = \
sio.h \
sll.h \
slmb.h \
stdio.h \
str.h \
task.h \
time.h \

View File

@ -62,8 +62,8 @@ am__pkginclude_HEADERS_DIST = alg.h chr.h cp949.h cp950.h dir.h dll.h \
env.h fio.h fma.h fmt.h fs.h gdl.h glob.h htb.h hton.h ipad.h \
lda.h main.h map.h mb8.h mbwc.h mem.h mux.h nwad.h nwif.h \
nwio.h oht.h opt.h path.h pio.h pma.h rbt.h rex.h sio.h sll.h \
slmb.h stdio.h str.h task.h time.h tio.h tre.h uni.h uri.h \
utf8.h xma.h Mmgr.hpp StdMmgr.hpp Mmged.hpp
slmb.h str.h task.h time.h tio.h tre.h uni.h uri.h utf8.h \
xma.h Mmgr.hpp StdMmgr.hpp Mmged.hpp
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@ -276,8 +276,8 @@ pkginclude_HEADERS = alg.h chr.h cp949.h cp950.h dir.h dll.h env.h \
fio.h fma.h fmt.h fs.h gdl.h glob.h htb.h hton.h ipad.h lda.h \
main.h map.h mb8.h mbwc.h mem.h mux.h nwad.h nwif.h nwio.h \
oht.h opt.h path.h pio.h pma.h rbt.h rex.h sio.h sll.h slmb.h \
stdio.h str.h task.h time.h tio.h tre.h uni.h uri.h utf8.h \
xma.h $(am__append_1)
str.h task.h time.h tio.h tre.h uni.h uri.h utf8.h xma.h \
$(am__append_1)
all: all-am
.SUFFIXES:

View File

@ -34,7 +34,7 @@
* @code
* #include <qse/cmn/rbt.h>
* #include <qse/cmn/mem.h>
* #include <qse/cmn/stdio.h>
* #include <qse/cmn/sio.h>
*
* static qse_rbt_walk_t walk (qse_rbt_t* rbt, qse_rbt_pair_t* pair, void* ctx)
* {

View File

@ -427,6 +427,15 @@ QSE_EXPORT qse_ssize_t qse_errputwcsvf (
# define qse_errputstrvf(fmt,ap) qse_errputwcsvf(fmt,ap)
#endif
/* Some convenience macros */
#define QSE_STDOUT (qse_getstdout())
#define QSE_STDERR (qse_getstderr())
#define qse_printf qse_putstrf
#define qse_vprintf qse_putstrvf
#define qse_fprintf qse_sio_putstrf
#define qse_vfprintf qse_sio_putstrvf
#ifdef __cplusplus
}
#endif

View File

@ -1,103 +0,0 @@
/*
* $Id$
*
Copyright 2006-2012 Chung, Hyung-Hwan.
This file is part of QSE.
QSE is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of
the License, or (at your option) any later version.
QSE is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with QSE. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _QSE_CMN_STDIO_H_
#define _QSE_CMN_STDIO_H_
/** @file
* This file defines stdio wrapper functions for #qse_char_t.
*/
#include <qse/types.h>
#include <qse/macros.h>
#include <stdarg.h>
typedef struct QSE_FILE QSE_FILE;
#define QSE_STDIN ((QSE_FILE*)1)
#define QSE_STDOUT ((QSE_FILE*)2)
#define QSE_STDERR ((QSE_FILE*)3)
typedef int (*qse_getdelim_t) (const qse_char_t* ptr,qse_size_t len,void* arg);
#ifdef __cplusplus
extern "C" {
#endif
QSE_EXPORT int qse_vsprintf (
qse_char_t* buf,
qse_size_t size,
const qse_char_t* fmt,
va_list ap
);
QSE_EXPORT int qse_sprintf (
qse_char_t* buf,
qse_size_t size,
const qse_char_t* fmt,
...
);
QSE_EXPORT int qse_vfprintf (
QSE_FILE *stream, const qse_char_t* fmt, va_list ap);
QSE_EXPORT int qse_vprintf (
const qse_char_t* fmt, va_list ap);
QSE_EXPORT int qse_fprintf (
QSE_FILE* file, const qse_char_t* fmt, ...);
QSE_EXPORT int qse_printf (
const qse_char_t* fmt, ...);
QSE_EXPORT int qse_dprintf (
const qse_char_t* fmt, ...);
QSE_EXPORT QSE_FILE* qse_fopen (
const qse_char_t* path, const qse_char_t* mode);
QSE_EXPORT void qse_fclose (QSE_FILE* stream);
QSE_EXPORT int qse_fflush (QSE_FILE* stream);
QSE_EXPORT void qse_clearerr (QSE_FILE* stream);
QSE_EXPORT int qse_feof (QSE_FILE* stream);
QSE_EXPORT int qse_ferror (QSE_FILE* stream);
/**
* The qse_getline() function read a line from a file pointer @a fp
* until a new line character is met.
*
* @return -2 on error, -1 on eof, length of data read on success
*/
QSE_EXPORT qse_ssize_t qse_getline (
qse_char_t **buf, qse_size_t *n, QSE_FILE *stream);
/**
* The qse_getdelim() function reads characters from a file pointer @a fp
* until a certain condition is met as defined by @a fn and @a fnarg.
*
* @return -3 on line breaker error, -2 on error, -1 on eof,
* length of data read on success
*/
QSE_EXPORT qse_ssize_t qse_getdelim (
qse_char_t **buf, qse_size_t *n,
qse_getdelim_t fn, void* fnarg, QSE_FILE* stream);
#ifdef __cplusplus
}
#endif
#endif