*** empty log message ***

This commit is contained in:
2007-01-28 11:28:27 +00:00
parent b5a1de919c
commit 438430de23
7 changed files with 69 additions and 288 deletions

View File

@ -1,5 +1,5 @@
/*
* $Id: main.c,v 1.4 2007-01-26 16:10:32 bacon Exp $
* $Id: main.c,v 1.5 2007-01-28 11:28:26 bacon Exp $
*/
#include <ase/types.h>
@ -15,7 +15,11 @@
#include <tchar.h>
#define ase_main _tmain
#elif defined(ASE_CHAR_IS_WCHAR) && defined(__unix)
#elif defined(ASE_CHAR_IS_MCHAR)
#define ase_main main
#else /* ASE_CHAR_IS_WCHAR */
#ifdef __cplusplus
extern "C" { int ase_main (...); }

View File

@ -1,5 +1,5 @@
/*
* $Id: printf.c,v 1.6 2007-01-27 02:55:55 bacon Exp $
* $Id: printf.c,v 1.7 2007-01-28 11:28:27 bacon Exp $
*/
#include <stdarg.h>
@ -11,12 +11,12 @@
#include <wctype.h>
#if defined(_WIN32)
#include <tchar.h>
#define ase_printf _tprintf
#define ase_vprintf _vtprintf
#define ase_fprintf _ftprintf
#define ase_vfprintf _vftprintf
#include <tchar.h>
#define ase_printf _tprintf
#define ase_vprintf _vtprintf
#define ase_fprintf _ftprintf
#define ase_vfprintf _vftprintf
int ase_vsprintf (ase_char_t* buf, size_t size, const ase_char_t* fmt, va_list ap)
{
@ -45,50 +45,18 @@ int ase_sprintf (ase_char_t* buf, size_t size, const ase_char_t* fmt, ...)
#else
#if defined(ASE_CHAR_IS_MCHAR)
#define ase_tolower(x) tolower(x)
#define ase_isdigit(x) isdigit(x)
#elif defined(ASE_CHAR_IS_WCHAR)
#define ase_tolower(x) towlower(x)
#define ase_isdigit(x) iswdigit(x)
#else
#error define ASE_CHAR_IS_MCHAR or ASE_CHAR_IS_WCHAR
#endif
#if defined(ASE_CHAR_IS_MCHAR)
#define ase_tolower(x) tolower(x)
#define ase_isdigit(x) isdigit(x)
#elif defined(ASE_CHAR_IS_WCHAR)
#define ase_tolower(x) towlower(x)
#define ase_isdigit(x) iswdigit(x)
#else
#error define ASE_CHAR_IS_MCHAR or ASE_CHAR_IS_WCHAR
#endif
static ase_char_t* __adjust_format (const ase_char_t* format);
int ase_vprintf (const ase_char_t* fmt, va_list ap);
int ase_vfprintf (FILE *stream, const ase_char_t* fmt, va_list ap);
int ase_vsprintf (ase_char_t* buf, size_t size, const ase_char_t* fmt, va_list ap);
int ase_printf (const ase_char_t* fmt, ...)
{
int n;
va_list ap;
va_start (ap, fmt);
n = ase_vprintf (fmt, ap);
va_end (ap);
return n;
}
int ase_fprintf (FILE* file, const ase_char_t* fmt, ...)
{
int n;
va_list ap;
va_start (ap, fmt);
n = ase_vfprintf (file, fmt, ap);
va_end (ap);
return n;
}
int ase_vprintf (const ase_char_t* fmt, va_list ap)
{
return ase_vfprintf (stdout, fmt, ap);
}
int ase_vfprintf (FILE *stream, const ase_char_t* fmt, va_list ap)
{
int n;
@ -104,13 +72,29 @@ int ase_vfprintf (FILE *stream, const ase_char_t* fmt, va_list ap)
return n;
}
int ase_sprintf (ase_char_t* buf, size_t size, const ase_char_t* fmt, ...)
int ase_vprintf (const ase_char_t* fmt, va_list ap)
{
return ase_vfprintf (stdout, fmt, ap);
}
int ase_fprintf (FILE* file, const ase_char_t* fmt, ...)
{
int n;
va_list ap;
va_start (ap, fmt);
n = ase_vsprintf (buf, size, fmt, ap);
n = ase_vfprintf (file, fmt, ap);
va_end (ap);
return n;
}
int ase_printf (const ase_char_t* fmt, ...)
{
int n;
va_list ap;
va_start (ap, fmt);
n = ase_vprintf (fmt, ap);
va_end (ap);
return n;
}
@ -138,6 +122,17 @@ int ase_vsprintf (ase_char_t* buf, size_t size, const ase_char_t* fmt, va_list a
return n;
}
int ase_sprintf (ase_char_t* buf, size_t size, const ase_char_t* fmt, ...)
{
int n;
va_list ap;
va_start (ap, fmt);
n = ase_vsprintf (buf, size, fmt, ap);
va_end (ap);
return n;
}
#define MOD_SHORT 1
#define MOD_LONG 2
#define MOD_LONGLONG 3