fixed a weird error where validity context whould not show up if warnings
* valid.c: fixed a weird error where validity context whould not
show up if warnings were disabled pointed out by Bob Stayton
* xmlIO.c doc/generator.py: cleanup and fix to regenerate the docs
* doc//* testapi.c: rebuilt the docs
Daniel
diff --git a/xmlIO.c b/xmlIO.c
index fe50a4e..848911c 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -209,26 +209,25 @@
static wchar_t *
__xmlIOWin32UTF8ToWChar(const char *u8String)
{
- wchar_t *wString = NULL;
+ wchar_t *wString = NULL;
- if (u8String)
- {
- int wLen = MultiByteToWideChar(CP_UTF8,MB_ERR_INVALID_CHARS,u8String,-1,NULL,0);
- if (wLen)
- {
- wString = xmlMalloc(wLen * sizeof(wchar_t));
- if (wString)
- {
- if (MultiByteToWideChar(CP_UTF8,0,u8String,-1,wString,wLen) == 0)
- {
- xmlFree(wString);
- wString = NULL;
- }
- }
- }
- }
-
- return wString;
+ if (u8String) {
+ int wLen =
+ MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, u8String,
+ -1, NULL, 0);
+ if (wLen) {
+ wString = xmlMalloc(wLen * sizeof(wchar_t));
+ if (wString) {
+ if (MultiByteToWideChar
+ (CP_UTF8, 0, u8String, -1, wString, wLen) == 0) {
+ xmlFree(wString);
+ wString = NULL;
+ }
+ }
+ }
+ }
+
+ return wString;
}
#endif
@@ -669,8 +668,10 @@
#endif
}
-static int (* xmlWrapStat)(const char *,struct stat *) = xmlWrapStatNative;
-static FILE* (* xmlWrapOpen)(const char *,int mode) = xmlWrapOpenNative;
+typedef int (* xmlWrapStatFunc) (const char *f, struct stat *s);
+static xmlWrapStatFunc xmlWrapStat = xmlWrapStatNative;
+typedef FILE* (* xmlWrapOpenFunc)(const char *f,int mode);
+static xmlWrapOpenFunc = xmlWrapOpenNative;
/**
* xmlInitPlatformSpecificIo:
@@ -678,8 +679,8 @@
* Initialize platform specific features.
*/
static void
-xmlInitPlatformSpecificIo
-(void) {
+xmlInitPlatformSpecificIo(void)
+{
static int xmlPlatformIoInitialized = 0;
OSVERSIONINFO osvi;
@@ -2105,8 +2106,7 @@
* Registers the default compiled-in I/O handlers.
*/
void
-xmlRegisterDefaultInputCallbacks
-(void) {
+xmlRegisterDefaultInputCallbacks(void) {
if (xmlInputCallbackInitialized)
return;
@@ -2140,8 +2140,7 @@
* Registers the default compiled-in I/O handlers.
*/
void
-xmlRegisterDefaultOutputCallbacks
-(void) {
+xmlRegisterDefaultOutputCallbacks (void) {
if (xmlOutputCallbackInitialized)
return;