|
From: <sv...@va...> - 2005-05-13 21:49:35
|
Author: njn
Date: 2005-05-13 22:49:30 +0100 (Fri, 13 May 2005)
New Revision: 3696
Modified:
trunk/coregrind/vg_messages.c
trunk/coregrind/vg_mylibc.c
trunk/include/tool.h
Log:
Use HChar for format strings to printf-like functions.
Modified: trunk/coregrind/vg_messages.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/vg_messages.c 2005-05-13 21:44:07 UTC (rev 3695)
+++ trunk/coregrind/vg_messages.c 2005-05-13 21:49:30 UTC (rev 3696)
@@ -34,7 +34,7 @@
#include <time.h>
#include <sys/time.h>
=20
-UInt VG_(vmessage) ( VgMsgKind kind, const Char* format, va_list vargs )
+UInt VG_(vmessage) ( VgMsgKind kind, const HChar* format, va_list vargs =
)
{
UInt count =3D 0;
Char c;
@@ -79,7 +79,7 @@
}
=20
/* Send a simple single-part message. */
-UInt VG_(message) ( VgMsgKind kind, const Char* format, ... )
+UInt VG_(message) ( VgMsgKind kind, const HChar* format, ... )
{
UInt count;
va_list vargs;
Modified: trunk/coregrind/vg_mylibc.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/vg_mylibc.c 2005-05-13 21:44:07 UTC (rev 3695)
+++ trunk/coregrind/vg_mylibc.c 2005-05-13 21:49:30 UTC (rev 3696)
@@ -427,7 +427,7 @@
myprintf_buf->buf[myprintf_buf->n] =3D 0;
}
=20
-UInt VG_(vprintf) ( const char *format, va_list vargs )
+UInt VG_(vprintf) ( const HChar *format, va_list vargs )
{
UInt ret =3D 0;
printf_buf myprintf_buf =3D {"",0};
@@ -444,7 +444,7 @@
return ret;
}
=20
-UInt VG_(printf) ( const char *format, ... )
+UInt VG_(printf) ( const HChar *format, ... )
{
UInt ret;
va_list vargs;
@@ -463,7 +463,7 @@
*(*vg_sprintf_ptr)++ =3D c;
}
=20
-UInt VG_(vsprintf) ( Char* buf, const Char *format, va_list vargs )
+UInt VG_(vsprintf) ( Char* buf, const HChar *format, va_list vargs )
{
Int ret;
Char *vg_sprintf_ptr =3D buf;
@@ -477,7 +477,7 @@
return ret;
}
=20
-UInt VG_(sprintf) ( Char* buf, const Char *format, ... )
+UInt VG_(sprintf) ( Char* buf, const HChar *format, ... )
{
UInt ret;
va_list vargs;
@@ -954,7 +954,7 @@
}
=20
void VG_(assert_fail) ( Bool isCore, const Char* expr, const Char* file,=
=20
- Int line, const Char* fn, const Char* format, ..=
. )
+ Int line, const Char* fn, const HChar* format, .=
.. )
{
va_list vargs;
Char buf[256];
Modified: trunk/include/tool.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/include/tool.h 2005-05-13 21:44:07 UTC (rev 3695)
+++ trunk/include/tool.h 2005-05-13 21:49:30 UTC (rev 3696)
@@ -139,8 +139,8 @@
VgMsgKind;
=20
/* Send a single-part message. Appends a newline. */
-extern UInt VG_(message) ( VgMsgKind kind, const Char* format, ... );
-extern UInt VG_(vmessage) ( VgMsgKind kind, const Char* format, va_lis=
t vargs );
+extern UInt VG_(message) ( VgMsgKind kind, const HChar* format, ... )=
;
+extern UInt VG_(vmessage) ( VgMsgKind kind, const HChar* format, va_li=
st vargs );
=20
=20
/*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/
@@ -261,11 +261,11 @@
* --log-fd/--log-file/--log-socket argument, which defaults to 2 (stder=
r).
* Hence no need for VG_(fprintf)().
*/
-extern UInt VG_(printf) ( const char *format, ... );
-extern UInt VG_(vprintf) ( const char *format, va_list vargs );
+extern UInt VG_(printf) ( const HChar *format, ... );
+extern UInt VG_(vprintf) ( const HChar *format, va_list vargs );
/* too noisy ... __attribute__ ((format (printf, 1, 2))) ; */
-extern UInt VG_(sprintf) ( Char* buf, const Char* format, ... );
-extern UInt VG_(vsprintf)( Char* buf, const Char* format, va_list vargs =
);
+extern UInt VG_(sprintf) ( Char* buf, const HChar* format, ... );
+extern UInt VG_(vsprintf)( Char* buf, const HChar* format, va_list vargs=
);
=20
extern Int VG_(rename) ( Char* old_name, Char* new_name );
=20
@@ -408,7 +408,7 @@
__attribute__ ((__noreturn__))
extern void VG_(assert_fail) ( Bool isCore, const Char* expr, const Char=
* file,=20
Int line, const Char* fn,=20
- const Char* format, ... );
+ const HChar* format, ... );
=20
/* ------------------------------------------------------------------ */
/* Get memory by anonymous mmap. */
|