Annotation of /trunk/xalan-c/patches/xalan-c-1.11.0_pre797991-bugfixes.patch
Parent Directory | Revision Log
Revision 1376 -
(hide annotations)
(download)
Wed Jun 29 13:06:56 2011 UTC (13 years, 3 months ago) by niro
File size: 1652 byte(s)
Wed Jun 29 13:06:56 2011 UTC (13 years, 3 months ago) by niro
File size: 1652 byte(s)
serveral fixes
1 | niro | 1376 | diff -Naur xml-xalan.orig/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp |
2 | --- xml-xalan.orig/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp 2009-07-27 00:23:08.507787691 +0200 | ||
3 | +++ xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp 2009-07-27 00:53:50.781756249 +0200 | ||
4 | @@ -28,7 +28,7 @@ | ||
5 | #include <xalanc/PlatformSupport/DOMStringHelper.hpp> | ||
6 | |||
7 | #include <cstring> | ||
8 | - | ||
9 | +#include <cstdio> | ||
10 | #include <cerrno> | ||
11 | |||
12 | XALAN_CPP_NAMESPACE_BEGIN | ||
13 | @@ -44,7 +44,7 @@ | ||
14 | |||
15 | XalanNLSMessageLoader::~XalanNLSMessageLoader() | ||
16 | { | ||
17 | - if ((int)m_catalogHandle != -1) | ||
18 | + if ((long)m_catalogHandle != -1) | ||
19 | { | ||
20 | catclose(m_catalogHandle); | ||
21 | } | ||
22 | @@ -77,7 +77,7 @@ | ||
23 | */ | ||
24 | m_catalogHandle = catopen(fileName, 0); | ||
25 | |||
26 | - if (reinterpret_cast<int>(m_catalogHandle) == -1) | ||
27 | + if (reinterpret_cast<long>(m_catalogHandle) == -1) | ||
28 | { | ||
29 | // Probably have to call panic here | ||
30 | // the user will get an error with retrieving messages | ||
31 | @@ -87,8 +87,8 @@ | ||
32 | |||
33 | bool | ||
34 | XalanNLSMessageLoader::loadMsg( | ||
35 | - XalanMessages::Codes msgToLoad | ||
36 | - XalanDOMChar* toFill | ||
37 | + XalanMessages::Codes msgToLoad, | ||
38 | + XalanDOMChar* toFill, | ||
39 | XalanSize_t maxChars) | ||
40 | { | ||
41 | |||
42 | @@ -99,7 +99,7 @@ | ||
43 | return bRetValue; | ||
44 | } | ||
45 | |||
46 | - if (static_cast<int>(m_catalogHandle) == -1) | ||
47 | + if (reinterpret_cast<long>(m_catalogHandle) == -1) | ||
48 | { | ||
49 | // for transcoding to Unicode | ||
50 | const XalanDOMString errorMsg("Message can't be retrieved: the message catalog is not open.", m_memoryManager ); |