hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed wrong return values of qse_fmtout

Browse Source
This commit is contained in:
hyung-hwan
2013-10-28 09:40:25 +00:00
parent 1a0dc68fa3
commit aaf73a86f5
12 changed files with 372 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
qse/include/qse/cmn/sio.h
View File

@ -319,12 +319,6 @@ QSE_EXPORT qse_ssize_t qse_sio_putwcsf (
...
);
QSE_EXPORT qse_ssize_t qse_sio_putstrf (
qse_sio_t* sio,
const qse_char_t* fmt,
...
);
QSE_EXPORT qse_ssize_t qse_sio_putmbsvf (
qse_sio_t* sio,
const qse_mchar_t* fmt,
@ -337,20 +331,18 @@ QSE_EXPORT qse_ssize_t qse_sio_putwcsvf (
va_list ap
);
QSE_EXPORT qse_ssize_t qse_sio_putstrvf (
qse_sio_t* sio,
const qse_char_t* fmt,
va_list ap
);
#if defined(QSE_CHAR_IS_MCHAR)
# define qse_sio_putc(sio,c) qse_sio_putmb(sio,c)
# define qse_sio_putstr(sio,str) qse_sio_putmbs(sio,str)
# define qse_sio_putstrn(sio,str,size) qse_sio_putmbsn(sio,str,size)
# define qse_sio_putstrf qse_sio_putmbsf
# define qse_sio_putstrvf(sio,fmt,ap) qse_sio_putmbsvf(sio,fmt,ap)
#else
# define qse_sio_putc(sio,c) qse_sio_putwc(sio,c)
# define qse_sio_putstr(sio,str) qse_sio_putwcs(sio,str)
# define qse_sio_putstrn(sio,str,size) qse_sio_putwcsn(sio,str,size)
# define qse_sio_putstrf qse_sio_putwcsf
# define qse_sio_putstrvf(sio,fmt,ap) qse_sio_putwcsvf(sio,fmt,ap)
#endif
/**
@ -393,11 +385,6 @@ QSE_EXPORT qse_ssize_t qse_putwcsf (
...
);
QSE_EXPORT qse_ssize_t qse_putstrf (
const qse_char_t* fmt,
...
);
QSE_EXPORT qse_ssize_t qse_putmbsvf (
const qse_mchar_t* fmt,
va_list ap
@ -408,11 +395,38 @@ QSE_EXPORT qse_ssize_t qse_putwcsvf (
va_list ap
);
QSE_EXPORT qse_ssize_t qse_putstrvf (
const qse_char_t* fmt,
va_list ap
QSE_EXPORT qse_ssize_t qse_errputmbsf (
const qse_mchar_t* fmt,
...
);
QSE_EXPORT qse_ssize_t qse_errputwcsf (
const qse_wchar_t* fmt,
...
);
QSE_EXPORT qse_ssize_t qse_errputmbsvf (
const qse_mchar_t* fmt,
va_list ap
);
QSE_EXPORT qse_ssize_t qse_errputwcsvf (
const qse_wchar_t* fmt,
va_list ap
);
#if defined(QSE_CHAR_IS_MCHAR)
# define qse_putstrf qse_putmbsf
# define qse_putstrvf(fmt,ap) qse_putmbsvf(fmt,ap)
# define qse_errputstrf qse_errputmbsf
# define qse_errputstrvf(fmt,ap) qse_errputmbsvf(fmt,ap)
#else
# define qse_putstrf qse_putwcsf
# define qse_putstrvf(fmt,ap) qse_putwcsvf(fmt,ap)
# define qse_errputstrf qse_errputwcsf
# define qse_errputstrvf(fmt,ap) qse_errputwcsvf(fmt,ap)
#endif
#ifdef __cplusplus
}
#endif

18
qse/include/qse/cmn/str.h
View File

@ -712,18 +712,14 @@ QSE_EXPORT qse_size_t qse_wcsxfmt (
...
);
QSE_EXPORT qse_size_t qse_strfmt (
qse_char_t* buf,
const qse_char_t* fmt,
...
);
QSE_EXPORT qse_size_t qse_strxfmt (
qse_char_t* buf,
qse_size_t bsz,
const qse_char_t* fmt,
...
);
#if defined(QSE_CHAR_IS_MCHAR)
# define qse_strfmt qse_mbsfmt
# define qse_strxfmt qse_mbsxfmt
#else
# define qse_strfmt qse_wcsfmt
# define qse_strxfmt qse_wcsxfmt
#endif
/**
* The qse_mbsxsubst() function expands \a fmt into a buffer \a buf of the size