You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ro...@locus.apache.org on 2000/03/28 21:43:27 UTC
cvs commit: xml-xerces/c/src/validators/DTD CMLeaf.hpp CMNode.hpp DFAContentModel.cpp
roddey 00/03/28 11:43:26
Modified: c/Projects/Win32/Unsupported/IntVC6/XML4CParser
XML4CParser.dsp
c/Projects/Win32/Unsupported/IntVC6/XMLUtil XMLUtil.dsp
c/samples/SAXPrint SAXPrint.cpp SAXPrintHandlers.cpp
SAXPrintHandlers.hpp
c/src/NLS/EN_US XMLErrList_EN_US.Xml
c/src/dom DOMString.cpp NodeVector.cpp TextImpl.cpp
c/src/framework XMLAttr.cpp XMLValidator.cpp
c/src/internal XMLReader.cpp
c/src/util TransService.cpp TransService.hpp
XMLExceptMsgs.hpp XMLMsgLoader.hpp
XMLUTF8Transcoder.cpp
c/src/util/MsgLoaders/InMemory CppErrMsgs_EN_US.hpp
InMemMsgLoader.cpp InMemMsgLoader.hpp
c/src/util/MsgLoaders/MsgCatalog XMLMsgCat_EN_US.Msg
c/src/util/MsgLoaders/Win32 Win32MsgLoader.cpp
Win32MsgLoader.hpp
c/src/util/Platforms/Win32 Version.rc
c/src/util/Transcoders/Iconv IconvTransService.cpp
c/src/validators/DTD CMLeaf.hpp CMNode.hpp
DFAContentModel.cpp
Added: c/src/framework XMLFormatter.cpp XMLFormatter.hpp
Log:
Fixes for signed/unsigned warnings. New work for two way transcoding
stuff.
Revision Changes Path
1.4 +8 -0 xml-xerces/c/Projects/Win32/Unsupported/IntVC6/XML4CParser/XML4CParser.dsp
Index: XML4CParser.dsp
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/Win32/Unsupported/IntVC6/XML4CParser/XML4CParser.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XML4CParser.dsp 2000/01/12 00:27:57 1.3
+++ XML4CParser.dsp 2000/03/28 19:43:10 1.4
@@ -140,6 +140,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\..\..\..\src\framework\XMLFormatter.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\..\src\framework\XMLNotationDecl.cpp
# End Source File
# Begin Source File
@@ -217,6 +221,10 @@
# Begin Source File
SOURCE=..\..\..\..\..\src\framework\XMLErrorReporter.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\framework\XMLFormatter.hpp
# End Source File
# Begin Source File
1.16 +1 -1 xml-xerces/c/Projects/Win32/Unsupported/IntVC6/XMLUtil/XMLUtil.dsp
Index: XMLUtil.dsp
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/Win32/Unsupported/IntVC6/XMLUtil/XMLUtil.dsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XMLUtil.dsp 2000/03/23 01:02:37 1.15
+++ XMLUtil.dsp 2000/03/28 19:43:11 1.16
@@ -71,7 +71,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLUTIL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /I "\icu_1_4_0\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "PROJ_XMLUTIL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /GZ /c
+# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /I "\icu_1_4_0\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "PROJ_XMLUTIL" /D "XML_USE_ICU_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
1.7 +29 -12 xml-xerces/c/samples/SAXPrint/SAXPrint.cpp
Index: SAXPrint.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAXPrint/SAXPrint.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SAXPrint.cpp 2000/03/03 01:29:31 1.6
+++ SAXPrint.cpp 2000/03/28 19:43:11 1.7
@@ -56,6 +56,10 @@
/*
* $Log: SAXPrint.cpp,v $
+ * Revision 1.7 2000/03/28 19:43:11 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.6 2000/03/03 01:29:31 roddey
* Added a scanReset()/parseReset() method to the scanner and
* parsers, to allow for reset after early exit from a progressive parse.
@@ -89,6 +93,7 @@
// Includes
// ---------------------------------------------------------------------------
#include <util/PlatformUtils.hpp>
+#include <util/TransService.hpp>
#include <parsers/SAXParser.hpp>
#include "SAXPrint.hpp"
@@ -109,13 +114,18 @@
// Indicates whether the validating or non-validating parser should be
// used. Defaults to validating, -NV overrides.
//
+// encodingName
+// The encoding we are to output in. If not set on the command line,
+// then it is defaulted to UTF-8.
+//
// xmlFile
// The path to the file to parser. Set via command line.
// ---------------------------------------------------------------------------
-static bool doEscapes = true;
-static bool doNamespaces = false;
-static bool doValidation = false;
-static char* xmlFile = 0;
+static bool doEscapes = true;
+static bool doNamespaces = false;
+static bool doValidation = false;
+static const char* encodingName = "UTF-8";
+static char* xmlFile = 0;
@@ -131,6 +141,7 @@
<< " -NoEscape Don't escape special characters in output\n"
<< " -v Invoke the Validating SAX Parser.\n"
<< " -n Enable namespace processing.\n"
+ << " -x=XXX Use a particular transcoder for output.\n"
<< " -? Show this help\n"
<< endl;
}
@@ -186,6 +197,11 @@
{
doNamespaces = true;
}
+ else if (!strncmp(argV[parmInd], "-x=", 3))
+ {
+ // Get out the encoding name
+ encodingName = &argV[parmInd][3];
+ }
else if (!strcmp(argV[parmInd], "-NoEscape"))
{
doEscapes = false;
@@ -218,22 +234,21 @@
//
// Create the handler object and install it as the document and error
- // handler for the parser.
+ // handler for the parser. Then parse the file and catch any exceptions
+ // that propogate out
//
- SAXPrintHandlers handler(doEscapes);
- parser.setDocumentHandler(&handler);
- parser.setErrorHandler(&handler);
-
- // Parse the file and catch any exceptions that propogate out
try
{
+ SAXPrintHandlers handler(encodingName, doEscapes);
+ parser.setDocumentHandler(&handler);
+ parser.setErrorHandler(&handler);
+
parser.parse(xmlFile);
}
catch (const XMLException& toCatch)
{
- cerr << "\nFile not found: '" << xmlFile << "'\n"
- << "Exception message is: \n"
+ cerr << "\nAn error occured\n Error: "
<< StrX(toCatch.getMessage())
<< "\n" << endl;
return -1;
1.5 +33 -54 xml-xerces/c/samples/SAXPrint/SAXPrintHandlers.cpp
Index: SAXPrintHandlers.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAXPrint/SAXPrintHandlers.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SAXPrintHandlers.cpp 2000/03/02 19:53:49 1.4
+++ SAXPrintHandlers.cpp 2000/03/28 19:43:11 1.5
@@ -56,6 +56,10 @@
/*
* $Log: SAXPrintHandlers.cpp,v $
+ * Revision 1.5 2000/03/28 19:43:11 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.4 2000/03/02 19:53:49 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -88,9 +92,14 @@
// ---------------------------------------------------------------------------
// SAXPrintHandlers: Constructors and Destructor
// ---------------------------------------------------------------------------
-SAXPrintHandlers::SAXPrintHandlers(const bool doEscapes) :
-
- fDoEscapes(doEscapes)
+SAXPrintHandlers::SAXPrintHandlers( const char* const encodingName
+ , const bool doEscapes) :
+ fFormatter
+ (
+ encodingName
+ , (doEscapes ? XMLFormatter::StdEscapes : XMLFormatter::NoEscapes)
+ , this
+ )
{
}
@@ -100,6 +109,16 @@
// ---------------------------------------------------------------------------
+// SAXPrintHandlers: Overrides of the output formatter target interface
+// ---------------------------------------------------------------------------
+void SAXPrintHandlers::writeChars(const XMLByte* const toWrite)
+{
+ // For this one, just dump them to the standard output
+ cout << toWrite;
+}
+
+
+// ---------------------------------------------------------------------------
// SAXPrintHandlers: Overrides of the SAX ErrorHandler interface
// ---------------------------------------------------------------------------
void SAXPrintHandlers::error(const SAXParseException& e)
@@ -153,46 +172,7 @@
void SAXPrintHandlers::characters(const XMLCh* const chars
, const unsigned int length)
{
- // Transcode to UTF-8 for portable display
- StrX tmpXCode(chars);
- const char* tmpText = tmpXCode.localForm();
-
- //
- // If we were asked to escape special chars, then do that. Else just
- // display it as normal text.
- //
- if (fDoEscapes)
- {
- for (unsigned int index = 0; index < length; index++)
- {
- switch (tmpText[index])
- {
- case chAmpersand :
- cout << "&";
- break;
-
- case chOpenAngle :
- cout << "<";
- break;
-
- case chCloseAngle:
- cout << ">";
- break;
-
- case chDoubleQuote :
- cout << """;
- break;
-
- default:
- cout << tmpText[index];
- break;
- }
- }
- }
- else
- {
- cout << tmpText;
- }
+ fFormatter.formatBuf(chars, length);
}
@@ -202,22 +182,22 @@
void SAXPrintHandlers::endElement(const XMLCh* const name)
{
- cout << "</" << StrX(name) << ">";
+ fFormatter << "</" << name << ">";
}
void SAXPrintHandlers::ignorableWhitespace( const XMLCh* const chars
,const unsigned int length)
{
- cout << StrX(chars);
+ fFormatter.formatBuf(chars, length);
}
void SAXPrintHandlers::processingInstruction(const XMLCh* const target
, const XMLCh* const data)
{
- cout << "<?" << StrX(target);
+ fFormatter << "<?" << target;
if (data)
- cout << " " << StrX(data);
- cout << "?>\n";
+ fFormatter << " " << data;
+ fFormatter << "?>\n";
}
void SAXPrintHandlers::startDocument()
@@ -227,15 +207,13 @@
void SAXPrintHandlers::startElement(const XMLCh* const name
, AttributeList& attributes)
{
- cout << "<" << StrX(name);
+ fFormatter << "<" << name;
unsigned int len = attributes.getLength();
for (unsigned int index = 0; index < len; index++)
{
- cout << " " << StrX(attributes.getName(index)) << "=\"";
- cout << StrX(attributes.getValue(index)) << "\"";
+ fFormatter << " " << attributes.getName(index) << "=\""
+ << attributes.getValue(index) << "\"";
}
- cout << ">";
+ fFormatter << ">";
}
-
-
1.4 +26 -6 xml-xerces/c/samples/SAXPrint/SAXPrintHandlers.hpp
Index: SAXPrintHandlers.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SAXPrint/SAXPrintHandlers.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SAXPrintHandlers.hpp 2000/03/02 19:53:49 1.3
+++ SAXPrintHandlers.hpp 2000/03/28 19:43:12 1.4
@@ -56,6 +56,10 @@
/*
* $Log: SAXPrintHandlers.hpp,v $
+ * Revision 1.4 2000/03/28 19:43:12 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.3 2000/03/02 19:53:49 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -74,18 +78,32 @@
#include <sax/HandlerBase.hpp>
+#include <framework/XMLFormatter.hpp>
-class SAXPrintHandlers : public HandlerBase
+class SAXPrintHandlers : public HandlerBase, private XMLFormatTarget
{
public:
// -----------------------------------------------------------------------
// Constructors
// -----------------------------------------------------------------------
- SAXPrintHandlers(const bool doEscapes);
+ SAXPrintHandlers
+ (
+ const char* const encodingName
+ , const bool doEscapes
+ );
~SAXPrintHandlers();
// -----------------------------------------------------------------------
+ // Implementations of the format target interface
+ // -----------------------------------------------------------------------
+ void writeChars
+ (
+ const XMLByte* const toWrite
+ );
+
+
+ // -----------------------------------------------------------------------
// Implementations of the SAX DocumentHandler interface
// -----------------------------------------------------------------------
void endDocument();
@@ -144,9 +162,10 @@
// -----------------------------------------------------------------------
// Private data members
//
- // fDoEscapes
- // Indicates whether characters should be escaped via char refs if
- // they would normally be in that place in a legal XML file.
+ // fFormatter
+ // This is the formatter object that is used to output the data
+ // to the target. It is set up to format to the standard output
+ // stream.
// -----------------------------------------------------------------------
- bool fDoEscapes;
+ XMLFormatter fFormatter;
};
1.11 +1 -1 xml-xerces/c/src/NLS/EN_US/XMLErrList_EN_US.Xml
Index: XMLErrList_EN_US.Xml
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/NLS/EN_US/XMLErrList_EN_US.Xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLErrList_EN_US.Xml 2000/03/23 01:02:38 1.10
+++ XMLErrList_EN_US.Xml 2000/03/28 19:43:12 1.11
@@ -229,7 +229,6 @@
<Message Id="Pool_ZeroModulus" Text="The modulus value cannot be zero"/>
<Message Id="RdrMgr_ReaderIdNotFound" Text="The indicated reader id was never found"/>
<Message Id="Reader_BadAutoEncoding" Text="The auto encoding enum has an unknown value"/>
- <Message Id="Reader_CantCreateCvtrFor" Text="Could not create a converter for encoding: {0}"/>
<Message Id="Reader_CouldNotDecodeFirstLine" Text="Could not decode first line of entity: {0}"/>
<Message Id="Reader_EOIInMultiSeq" Text="End of input was hit in the middle of a multibyte sequence"/>
<Message Id="Reader_SrcOfsNotSupported" Text="The current transcoding service does not support source offset information"/>
@@ -256,6 +255,7 @@
<Message Id="Trans_BadSrcSeq" Text="An invalid multi-byte source text sequence was encountered"/>
<Message Id="Trans_BadSrcCP" Text="{0} is not a valid value for encoding {1}"/>
<Message Id="Trans_BadTrailingSurrogate" Text="Leading surrogate was not followed by trailing"/>
+ <Message Id="Trans_CantCreateCvtrFor" Text="Could not create a converter for encoding: {0}"/>
<Message Id="URL_MalformedURL" Text="The URL was not correctly formed"/>
<Message Id="URL_UnsupportedProto" Text="The URL used an unsupported protocol"/>
<Message Id="URL_UnsupportedProto1" Text="Unsupported URL protocol: '{0}'"/>
1.15 +6 -1 xml-xerces/c/src/dom/DOMString.cpp
Index: DOMString.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/DOMString.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DOMString.cpp 2000/03/02 19:53:52 1.14
+++ DOMString.cpp 2000/03/28 19:43:13 1.15
@@ -56,6 +56,10 @@
/*
* $Log: DOMString.cpp,v $
+ * Revision 1.15 2000/03/28 19:43:13 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.14 2000/03/02 19:53:52 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -658,7 +662,7 @@
XMLCh DOMString::charAt(unsigned int index) const
{
XMLCh retCh = 0;
- if (fHandle != 0 && index >= 0 && index < fHandle->fLength)
+ if ((fHandle != 0) && (index < fHandle->fLength))
retCh = fHandle->fDSData->fData[index];
return retCh;
};
1.5 +5 -3 xml-xerces/c/src/dom/NodeVector.cpp
Index: NodeVector.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/NodeVector.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NodeVector.cpp 2000/03/02 19:54:03 1.4
+++ NodeVector.cpp 2000/03/28 19:43:13 1.5
@@ -56,6 +56,10 @@
/*
* $Log: NodeVector.cpp,v $
+ * Revision 1.5 2000/03/28 19:43:13 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.4 2000/03/02 19:54:03 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -150,7 +154,6 @@
unsigned int i;
assert(index <= nextFreeSlot);
- assert(index >= 0);
checkSpace();
for (i=nextFreeSlot; i>index; --i) {
@@ -163,7 +166,6 @@
void NodeVector::removeElementAt(unsigned int index) {
- assert (index >= 0);
assert(index < nextFreeSlot);
for (unsigned int i=index; i<nextFreeSlot-1; ++i) {
data[i] = data[i+1];
@@ -176,7 +178,6 @@
};
void NodeVector::setElementAt(NodeImpl *elem, unsigned int index) {
- assert(index >= 0);
assert(index < nextFreeSlot);
data[index] = elem;
};
1.7 +20 -16 xml-xerces/c/src/dom/TextImpl.cpp
Index: TextImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/TextImpl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TextImpl.cpp 2000/03/24 01:30:50 1.6
+++ TextImpl.cpp 2000/03/28 19:43:14 1.7
@@ -56,6 +56,10 @@
/*
* $Log: TextImpl.cpp,v $
+ * Revision 1.7 2000/03/28 19:43:14 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.6 2000/03/24 01:30:50 chchou
* Fix bug #8 to support ignorable whitespace text nodes
*
@@ -112,45 +116,46 @@
bool TextImpl::isTextImpl()
{
- return true;
+ return true;
};
NodeImpl *TextImpl::cloneNode(bool deep)
{
- return ownerDocument->createTextNode(value);
+ return ownerDocument->createTextNode(value);
};
TextImpl *TextImpl::splitText(unsigned int offset)
{
- if (readOnly)
- throw DOM_DOMException(
- DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
- unsigned int len = value.length(); //assert(value.length() >= 0)
- if (offset < 0 || offset >= len)
+ if (readOnly)
+ {
+ throw DOM_DOMException(
+ DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
+ }
+ unsigned int len = value.length();
+ if (offset >= len)
throw DOM_DOMException(DOM_DOMException::INDEX_SIZE_ERR, null);
- TextImpl *newText =
+ TextImpl *newText =
(TextImpl *) ownerDocument->createTextNode(
value.substringData(offset, value.length() - offset));
- NodeImpl *parent = getParentNode();
- if (parent != null)
- parent->insertBefore(newText, getNextSibling());
-
- value = value.substringData(0, offset);
+ NodeImpl *parent = getParentNode();
+ if (parent != null)
+ parent->insertBefore(newText, getNextSibling());
- return newText;
+ value = value.substringData(0, offset);
+ return newText;
};
bool TextImpl::isIgnorableWhitespace()
{
- return fIgnorableWhitespace;
+ return fIgnorableWhitespace;
}
void TextImpl::setIgnorableWhitespace(bool ignorable)
{
- fIgnorableWhitespace = ignorable;
+ fIgnorableWhitespace = ignorable;
}
1.5 +6 -1 xml-xerces/c/src/framework/XMLAttr.cpp
Index: XMLAttr.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/framework/XMLAttr.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLAttr.cpp 2000/03/02 19:54:24 1.4
+++ XMLAttr.cpp 2000/03/28 19:43:16 1.5
@@ -56,6 +56,10 @@
/**
* $Log: XMLAttr.cpp,v $
+ * Revision 1.5 2000/03/28 19:43:16 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.4 2000/03/02 19:54:24 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -183,7 +187,7 @@
unsigned int newLen;
newLen = XMLString::stringLen(attrName);
- if (!fNameBufSz | (newLen > fNameBufSz))
+ if (!fNameBufSz || (newLen > fNameBufSz))
{
delete [] fName;
fNameBufSz = newLen + 8;
1.6 +10 -5 xml-xerces/c/src/framework/XMLValidator.cpp
Index: XMLValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/framework/XMLValidator.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLValidator.cpp 2000/03/02 19:54:25 1.5
+++ XMLValidator.cpp 2000/03/28 19:43:17 1.6
@@ -56,6 +56,10 @@
/**
* $Log: XMLValidator.cpp,v $
+ * Revision 1.6 2000/03/28 19:43:17 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.5 2000/03/02 19:54:25 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -311,13 +315,13 @@
XMLValidator::XMLValidator(XMLErrorReporter* const errReporter) :
fBufMgr(0)
- , fEmptyNamespaceId(-1)
+ , fEmptyNamespaceId(~0)
, fErrorReporter(errReporter)
- , fGlobalNamespaceId(-1)
+ , fGlobalNamespaceId(~0)
, fReaderMgr(0)
, fScanner(0)
- , fUnknownNamespaceId(-1)
- , fXMLNamespaceId(-1)
- , fXMLNSNamespaceId(-1)
+ , fUnknownNamespaceId(~0)
+ , fXMLNamespaceId(~0)
+ , fXMLNSNamespaceId(~0)
{
}
1.1 xml-xerces/c/src/framework/XMLFormatter.cpp
Index: XMLFormatter.cpp
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact apache\@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
/**
* $Log: XMLFormatter.cpp,v $
* Revision 1.1 2000/03/28 19:43:17 roddey
* Fixes for signed/unsigned warnings. New work for two way transcoding
* stuff.
*
*/
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
#include <util/PlatformUtils.hpp>
#include <util/XMLString.hpp>
#include <util/TransService.hpp>
#include <util/TranscodingException.hpp>
#include <util/XMLExceptMsgs.hpp>
#include <framework/XMLFormatter.hpp>
// ---------------------------------------------------------------------------
// XMLFormatter: Constructors and Destructor
// ---------------------------------------------------------------------------
XMLFormatter::XMLFormatter( const char* const outEncoding
, const EscapeFlags escapeFlags
, XMLFormatTarget* const target) :
fEscapeFlags(escapeFlags)
, fOutEncoding(0)
, fTarget(target)
, fXCoder(0)
{
// Transcode the encoding string
fOutEncoding = XMLString::transcode(outEncoding);
// Try to create a transcoder for this encoding
XMLTransService::Codes resCode;
fXCoder = XMLPlatformUtils::fgTransService->makeNewTranscoderFor
(
fOutEncoding
, resCode
, 64 * 1024
);
if (!fXCoder)
{
delete [] fOutEncoding;
fOutEncoding = 0;
ThrowXML1
(
TranscodingException
, XMLExcepts::Trans_CantCreateCvtrFor
, outEncoding
);
}
}
XMLFormatter::XMLFormatter( const XMLCh* const outEncoding
, const EscapeFlags escapeFlags
, XMLFormatTarget* const target) :
fEscapeFlags(escapeFlags)
, fOutEncoding(0)
, fTarget(target)
, fXCoder(0)
{
// Copy the encoding string
fOutEncoding = XMLString::replicate(outEncoding);
// Try to create a transcoder for this encoding
XMLTransService::Codes resCode;
fXCoder = XMLPlatformUtils::fgTransService->makeNewTranscoderFor
(
fOutEncoding
, resCode
, kTmpBufSize
);
if (!fXCoder)
{
delete [] fOutEncoding;
fOutEncoding = 0;
ThrowXML1
(
TranscodingException
, XMLExcepts::Trans_CantCreateCvtrFor
, outEncoding
);
}
}
XMLFormatter::~XMLFormatter()
{
delete [] fOutEncoding;
delete fXCoder;
// We DO NOT own the target object!
}
// ---------------------------------------------------------------------------
// XMLFormatter: Formatting methods
// ---------------------------------------------------------------------------
void
XMLFormatter::formatBuf(const XMLCh* const toFormat, const unsigned int count)
{
//
// If we don't have any escape flags set, then we can do the most
// efficient loop, else we have to do it the hard way.
//
unsigned int srcCount = count;
const XMLCh* srcPtr = toFormat;
if (fEscapeFlags == NoEscapes)
{
//
// Just do a whole buffer at a time into the temp buffer, cap it
// off, and send it to the target.
//
while (srcCount)
{
unsigned int charsEaten;
const unsigned srcChars = srcCount > kTmpBufSize ?
kTmpBufSize : srcCount;
const unsigned int outBytes = fXCoder->transcodeTo
(
srcPtr
, srcChars
, fTmpBuf
, kTmpBufSize
, charsEaten
, XMLTranscoder::UnRep_Throw
);
#if XML_DEBUG
if ((outBytes > kTmpBufSize)
|| (charsEaten > srcCount))
{
// <TBD> The transcoder is freakin out maaaannn
}
#endif
if (outBytes)
{
fTmpBuf[outBytes] = 0;
fTarget->writeChars(fTmpBuf);
}
srcCount -= charsEaten;
}
}
else
{
}
}
XMLFormatter& XMLFormatter::operator<<(const XMLCh* const toFormat)
{
const unsigned int len = XMLString::stringLen(toFormat);
formatBuf(toFormat, len);
return *this;
}
XMLFormatter& XMLFormatter::operator<<(const char* const toFormat)
{
fTarget->writeChars((const XMLByte*)toFormat);
return *this;
}
1.1 xml-xerces/c/src/framework/XMLFormatter.hpp
Index: XMLFormatter.hpp
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact apache\@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
/*
* $Log: XMLFormatter.hpp,v $
* Revision 1.1 2000/03/28 19:43:17 roddey
* Fixes for signed/unsigned warnings. New work for two way transcoding
* stuff.
*
*/
#if !defined(XMLFORMATTER_HPP)
#define XMLFORMATTER_HPP
#include <util/XercesDefs.hpp>
class XMLFormatTarget;
class XMLTranscoder;
/**
* This class provides the basic formatting capabilities that are required
* to turn the Unicode based XML data from the parsers into a form that can
* be used on non-Unicode based systems, i.e. into local or generic text
* encodings.
*
* A number of flags are provided to control whether various optional
* formatting operations are performed.
*/
class XMLPARSER_EXPORT XMLFormatter
{
public:
// -----------------------------------------------------------------------
// Class types
// -----------------------------------------------------------------------
enum EscapeFlags
{
NoEscapes
, StdEscapes
, FailEscapes
, AllEscapes
};
// -----------------------------------------------------------------------
// Constructors and Destructor
// -----------------------------------------------------------------------
XMLFormatter
(
const XMLCh* const outEncoding
, const EscapeFlags escapeFlags
, XMLFormatTarget* const target
);
XMLFormatter
(
const char* const outEncoding
, const EscapeFlags escapeFlags
, XMLFormatTarget* const target
);
~XMLFormatter();
// -----------------------------------------------------------------------
// Formatting methods
// -----------------------------------------------------------------------
void formatBuf
(
const XMLCh* const toFormat
, const unsigned int count
);
XMLFormatter& operator<<
(
const XMLCh* const toFormat
);
XMLFormatter& operator<<
(
const char* const toFormat
);
private :
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
XMLFormatter();
XMLFormatter(const XMLFormatter&);
void operator=(const XMLFormatter&);
// -----------------------------------------------------------------------
// Private class constants
// -----------------------------------------------------------------------
enum Constants
{
kTmpBufSize = 8192
};
// -----------------------------------------------------------------------
// Private, non-virtual methods
//
// fEscapeFlags
// The escape flags we were told to use in formatting. These are
// defaults set in the ctor, which can be overridden on a particular
// call.
//
// fOutEncoding
// This the name of the output encoding. Saved mainly for meaningful
// error messages.
//
// fTarget
// This is the target object for the formatting operation.
//
// fXCoder
// This the transcoder that we will use. It is created using the
// encoding name we were told to use.
// -----------------------------------------------------------------------
EscapeFlags fEscapeFlags;
XMLCh* fOutEncoding;
XMLFormatTarget* fTarget;
XMLTranscoder* fXCoder;
XMLByte fTmpBuf[kTmpBufSize + 1];
};
class XMLPARSER_EXPORT XMLFormatTarget
{
public:
// -----------------------------------------------------------------------
// Constructors and Destructor
// -----------------------------------------------------------------------
virtual ~XMLFormatTarget() {}
// -----------------------------------------------------------------------
// Virtual interface
// -----------------------------------------------------------------------
virtual void writeChars
(
const XMLByte* const toWrite
) = 0;
protected :
// -----------------------------------------------------------------------
// Hidden constructors and operators
// -----------------------------------------------------------------------
XMLFormatTarget() {}
XMLFormatTarget(const XMLFormatTarget&) {}
void operator=(const XMLFormatTarget&) {}
};
#endif
1.12 +8 -5 xml-xerces/c/src/internal/XMLReader.cpp
Index: XMLReader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLReader.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMLReader.cpp 2000/03/17 23:59:53 1.11
+++ XMLReader.cpp 2000/03/28 19:43:18 1.12
@@ -56,6 +56,10 @@
/*
* $Log: XMLReader.cpp,v $
+ * Revision 1.12 2000/03/28 19:43:18 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.11 2000/03/17 23:59:53 roddey
* Initial updates for two way transcoding support
*
@@ -318,8 +322,8 @@
{
ThrowXML1
(
- RuntimeException
- , XMLExcepts::Reader_CantCreateCvtrFor
+ TranscodingException
+ , XMLExcepts::Trans_CantCreateCvtrFor
, fEncodingStr
);
}
@@ -413,8 +417,8 @@
{
ThrowXML1
(
- RuntimeException
- , XMLExcepts::Reader_CantCreateCvtrFor
+ TranscodingException
+ , XMLExcepts::Trans_CantCreateCvtrFor
, fEncodingStr
);
}
@@ -1316,7 +1320,7 @@
);
if (!fTranscoder)
- ThrowXML1(RuntimeException, XMLExcepts::Reader_CantCreateCvtrFor, fEncodingStr);
+ ThrowXML1(TranscodingException, XMLExcepts::Trans_CantCreateCvtrFor, fEncodingStr);
// Update the base encoding member with the new base encoding found
fEncoding = newBaseEncoding;
1.16 +12 -0 xml-xerces/c/src/util/TransService.cpp
Index: TransService.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/TransService.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TransService.cpp 2000/03/17 23:59:54 1.15
+++ TransService.cpp 2000/03/28 19:43:19 1.16
@@ -58,6 +58,7 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
+#include <util/Janitor.hpp>
#include <util/RefHashTableOf.hpp>
#include <util/XML88591Transcoder.hpp>
#include <util/XMLASCIITranscoder.hpp>
@@ -151,6 +152,17 @@
// ---------------------------------------------------------------------------
// XLMTranscoder: Non-virtual API
// ---------------------------------------------------------------------------
+XMLTranscoder*
+XMLTransService::makeNewTranscoderFor( const char* const encodingName
+ , XMLTransService::Codes& resValue
+ , const unsigned int blockSize)
+{
+ XMLCh* tmpName = XMLString::transcode(encodingName);
+ ArrayJanitor<XMLCh> janName(tmpName);
+
+ return makeNewTranscoderFor(tmpName, resValue, blockSize);
+}
+
XMLTranscoder*
XMLTransService::makeNewTranscoderFor( const XMLCh* const encodingName
, XMLTransService::Codes& resValue
1.10 +10 -0 xml-xerces/c/src/util/TransService.hpp
Index: TransService.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/TransService.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TransService.hpp 2000/03/17 23:59:54 1.9
+++ TransService.hpp 2000/03/28 19:43:19 1.10
@@ -56,6 +56,10 @@
/*
* $Log: TransService.hpp,v $
+ * Revision 1.10 2000/03/28 19:43:19 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.9 2000/03/17 23:59:54 roddey
* Initial updates for two way transcoding support
*
@@ -150,6 +154,13 @@
XMLTranscoder* makeNewTranscoderFor
(
const XMLCh* const encodingName
+ , XMLTransService::Codes& resValue
+ , const unsigned int blockSize
+ );
+
+ XMLTranscoder* makeNewTranscoderFor
+ (
+ const char* const encodingName
, XMLTransService::Codes& resValue
, const unsigned int blockSize
);
1.10 +27 -27 xml-xerces/c/src/util/XMLExceptMsgs.hpp
Index: XMLExceptMsgs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/XMLExceptMsgs.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XMLExceptMsgs.hpp 2000/03/23 01:02:38 1.9
+++ XMLExceptMsgs.hpp 2000/03/28 19:43:19 1.10
@@ -70,33 +70,33 @@
, Pool_ZeroModulus = 59
, RdrMgr_ReaderIdNotFound = 60
, Reader_BadAutoEncoding = 61
- , Reader_CantCreateCvtrFor = 62
- , Reader_CouldNotDecodeFirstLine = 63
- , Reader_EOIInMultiSeq = 64
- , Reader_SrcOfsNotSupported = 65
- , Reader_EncodingStrRequired = 66
- , Scan_CouldNotOpenSource = 67
- , Scan_UnbalancedStartEnd = 68
- , Scan_BadPScanToken = 69
- , Stack_BadIndex = 70
- , Stack_EmptyStack = 71
- , Str_ZeroSizedTargetBuf = 72
- , Str_UnknownRadix = 73
- , Str_TargetBufTooSmall = 74
- , Str_StartIndexPastEnd = 75
- , Str_ConvertOverflow = 76
- , Strm_StdErrWriteFailure = 77
- , Strm_StdOutWriteFailure = 78
- , Strm_ConWriteFailure = 79
- , StrPool_IllegalId = 80
- , Trans_CouldNotCreateDefCvtr = 81
- , Trans_InvalidSizeReq = 82
- , Trans_Unrepresentable = 83
- , Trans_NotValidForEncoding = 84
- , Trans_BadBlockSize = 85
- , Trans_BadSrcSeq = 86
- , Trans_BadSrcCP = 87
- , Trans_BadTrailingSurrogate = 88
+ , Reader_CouldNotDecodeFirstLine = 62
+ , Reader_EOIInMultiSeq = 63
+ , Reader_SrcOfsNotSupported = 64
+ , Reader_EncodingStrRequired = 65
+ , Scan_CouldNotOpenSource = 66
+ , Scan_UnbalancedStartEnd = 67
+ , Scan_BadPScanToken = 68
+ , Stack_BadIndex = 69
+ , Stack_EmptyStack = 70
+ , Str_ZeroSizedTargetBuf = 71
+ , Str_UnknownRadix = 72
+ , Str_TargetBufTooSmall = 73
+ , Str_StartIndexPastEnd = 74
+ , Str_ConvertOverflow = 75
+ , Strm_StdErrWriteFailure = 76
+ , Strm_StdOutWriteFailure = 77
+ , Strm_ConWriteFailure = 78
+ , StrPool_IllegalId = 79
+ , Trans_CouldNotCreateDefCvtr = 80
+ , Trans_InvalidSizeReq = 81
+ , Trans_Unrepresentable = 82
+ , Trans_NotValidForEncoding = 83
+ , Trans_BadBlockSize = 84
+ , Trans_BadSrcSeq = 85
+ , Trans_BadSrcCP = 86
+ , Trans_BadTrailingSurrogate = 87
+ , Trans_CantCreateCvtrFor = 88
, URL_MalformedURL = 89
, URL_UnsupportedProto = 90
, URL_UnsupportedProto1 = 91
1.5 +22 -17 xml-xerces/c/src/util/XMLMsgLoader.hpp
Index: XMLMsgLoader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/XMLMsgLoader.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLMsgLoader.hpp 2000/03/02 19:54:49 1.4
+++ XMLMsgLoader.hpp 2000/03/28 19:43:20 1.5
@@ -56,6 +56,10 @@
/*
* $Log: XMLMsgLoader.hpp,v $
+ * Revision 1.5 2000/03/28 19:43:20 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.4 2000/03/02 19:54:49 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -122,31 +126,31 @@
// -----------------------------------------------------------------------
virtual bool loadMsg
(
- const XMLMsgId msgToLoad
- , XMLCh* const toFill
- , const unsigned long maxChars
+ const XMLMsgId msgToLoad
+ , XMLCh* const toFill
+ , const unsigned int maxChars
) = 0;
virtual bool loadMsg
(
- const XMLMsgId msgToLoad
- , XMLCh* const toFill
- , const unsigned long maxChars
- , const XMLCh* const repText1
- , const XMLCh* const repText2 = 0
- , const XMLCh* const repText3 = 0
- , const XMLCh* const repText4 = 0
+ const XMLMsgId msgToLoad
+ , XMLCh* const toFill
+ , const unsigned int maxChars
+ , const XMLCh* const repText1
+ , const XMLCh* const repText2 = 0
+ , const XMLCh* const repText3 = 0
+ , const XMLCh* const repText4 = 0
) = 0;
virtual bool loadMsg
(
- const XMLMsgId msgToLoad
- , XMLCh* const toFill
- , const unsigned long maxChars
- , const char* const repText1
- , const char* const repText2 = 0
- , const char* const repText3 = 0
- , const char* const repText4 = 0
+ const XMLMsgId msgToLoad
+ , XMLCh* const toFill
+ , const unsigned int maxChars
+ , const char* const repText1
+ , const char* const repText2 = 0
+ , const char* const repText3 = 0
+ , const char* const repText4 = 0
) = 0;
1.7 +8 -6 xml-xerces/c/src/util/XMLUTF8Transcoder.cpp
Index: XMLUTF8Transcoder.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/XMLUTF8Transcoder.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLUTF8Transcoder.cpp 2000/03/17 23:59:55 1.6
+++ XMLUTF8Transcoder.cpp 2000/03/28 19:43:20 1.7
@@ -291,6 +291,8 @@
// 32 bit value, because it could be a surrogate pair.
//
XMLUInt32 curVal = *srcPtr;
+ if (!curVal)
+ break;
//
// If its a leading surrogate, then lets see if we have the trailing
@@ -363,17 +365,17 @@
outPtr += encodedBytes;
switch(encodedBytes)
{
- case 6 : --*outPtr = XMLByte((curVal | 0x80UL) & 0xBFUL);
+ case 6 : *--outPtr = XMLByte((curVal | 0x80UL) & 0xBFUL);
curVal >>= 6;
- case 5 : --*outPtr = XMLByte((curVal | 0x80UL) & 0xBFUL);
+ case 5 : *--outPtr = XMLByte((curVal | 0x80UL) & 0xBFUL);
curVal >>= 6;
- case 4 : --*outPtr = XMLByte((curVal | 0x80UL) & 0xBFUL);
+ case 4 : *--outPtr = XMLByte((curVal | 0x80UL) & 0xBFUL);
curVal >>= 6;
- case 3 : --*outPtr = XMLByte((curVal | 0x80UL) & 0xBFUL);
+ case 3 : *--outPtr = XMLByte((curVal | 0x80UL) & 0xBFUL);
curVal >>= 6;
- case 2 : --*outPtr = XMLByte((curVal | 0x80UL) & 0xBFUL);
+ case 2 : *--outPtr = XMLByte((curVal | 0x80UL) & 0xBFUL);
curVal >>= 6;
- case 1 : --*outPtr = XMLByte
+ case 1 : *--outPtr = XMLByte
(
curVal | gFirstByteMark[encodedBytes]
);
1.10 +4 -2 xml-xerces/c/src/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp
Index: CppErrMsgs_EN_US.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/MsgLoaders/InMemory/CppErrMsgs_EN_US.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CppErrMsgs_EN_US.hpp 2000/03/21 21:58:48 1.9
+++ CppErrMsgs_EN_US.hpp 2000/03/28 19:43:21 1.10
@@ -235,7 +235,6 @@
, { 0x0054,0x0068,0x0065,0x0020,0x006D,0x006F,0x0064,0x0075,0x006C,0x0075,0x0073,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0062,0x0065,0x0020,0x007A,0x0065,0x0072,0x006F,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0069,0x006E,0x0064,0x0069,0x0063,0x0061,0x0074,0x0065,0x0064,0x0020,0x0072,0x0065,0x0061,0x0064,0x0065,0x0072,0x0020,0x0069,0x0064,0x0020,0x0077,0x0061,0x0073,0x0020,0x006E,0x0065,0x0076,0x0065,0x0072,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0061,0x0075,0x0074,0x006F,0x0020,0x0065,0x006E,0x0063,0x006F,0x0064,0x0069,0x006E,0x0067,0x0020,0x0065,0x006E,0x0075,0x006D,0x0020,0x0068,0x0061,0x0073,0x0020,0x0061,0x006E,0x0020,0x0075,0x006E,0x006B,0x006E,0x006F,0x0077,0x006E,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x00 }
- , { 0x0043,0x006F,0x0075,0x006C,0x0064,0x0020,0x006E,0x006F,0x0074,0x0020,0x0063,0x0072,0x0065,0x0061,0x0074,0x0065,0x0020,0x0061,0x0020,0x0063,0x006F,0x006E,0x0076,0x0065,0x0072,0x0074,0x0065,0x0072,0x0020,0x0066,0x006F,0x0072,0x0020,0x0065,0x006E,0x0063,0x006F,0x0064,0x0069,0x006E,0x0067,0x003A,0x0020,0x007B,0x0030,0x007D,0x00 }
, { 0x0043,0x006F,0x0075,0x006C,0x0064,0x0020,0x006E,0x006F,0x0074,0x0020,0x0064,0x0065,0x0063,0x006F,0x0064,0x0065,0x0020,0x0066,0x0069,0x0072,0x0073,0x0074,0x0020,0x006C,0x0069,0x006E,0x0065,0x0020,0x006F,0x0066,0x0020,0x0065,0x006E,0x0074,0x0069,0x0074,0x0079,0x003A,0x0020,0x007B,0x0030,0x007D,0x00 }
, { 0x0045,0x006E,0x0064,0x0020,0x006F,0x0066,0x0020,0x0069,0x006E,0x0070,0x0075,0x0074,0x0020,0x0077,0x0061,0x0073,0x0020,0x0068,0x0069,0x0074,0x0020,0x0069,0x006E,0x0020,0x0074,0x0068,0x0065,0x0020,0x006D,0x0069,0x0064,0x0064,0x006C,0x0065,0x0020,0x006F,0x0066,0x0020,0x0061,0x0020,0x006D,0x0075,0x006C,0x0074,0x0069,0x0062,0x0079,0x0074,0x0065,0x0020,0x0073,0x0065,0x0071,0x0075,0x0065,0x006E,0x0063,0x0065,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0063,0x0075,0x0072,0x0072,0x0065,0x006E,0x0074,0x0020,0x0074,0x0072,0x0061,0x006E,0x0073,0x0063,0x006F,0x0064,0x0069,0x006E,0x0067,0x0020,0x0073,0x0065,0x0072,0x0076,0x0069,0x0063,0x0065,0x0020,0x0064,0x006F,0x0065,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0073,0x0075,0x0070,0x0070,0x006F,0x0072,0x0074,0x0020,0x0073,0x006F,0x0075,0x0072,0x0063,0x0065,0x0020,0x006F,0x0066,0x0066,0x0073,0x0065,0x0074,0x0020,0x0069,0x006E,0x0066,0x006F,0x0072,0x006D,0x0061,0x0074,0x0069,0x006F,0x006E,0x00 }
@@ -249,6 +248,7 @@
, { 0x0054,0x0068,0x0065,0x0020,0x0067,0x0069,0x0076,0x0065,0x006E,0x0020,0x0072,0x0061,0x0064,0x0069,0x0078,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0073,0x0075,0x0070,0x0070,0x006F,0x0072,0x0074,0x0065,0x0064,0x002E,0x0020,0x0055,0x0073,0x0065,0x0020,0x0032,0x002C,0x0020,0x0038,0x002C,0x0020,0x0031,0x0030,0x002C,0x0020,0x006F,0x0072,0x0020,0x0031,0x0036,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0074,0x0061,0x0072,0x0067,0x0065,0x0074,0x0020,0x0062,0x0075,0x0066,0x0066,0x0065,0x0072,0x0020,0x0069,0x0073,0x0020,0x0074,0x006F,0x006F,0x0020,0x0073,0x006D,0x0061,0x006C,0x006C,0x0020,0x0074,0x006F,0x0020,0x0061,0x0063,0x0063,0x0065,0x0070,0x0074,0x0020,0x0074,0x0068,0x0065,0x0020,0x0072,0x0065,0x0073,0x0075,0x006C,0x0074,0x0073,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0073,0x0074,0x0061,0x0072,0x0074,0x0020,0x0069,0x006E,0x0064,0x0065,0x0078,0x0020,0x0069,0x0073,0x0020,0x0070,0x0061,0x0073,0x0074,0x0020,0x0074,0x0068,0x0065,0x0020,0x0065,0x006E,0x0064,0x0020,0x006F,0x0066,0x0020,0x0074,0x0068,0x0065,0x0020,0x0073,0x0074,0x0072,0x0069,0x006E,0x0067,0x00 }
+ , { 0x0054,0x0068,0x0065,0x0020,0x0072,0x0065,0x0070,0x0072,0x0065,0x0073,0x0065,0x006E,0x0074,0x0065,0x0064,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0020,0x006F,0x0076,0x0065,0x0072,0x0066,0x006C,0x006F,0x0077,0x0065,0x0064,0x0020,0x0074,0x0068,0x0065,0x0020,0x006F,0x0075,0x0074,0x0070,0x0075,0x0074,0x0020,0x0062,0x0069,0x006E,0x0061,0x0072,0x0079,0x0020,0x0072,0x0065,0x0073,0x0075,0x006C,0x0074,0x00 }
, { 0x0043,0x006F,0x0075,0x006C,0x0064,0x0020,0x006E,0x006F,0x0074,0x0020,0x0077,0x0072,0x0069,0x0074,0x0065,0x0020,0x0074,0x006F,0x0020,0x0073,0x0074,0x0061,0x006E,0x0064,0x0061,0x0072,0x0064,0x0020,0x0065,0x0072,0x0072,0x00 }
, { 0x0043,0x006F,0x0075,0x006C,0x0064,0x0020,0x006E,0x006F,0x0074,0x0020,0x0077,0x0072,0x0069,0x0074,0x0065,0x0020,0x0074,0x006F,0x0020,0x0073,0x0074,0x0061,0x006E,0x0064,0x0061,0x0072,0x0064,0x0020,0x006F,0x0075,0x0074,0x00 }
, { 0x0043,0x006F,0x0075,0x006C,0x0064,0x0020,0x006E,0x006F,0x0074,0x0020,0x0077,0x0072,0x0069,0x0074,0x0065,0x0020,0x0074,0x006F,0x0020,0x0063,0x006F,0x006E,0x0073,0x006F,0x006C,0x0065,0x00 }
@@ -261,6 +261,7 @@
, { 0x0041,0x006E,0x0020,0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x0020,0x006D,0x0075,0x006C,0x0074,0x0069,0x002D,0x0062,0x0079,0x0074,0x0065,0x0020,0x0073,0x006F,0x0075,0x0072,0x0063,0x0065,0x0020,0x0074,0x0065,0x0078,0x0074,0x0020,0x0073,0x0065,0x0071,0x0075,0x0065,0x006E,0x0063,0x0065,0x0020,0x0077,0x0061,0x0073,0x0020,0x0065,0x006E,0x0063,0x006F,0x0075,0x006E,0x0074,0x0065,0x0072,0x0065,0x0064,0x00 }
, { 0x007B,0x0030,0x007D,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0061,0x0020,0x0076,0x0061,0x006C,0x0069,0x0064,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0020,0x0066,0x006F,0x0072,0x0020,0x0065,0x006E,0x0063,0x006F,0x0064,0x0069,0x006E,0x0067,0x0020,0x007B,0x0031,0x007D,0x00 }
, { 0x004C,0x0065,0x0061,0x0064,0x0069,0x006E,0x0067,0x0020,0x0073,0x0075,0x0072,0x0072,0x006F,0x0067,0x0061,0x0074,0x0065,0x0020,0x0077,0x0061,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0066,0x006F,0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x0020,0x0062,0x0079,0x0020,0x0074,0x0072,0x0061,0x0069,0x006C,0x0069,0x006E,0x0067,0x00 }
+ , { 0x0043,0x006F,0x0075,0x006C,0x0064,0x0020,0x006E,0x006F,0x0074,0x0020,0x0063,0x0072,0x0065,0x0061,0x0074,0x0065,0x0020,0x0061,0x0020,0x0063,0x006F,0x006E,0x0076,0x0065,0x0072,0x0074,0x0065,0x0072,0x0020,0x0066,0x006F,0x0072,0x0020,0x0065,0x006E,0x0063,0x006F,0x0064,0x0069,0x006E,0x0067,0x003A,0x0020,0x007B,0x0030,0x007D,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0055,0x0052,0x004C,0x0020,0x0077,0x0061,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0063,0x006F,0x0072,0x0072,0x0065,0x0063,0x0074,0x006C,0x0079,0x0020,0x0066,0x006F,0x0072,0x006D,0x0065,0x0064,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0055,0x0052,0x004C,0x0020,0x0075,0x0073,0x0065,0x0064,0x0020,0x0061,0x006E,0x0020,0x0075,0x006E,0x0073,0x0075,0x0070,0x0070,0x006F,0x0072,0x0074,0x0065,0x0064,0x0020,0x0070,0x0072,0x006F,0x0074,0x006F,0x0063,0x006F,0x006C,0x00 }
, { 0x0055,0x006E,0x0073,0x0075,0x0070,0x0070,0x006F,0x0072,0x0074,0x0065,0x0064,0x0020,0x0055,0x0052,0x004C,0x0020,0x0070,0x0072,0x006F,0x0074,0x006F,0x0063,0x006F,0x006C,0x003A,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x00 }
@@ -271,6 +272,7 @@
, { 0x0055,0x006E,0x0074,0x0065,0x0072,0x006D,0x0069,0x006E,0x0061,0x0074,0x0065,0x0064,0x0020,0x0068,0x006F,0x0073,0x0074,0x0020,0x0063,0x006F,0x006D,0x0070,0x006F,0x006E,0x0065,0x006E,0x0074,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0062,0x0061,0x0073,0x0065,0x0020,0x0070,0x0061,0x0072,0x0074,0x0020,0x006F,0x0066,0x0020,0x0074,0x0068,0x0065,0x0020,0x0055,0x0052,0x004C,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0062,0x0065,0x0020,0x0072,0x0065,0x006C,0x0061,0x0074,0x0069,0x0076,0x0065,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0062,0x0061,0x0073,0x0065,0x0020,0x0070,0x0061,0x0072,0x0074,0x0020,0x0068,0x0061,0x0073,0x0020,0x0074,0x006F,0x006F,0x0020,0x0066,0x0065,0x0077,0x0020,0x006C,0x0065,0x0076,0x0065,0x006C,0x0073,0x0020,0x0074,0x006F,0x0020,0x0077,0x0065,0x0061,0x0076,0x0065,0x0020,0x0069,0x006E,0x0020,0x0072,0x0065,0x006C,0x0061,0x0074,0x0069,0x0076,0x0065,0x0020,0x0070,0x0061,0x0072,0x0074,0x00 }
+ , { 0x0054,0x0068,0x0065,0x0020,0x0070,0x006F,0x0072,0x0074,0x0020,0x0066,0x0069,0x0065,0x006C,0x0064,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0062,0x0065,0x0020,0x0061,0x0020,0x0031,0x0036,0x0020,0x0062,0x0069,0x0074,0x0020,0x0064,0x0065,0x0063,0x0069,0x006D,0x0061,0x006C,0x0020,0x006E,0x0075,0x006D,0x0062,0x0065,0x0072,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0070,0x0061,0x0073,0x0073,0x0065,0x0064,0x0020,0x0069,0x006E,0x0064,0x0065,0x0078,0x0020,0x0069,0x0073,0x0020,0x0070,0x0061,0x0073,0x0074,0x0020,0x0074,0x0068,0x0065,0x0020,0x0065,0x006E,0x0064,0x0020,0x006F,0x0066,0x0020,0x0074,0x0068,0x0065,0x0020,0x0076,0x0065,0x0063,0x0074,0x006F,0x0072,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x0069,0x0064,0x0020,0x0077,0x0061,0x0073,0x0020,0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x00 }
, { 0x0057,0x0068,0x0065,0x006E,0x0020,0x0072,0x0065,0x0075,0x0073,0x0069,0x006E,0x0067,0x0020,0x0074,0x0068,0x0065,0x0020,0x0076,0x0061,0x006C,0x0069,0x0064,0x0061,0x0074,0x006F,0x0072,0x002C,0x0020,0x006E,0x006F,0x0020,0x0069,0x006E,0x0074,0x0065,0x0072,0x006E,0x0061,0x006C,0x0020,0x0073,0x0075,0x0062,0x0073,0x0065,0x0074,0x0020,0x0069,0x0073,0x0020,0x0061,0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x00 }
@@ -278,5 +280,5 @@
, { 0x0045,0x005F,0x0045,0x006E,0x0064,0x00 }
};
-const unsigned int gXMLExceptArraySize = 107;
+const unsigned int gXMLExceptArraySize = 109;
1.5 +8 -3 xml-xerces/c/src/util/MsgLoaders/InMemory/InMemMsgLoader.cpp
Index: InMemMsgLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/MsgLoaders/InMemory/InMemMsgLoader.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InMemMsgLoader.cpp 2000/03/02 19:55:15 1.4
+++ InMemMsgLoader.cpp 2000/03/28 19:43:21 1.5
@@ -56,6 +56,10 @@
/*
* $Log: InMemMsgLoader.cpp,v $
+ * Revision 1.5 2000/03/28 19:43:21 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.4 2000/03/02 19:55:15 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -118,7 +122,7 @@
// ---------------------------------------------------------------------------
bool InMemMsgLoader::loadMsg(const XMLMsgLoader::XMLMsgId msgToLoad
, XMLCh* const toFill
- , const unsigned long maxChars)
+ , const unsigned int maxChars)
{
//
// Just use the id to map into the correct array of messages. Then
@@ -166,7 +170,7 @@
bool InMemMsgLoader::loadMsg(const XMLMsgLoader::XMLMsgId msgToLoad
, XMLCh* const toFill
- , const unsigned long maxChars
+ , const unsigned int maxChars
, const XMLCh* const repText1
, const XMLCh* const repText2
, const XMLCh* const repText3
@@ -184,7 +188,7 @@
bool InMemMsgLoader::loadMsg(const XMLMsgLoader::XMLMsgId msgToLoad
, XMLCh* const toFill
- , const unsigned long maxChars
+ , const unsigned int maxChars
, const char* const repText1
, const char* const repText2
, const char* const repText3
1.4 +8 -3 xml-xerces/c/src/util/MsgLoaders/InMemory/InMemMsgLoader.hpp
Index: InMemMsgLoader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/MsgLoaders/InMemory/InMemMsgLoader.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InMemMsgLoader.hpp 2000/03/02 19:55:15 1.3
+++ InMemMsgLoader.hpp 2000/03/28 19:43:21 1.4
@@ -56,6 +56,10 @@
/*
* $Log: InMemMsgLoader.hpp,v $
+ * Revision 1.4 2000/03/28 19:43:21 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.3 2000/03/02 19:55:15 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -102,14 +106,14 @@
(
const XMLMsgLoader::XMLMsgId msgToLoad
, XMLCh* const toFill
- , const unsigned long maxChars
+ , const unsigned int maxChars
);
virtual bool loadMsg
(
const XMLMsgLoader::XMLMsgId msgToLoad
, XMLCh* const toFill
- , const unsigned long maxChars
+ , const unsigned int maxChars
, const XMLCh* const repText1
, const XMLCh* const repText2 = 0
, const XMLCh* const repText3 = 0
@@ -120,7 +124,7 @@
(
const XMLMsgLoader::XMLMsgId msgToLoad
, XMLCh* const toFill
- , const unsigned long maxChars
+ , const unsigned int maxChars
, const char* const repText1
, const char* const repText2 = 0
, const char* const repText3 = 0
1.13 +27 -27 xml-xerces/c/src/util/MsgLoaders/MsgCatalog/XMLMsgCat_EN_US.Msg
Index: XMLMsgCat_EN_US.Msg
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/MsgLoaders/MsgCatalog/XMLMsgCat_EN_US.Msg,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLMsgCat_EN_US.Msg 2000/03/23 01:02:39 1.12
+++ XMLMsgCat_EN_US.Msg 2000/03/28 19:43:22 1.13
@@ -217,33 +217,33 @@
59 The modulus value cannot be zero
60 The indicated reader id was never found
61 The auto encoding enum has an unknown value
- 62 Could not create a converter for encoding: {0}
- 63 Could not decode first line of entity: {0}
- 64 End of input was hit in the middle of a multibyte sequence
- 65 The current transcoding service does not support source offset information
- 66 EBCDIC files must provide an encoding= string
- 67 The primary document entity could not be opened. Id={0}
- 68 Unbalanced start/end tags found, cannot continue
- 69 The call to scanNext() is illegal at this time
- 70 The index is past the top of stack
- 71 The stack is empty, cannot access members
- 72 The target buffer cannot have a max size of zero
- 73 The given radix is not supported. Use 2, 8, 10, or 16
- 74 The target buffer is too small to accept the results
- 75 The start index is past the end of the string
- 76 The represented value overflowed the output binary result
- 77 Could not write to standard err
- 78 Could not write to standard out
- 79 Could not write to console
- 80 String pool id was not legal
- 81 Could not create a default transcoder
- 82 The maximum size to xlat is larger than the declared block size
- 83 Unicode char {0} is representable in encoding {1}
- 84 Character {0} is not valid for encoding {1}
- 85 The requested block size is not equal to the size set during construction
- 86 An invalid multi-byte source text sequence was encountered
- 87 {0} is not a valid value for encoding {1}
- 88 Leading surrogate was not followed by trailing
+ 62 Could not decode first line of entity: {0}
+ 63 End of input was hit in the middle of a multibyte sequence
+ 64 The current transcoding service does not support source offset information
+ 65 EBCDIC files must provide an encoding= string
+ 66 The primary document entity could not be opened. Id={0}
+ 67 Unbalanced start/end tags found, cannot continue
+ 68 The call to scanNext() is illegal at this time
+ 69 The index is past the top of stack
+ 70 The stack is empty, cannot access members
+ 71 The target buffer cannot have a max size of zero
+ 72 The given radix is not supported. Use 2, 8, 10, or 16
+ 73 The target buffer is too small to accept the results
+ 74 The start index is past the end of the string
+ 75 The represented value overflowed the output binary result
+ 76 Could not write to standard err
+ 77 Could not write to standard out
+ 78 Could not write to console
+ 79 String pool id was not legal
+ 80 Could not create a default transcoder
+ 81 The maximum size to xlat is larger than the declared block size
+ 82 Unicode char {0} is representable in encoding {1}
+ 83 Character {0} is not valid for encoding {1}
+ 84 The requested block size is not equal to the size set during construction
+ 85 An invalid multi-byte source text sequence was encountered
+ 86 {0} is not a valid value for encoding {1}
+ 87 Leading surrogate was not followed by trailing
+ 88 Could not create a converter for encoding: {0}
89 The URL was not correctly formed
90 The URL used an unsupported protocol
91 Unsupported URL protocol: '{0}'
1.4 +8 -3 xml-xerces/c/src/util/MsgLoaders/Win32/Win32MsgLoader.cpp
Index: Win32MsgLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/MsgLoaders/Win32/Win32MsgLoader.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Win32MsgLoader.cpp 2000/03/02 19:55:18 1.3
+++ Win32MsgLoader.cpp 2000/03/28 19:43:23 1.4
@@ -56,6 +56,10 @@
/*
* $Log: Win32MsgLoader.cpp,v $
+ * Revision 1.4 2000/03/28 19:43:23 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.3 2000/03/02 19:55:18 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -145,7 +149,7 @@
//
bool Win32MsgLoader::loadMsg(const XMLMsgLoader::XMLMsgId msgToLoad
, XMLCh* const toFill
- , const unsigned long maxChars)
+ , const unsigned int maxChars)
{
// In case we error return, and they don't check it...
toFill[0] = 0;
@@ -202,7 +206,7 @@
bool Win32MsgLoader::loadMsg(const XMLMsgLoader::XMLMsgId msgToLoad
, XMLCh* const toFill
- , const unsigned long maxChars
+ , const unsigned int maxChars
, const XMLCh* const repText1
, const XMLCh* const repText2
, const XMLCh* const repText3
@@ -220,7 +224,7 @@
bool Win32MsgLoader::loadMsg(const XMLMsgLoader::XMLMsgId msgToLoad
, XMLCh* const toFill
- , const unsigned long maxChars
+ , const unsigned int maxChars
, const char* const repText1
, const char* const repText2
, const char* const repText3
1.4 +8 -3 xml-xerces/c/src/util/MsgLoaders/Win32/Win32MsgLoader.hpp
Index: Win32MsgLoader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/MsgLoaders/Win32/Win32MsgLoader.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Win32MsgLoader.hpp 2000/03/02 19:55:19 1.3
+++ Win32MsgLoader.hpp 2000/03/28 19:43:23 1.4
@@ -56,6 +56,10 @@
/*
* $Log: Win32MsgLoader.hpp,v $
+ * Revision 1.4 2000/03/28 19:43:23 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.3 2000/03/02 19:55:19 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -99,14 +103,14 @@
(
const XMLMsgLoader::XMLMsgId msgToLoad
, XMLCh* const toFill
- , const unsigned long maxChars
+ , const unsigned int maxChars
);
virtual bool loadMsg
(
const XMLMsgLoader::XMLMsgId msgToLoad
, XMLCh* const toFill
- , const unsigned long maxChars
+ , const unsigned int maxChars
, const XMLCh* const repText1
, const XMLCh* const repText2 = 0
, const XMLCh* const repText3 = 0
@@ -117,7 +121,7 @@
(
const XMLMsgLoader::XMLMsgId msgToLoad
, XMLCh* const toFill
- , const unsigned long maxChars
+ , const unsigned int maxChars
, const char* const repText1
, const char* const repText2 = 0
, const char* const repText3 = 0
1.13 +27 -27 xml-xerces/c/src/util/Platforms/Win32/Version.rc
Index: Version.rc
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Platforms/Win32/Version.rc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Version.rc 2000/03/23 01:02:40 1.12
+++ Version.rc 2000/03/28 19:43:23 1.13
@@ -322,33 +322,33 @@
8251 L"\x0054\x0068\x0065\x0020\x006D\x006F\x0064\x0075\x006C\x0075\x0073\x0020\x0076\x0061\x006C\x0075\x0065\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0062\x0065\x0020\x007A\x0065\x0072\x006F\x00"
8252 L"\x0054\x0068\x0065\x0020\x0069\x006E\x0064\x0069\x0063\x0061\x0074\x0065\x0064\x0020\x0072\x0065\x0061\x0064\x0065\x0072\x0020\x0069\x0064\x0020\x0077\x0061\x0073\x0020\x006E\x0065\x0076\x0065\x0072\x0020\x0066\x006F\x0075\x006E\x0064\x00"
8253 L"\x0054\x0068\x0065\x0020\x0061\x0075\x0074\x006F\x0020\x0065\x006E\x0063\x006F\x0064\x0069\x006E\x0067\x0020\x0065\x006E\x0075\x006D\x0020\x0068\x0061\x0073\x0020\x0061\x006E\x0020\x0075\x006E\x006B\x006E\x006F\x0077\x006E\x0020\x0076\x0061\x006C\x0075\x0065\x00"
- 8254 L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0063\x0072\x0065\x0061\x0074\x0065\x0020\x0061\x0020\x0063\x006F\x006E\x0076\x0065\x0072\x0074\x0065\x0072\x0020\x0066\x006F\x0072\x0020\x0065\x006E\x0063\x006F\x0064\x0069\x006E\x0067\x003A\x0020\x007B\x0030\x007D\x00"
- 8255 L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0064\x0065\x0063\x006F\x0064\x0065\x0020\x0066\x0069\x0072\x0073\x0074\x0020\x006C\x0069\x006E\x0065\x0020\x006F\x0066\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x003A\x0020\x007B\x0030\x007D\x00"
- 8256 L"\x0045\x006E\x0064\x0020\x006F\x0066\x0020\x0069\x006E\x0070\x0075\x0074\x0020\x0077\x0061\x0073\x0020\x0068\x0069\x0074\x0020\x0069\x006E\x0020\x0074\x0068\x0065\x0020\x006D\x0069\x0064\x0064\x006C\x0065\x0020\x006F\x0066\x0020\x0061\x0020\x006D\x0075\x006C\x0074\x0069\x0062\x0079\x0074\x0065\x0020\x0073\x0065\x0071\x0075\x0065\x006E\x0063\x0065\x00"
- 8257 L"\x0054\x0068\x0065\x0020\x0063\x0075\x0072\x0072\x0065\x006E\x0074\x0020\x0074\x0072\x0061\x006E\x0073\x0063\x006F\x0064\x0069\x006E\x0067\x0020\x0073\x0065\x0072\x0076\x0069\x0063\x0065\x0020\x0064\x006F\x0065\x0073\x0020\x006E\x006F\x0074\x0020\x0073\x0075\x0070\x0070\x006F\x0072\x0074\x0020\x0073\x006F\x0075\x0072\x0063\x0065\x0020\x006F\x0066\x0066\x0073\x0065\x0074\x0020\x0069\x006E\x0066\x006F\x0072\x006D\x0061\x0074\x0069\x006F\x006E\x00"
- 8258 L"\x0045\x0042\x0043\x0044\x0049\x0043\x0020\x0066\x0069\x006C\x0065\x0073\x0020\x006D\x0075\x0073\x0074\x0020\x0070\x0072\x006F\x0076\x0069\x0064\x0065\x0020\x0061\x006E\x0020\x0065\x006E\x0063\x006F\x0064\x0069\x006E\x0067\x003D\x0020\x0073\x0074\x0072\x0069\x006E\x0067\x00"
- 8259 L"\x0054\x0068\x0065\x0020\x0070\x0072\x0069\x006D\x0061\x0072\x0079\x0020\x0064\x006F\x0063\x0075\x006D\x0065\x006E\x0074\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0063\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0062\x0065\x0020\x006F\x0070\x0065\x006E\x0065\x0064\x002E\x0020\x0049\x0064\x003D\x007B\x0030\x007D\x00"
- 8260 L"\x0055\x006E\x0062\x0061\x006C\x0061\x006E\x0063\x0065\x0064\x0020\x0073\x0074\x0061\x0072\x0074\x002F\x0065\x006E\x0064\x0020\x0074\x0061\x0067\x0073\x0020\x0066\x006F\x0075\x006E\x0064\x002C\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0063\x006F\x006E\x0074\x0069\x006E\x0075\x0065\x00"
- 8261 L"\x0054\x0068\x0065\x0020\x0063\x0061\x006C\x006C\x0020\x0074\x006F\x0020\x0073\x0063\x0061\x006E\x004E\x0065\x0078\x0074\x0028\x0029\x0020\x0069\x0073\x0020\x0069\x006C\x006C\x0065\x0067\x0061\x006C\x0020\x0061\x0074\x0020\x0074\x0068\x0069\x0073\x0020\x0074\x0069\x006D\x0065\x00"
- 8262 L"\x0054\x0068\x0065\x0020\x0069\x006E\x0064\x0065\x0078\x0020\x0069\x0073\x0020\x0070\x0061\x0073\x0074\x0020\x0074\x0068\x0065\x0020\x0074\x006F\x0070\x0020\x006F\x0066\x0020\x0073\x0074\x0061\x0063\x006B\x00"
- 8263 L"\x0054\x0068\x0065\x0020\x0073\x0074\x0061\x0063\x006B\x0020\x0069\x0073\x0020\x0065\x006D\x0070\x0074\x0079\x002C\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0061\x0063\x0063\x0065\x0073\x0073\x0020\x006D\x0065\x006D\x0062\x0065\x0072\x0073\x00"
- 8264 L"\x0054\x0068\x0065\x0020\x0074\x0061\x0072\x0067\x0065\x0074\x0020\x0062\x0075\x0066\x0066\x0065\x0072\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0061\x0020\x006D\x0061\x0078\x0020\x0073\x0069\x007A\x0065\x0020\x006F\x0066\x0020\x007A\x0065\x0072\x006F\x00"
- 8265 L"\x0054\x0068\x0065\x0020\x0067\x0069\x0076\x0065\x006E\x0020\x0072\x0061\x0064\x0069\x0078\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0073\x0075\x0070\x0070\x006F\x0072\x0074\x0065\x0064\x002E\x0020\x0055\x0073\x0065\x0020\x0032\x002C\x0020\x0038\x002C\x0020\x0031\x0030\x002C\x0020\x006F\x0072\x0020\x0031\x0036\x00"
- 8266 L"\x0054\x0068\x0065\x0020\x0074\x0061\x0072\x0067\x0065\x0074\x0020\x0062\x0075\x0066\x0066\x0065\x0072\x0020\x0069\x0073\x0020\x0074\x006F\x006F\x0020\x0073\x006D\x0061\x006C\x006C\x0020\x0074\x006F\x0020\x0061\x0063\x0063\x0065\x0070\x0074\x0020\x0074\x0068\x0065\x0020\x0072\x0065\x0073\x0075\x006C\x0074\x0073\x00"
- 8267 L"\x0054\x0068\x0065\x0020\x0073\x0074\x0061\x0072\x0074\x0020\x0069\x006E\x0064\x0065\x0078\x0020\x0069\x0073\x0020\x0070\x0061\x0073\x0074\x0020\x0074\x0068\x0065\x0020\x0065\x006E\x0064\x0020\x006F\x0066\x0020\x0074\x0068\x0065\x0020\x0073\x0074\x0072\x0069\x006E\x0067\x00"
- 8268 L"\x0054\x0068\x0065\x0020\x0072\x0065\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0065\x0064\x0020\x0076\x0061\x006C\x0075\x0065\x0020\x006F\x0076\x0065\x0072\x0066\x006C\x006F\x0077\x0065\x0064\x0020\x0074\x0068\x0065\x0020\x006F\x0075\x0074\x0070\x0075\x0074\x0020\x0062\x0069\x006E\x0061\x0072\x0079\x0020\x0072\x0065\x0073\x0075\x006C\x0074\x00"
- 8269 L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0077\x0072\x0069\x0074\x0065\x0020\x0074\x006F\x0020\x0073\x0074\x0061\x006E\x0064\x0061\x0072\x0064\x0020\x0065\x0072\x0072\x00"
- 8270 L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0077\x0072\x0069\x0074\x0065\x0020\x0074\x006F\x0020\x0073\x0074\x0061\x006E\x0064\x0061\x0072\x0064\x0020\x006F\x0075\x0074\x00"
- 8271 L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0077\x0072\x0069\x0074\x0065\x0020\x0074\x006F\x0020\x0063\x006F\x006E\x0073\x006F\x006C\x0065\x00"
- 8272 L"\x0053\x0074\x0072\x0069\x006E\x0067\x0020\x0070\x006F\x006F\x006C\x0020\x0069\x0064\x0020\x0077\x0061\x0073\x0020\x006E\x006F\x0074\x0020\x006C\x0065\x0067\x0061\x006C\x00"
- 8273 L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0063\x0072\x0065\x0061\x0074\x0065\x0020\x0061\x0020\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0020\x0074\x0072\x0061\x006E\x0073\x0063\x006F\x0064\x0065\x0072\x00"
- 8274 L"\x0054\x0068\x0065\x0020\x006D\x0061\x0078\x0069\x006D\x0075\x006D\x0020\x0073\x0069\x007A\x0065\x0020\x0074\x006F\x0020\x0078\x006C\x0061\x0074\x0020\x0069\x0073\x0020\x006C\x0061\x0072\x0067\x0065\x0072\x0020\x0074\x0068\x0061\x006E\x0020\x0074\x0068\x0065\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0065\x0064\x0020\x0062\x006C\x006F\x0063\x006B\x0020\x0073\x0069\x007A\x0065\x00"
- 8275 L"\x0055\x006E\x0069\x0063\x006F\x0064\x0065\x0020\x0063\x0068\x0061\x0072\x0020\x007B\x0030\x007D\x0020\x0069\x0073\x0020\x0072\x0065\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0061\x0062\x006C\x0065\x0020\x0069\x006E\x0020\x0065\x006E\x0063\x006F\x0064\x0069\x006E\x0067\x0020\x007B\x0031\x007D\x00"
- 8276 L"\x0043\x0068\x0061\x0072\x0061\x0063\x0074\x0065\x0072\x0020\x007B\x0030\x007D\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0076\x0061\x006C\x0069\x0064\x0020\x0066\x006F\x0072\x0020\x0065\x006E\x0063\x006F\x0064\x0069\x006E\x0067\x0020\x007B\x0031\x007D\x00"
- 8277 L"\x0054\x0068\x0065\x0020\x0072\x0065\x0071\x0075\x0065\x0073\x0074\x0065\x0064\x0020\x0062\x006C\x006F\x0063\x006B\x0020\x0073\x0069\x007A\x0065\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0065\x0071\x0075\x0061\x006C\x0020\x0074\x006F\x0020\x0074\x0068\x0065\x0020\x0073\x0069\x007A\x0065\x0020\x0073\x0065\x0074\x0020\x0064\x0075\x0072\x0069\x006E\x0067\x0020\x0063\x006F\x006E\x0073\x0074\x0072\x0075\x0063\x0074\x0069\x006F\x006E\x00"
- 8278 L"\x0041\x006E\x0020\x0069\x006E\x0076\x0061\x006C\x0069\x0064\x0020\x006D\x0075\x006C\x0074\x0069\x002D\x0062\x0079\x0074\x0065\x0020\x0073\x006F\x0075\x0072\x0063\x0065\x0020\x0074\x0065\x0078\x0074\x0020\x0073\x0065\x0071\x0075\x0065\x006E\x0063\x0065\x0020\x0077\x0061\x0073\x0020\x0065\x006E\x0063\x006F\x0075\x006E\x0074\x0065\x0072\x0065\x0064\x00"
- 8279 L"\x007B\x0030\x007D\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0061\x0020\x0076\x0061\x006C\x0069\x0064\x0020\x0076\x0061\x006C\x0075\x0065\x0020\x0066\x006F\x0072\x0020\x0065\x006E\x0063\x006F\x0064\x0069\x006E\x0067\x0020\x007B\x0031\x007D\x00"
- 8280 L"\x004C\x0065\x0061\x0064\x0069\x006E\x0067\x0020\x0073\x0075\x0072\x0072\x006F\x0067\x0061\x0074\x0065\x0020\x0077\x0061\x0073\x0020\x006E\x006F\x0074\x0020\x0066\x006F\x006C\x006C\x006F\x0077\x0065\x0064\x0020\x0062\x0079\x0020\x0074\x0072\x0061\x0069\x006C\x0069\x006E\x0067\x00"
+ 8254 L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0064\x0065\x0063\x006F\x0064\x0065\x0020\x0066\x0069\x0072\x0073\x0074\x0020\x006C\x0069\x006E\x0065\x0020\x006F\x0066\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x003A\x0020\x007B\x0030\x007D\x00"
+ 8255 L"\x0045\x006E\x0064\x0020\x006F\x0066\x0020\x0069\x006E\x0070\x0075\x0074\x0020\x0077\x0061\x0073\x0020\x0068\x0069\x0074\x0020\x0069\x006E\x0020\x0074\x0068\x0065\x0020\x006D\x0069\x0064\x0064\x006C\x0065\x0020\x006F\x0066\x0020\x0061\x0020\x006D\x0075\x006C\x0074\x0069\x0062\x0079\x0074\x0065\x0020\x0073\x0065\x0071\x0075\x0065\x006E\x0063\x0065\x00"
+ 8256 L"\x0054\x0068\x0065\x0020\x0063\x0075\x0072\x0072\x0065\x006E\x0074\x0020\x0074\x0072\x0061\x006E\x0073\x0063\x006F\x0064\x0069\x006E\x0067\x0020\x0073\x0065\x0072\x0076\x0069\x0063\x0065\x0020\x0064\x006F\x0065\x0073\x0020\x006E\x006F\x0074\x0020\x0073\x0075\x0070\x0070\x006F\x0072\x0074\x0020\x0073\x006F\x0075\x0072\x0063\x0065\x0020\x006F\x0066\x0066\x0073\x0065\x0074\x0020\x0069\x006E\x0066\x006F\x0072\x006D\x0061\x0074\x0069\x006F\x006E\x00"
+ 8257 L"\x0045\x0042\x0043\x0044\x0049\x0043\x0020\x0066\x0069\x006C\x0065\x0073\x0020\x006D\x0075\x0073\x0074\x0020\x0070\x0072\x006F\x0076\x0069\x0064\x0065\x0020\x0061\x006E\x0020\x0065\x006E\x0063\x006F\x0064\x0069\x006E\x0067\x003D\x0020\x0073\x0074\x0072\x0069\x006E\x0067\x00"
+ 8258 L"\x0054\x0068\x0065\x0020\x0070\x0072\x0069\x006D\x0061\x0072\x0079\x0020\x0064\x006F\x0063\x0075\x006D\x0065\x006E\x0074\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0063\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0062\x0065\x0020\x006F\x0070\x0065\x006E\x0065\x0064\x002E\x0020\x0049\x0064\x003D\x007B\x0030\x007D\x00"
+ 8259 L"\x0055\x006E\x0062\x0061\x006C\x0061\x006E\x0063\x0065\x0064\x0020\x0073\x0074\x0061\x0072\x0074\x002F\x0065\x006E\x0064\x0020\x0074\x0061\x0067\x0073\x0020\x0066\x006F\x0075\x006E\x0064\x002C\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0063\x006F\x006E\x0074\x0069\x006E\x0075\x0065\x00"
+ 8260 L"\x0054\x0068\x0065\x0020\x0063\x0061\x006C\x006C\x0020\x0074\x006F\x0020\x0073\x0063\x0061\x006E\x004E\x0065\x0078\x0074\x0028\x0029\x0020\x0069\x0073\x0020\x0069\x006C\x006C\x0065\x0067\x0061\x006C\x0020\x0061\x0074\x0020\x0074\x0068\x0069\x0073\x0020\x0074\x0069\x006D\x0065\x00"
+ 8261 L"\x0054\x0068\x0065\x0020\x0069\x006E\x0064\x0065\x0078\x0020\x0069\x0073\x0020\x0070\x0061\x0073\x0074\x0020\x0074\x0068\x0065\x0020\x0074\x006F\x0070\x0020\x006F\x0066\x0020\x0073\x0074\x0061\x0063\x006B\x00"
+ 8262 L"\x0054\x0068\x0065\x0020\x0073\x0074\x0061\x0063\x006B\x0020\x0069\x0073\x0020\x0065\x006D\x0070\x0074\x0079\x002C\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0061\x0063\x0063\x0065\x0073\x0073\x0020\x006D\x0065\x006D\x0062\x0065\x0072\x0073\x00"
+ 8263 L"\x0054\x0068\x0065\x0020\x0074\x0061\x0072\x0067\x0065\x0074\x0020\x0062\x0075\x0066\x0066\x0065\x0072\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0061\x0020\x006D\x0061\x0078\x0020\x0073\x0069\x007A\x0065\x0020\x006F\x0066\x0020\x007A\x0065\x0072\x006F\x00"
+ 8264 L"\x0054\x0068\x0065\x0020\x0067\x0069\x0076\x0065\x006E\x0020\x0072\x0061\x0064\x0069\x0078\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0073\x0075\x0070\x0070\x006F\x0072\x0074\x0065\x0064\x002E\x0020\x0055\x0073\x0065\x0020\x0032\x002C\x0020\x0038\x002C\x0020\x0031\x0030\x002C\x0020\x006F\x0072\x0020\x0031\x0036\x00"
+ 8265 L"\x0054\x0068\x0065\x0020\x0074\x0061\x0072\x0067\x0065\x0074\x0020\x0062\x0075\x0066\x0066\x0065\x0072\x0020\x0069\x0073\x0020\x0074\x006F\x006F\x0020\x0073\x006D\x0061\x006C\x006C\x0020\x0074\x006F\x0020\x0061\x0063\x0063\x0065\x0070\x0074\x0020\x0074\x0068\x0065\x0020\x0072\x0065\x0073\x0075\x006C\x0074\x0073\x00"
+ 8266 L"\x0054\x0068\x0065\x0020\x0073\x0074\x0061\x0072\x0074\x0020\x0069\x006E\x0064\x0065\x0078\x0020\x0069\x0073\x0020\x0070\x0061\x0073\x0074\x0020\x0074\x0068\x0065\x0020\x0065\x006E\x0064\x0020\x006F\x0066\x0020\x0074\x0068\x0065\x0020\x0073\x0074\x0072\x0069\x006E\x0067\x00"
+ 8267 L"\x0054\x0068\x0065\x0020\x0072\x0065\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0065\x0064\x0020\x0076\x0061\x006C\x0075\x0065\x0020\x006F\x0076\x0065\x0072\x0066\x006C\x006F\x0077\x0065\x0064\x0020\x0074\x0068\x0065\x0020\x006F\x0075\x0074\x0070\x0075\x0074\x0020\x0062\x0069\x006E\x0061\x0072\x0079\x0020\x0072\x0065\x0073\x0075\x006C\x0074\x00"
+ 8268 L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0077\x0072\x0069\x0074\x0065\x0020\x0074\x006F\x0020\x0073\x0074\x0061\x006E\x0064\x0061\x0072\x0064\x0020\x0065\x0072\x0072\x00"
+ 8269 L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0077\x0072\x0069\x0074\x0065\x0020\x0074\x006F\x0020\x0073\x0074\x0061\x006E\x0064\x0061\x0072\x0064\x0020\x006F\x0075\x0074\x00"
+ 8270 L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0077\x0072\x0069\x0074\x0065\x0020\x0074\x006F\x0020\x0063\x006F\x006E\x0073\x006F\x006C\x0065\x00"
+ 8271 L"\x0053\x0074\x0072\x0069\x006E\x0067\x0020\x0070\x006F\x006F\x006C\x0020\x0069\x0064\x0020\x0077\x0061\x0073\x0020\x006E\x006F\x0074\x0020\x006C\x0065\x0067\x0061\x006C\x00"
+ 8272 L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0063\x0072\x0065\x0061\x0074\x0065\x0020\x0061\x0020\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0020\x0074\x0072\x0061\x006E\x0073\x0063\x006F\x0064\x0065\x0072\x00"
+ 8273 L"\x0054\x0068\x0065\x0020\x006D\x0061\x0078\x0069\x006D\x0075\x006D\x0020\x0073\x0069\x007A\x0065\x0020\x0074\x006F\x0020\x0078\x006C\x0061\x0074\x0020\x0069\x0073\x0020\x006C\x0061\x0072\x0067\x0065\x0072\x0020\x0074\x0068\x0061\x006E\x0020\x0074\x0068\x0065\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0065\x0064\x0020\x0062\x006C\x006F\x0063\x006B\x0020\x0073\x0069\x007A\x0065\x00"
+ 8274 L"\x0055\x006E\x0069\x0063\x006F\x0064\x0065\x0020\x0063\x0068\x0061\x0072\x0020\x007B\x0030\x007D\x0020\x0069\x0073\x0020\x0072\x0065\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0061\x0062\x006C\x0065\x0020\x0069\x006E\x0020\x0065\x006E\x0063\x006F\x0064\x0069\x006E\x0067\x0020\x007B\x0031\x007D\x00"
+ 8275 L"\x0043\x0068\x0061\x0072\x0061\x0063\x0074\x0065\x0072\x0020\x007B\x0030\x007D\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0076\x0061\x006C\x0069\x0064\x0020\x0066\x006F\x0072\x0020\x0065\x006E\x0063\x006F\x0064\x0069\x006E\x0067\x0020\x007B\x0031\x007D\x00"
+ 8276 L"\x0054\x0068\x0065\x0020\x0072\x0065\x0071\x0075\x0065\x0073\x0074\x0065\x0064\x0020\x0062\x006C\x006F\x0063\x006B\x0020\x0073\x0069\x007A\x0065\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0065\x0071\x0075\x0061\x006C\x0020\x0074\x006F\x0020\x0074\x0068\x0065\x0020\x0073\x0069\x007A\x0065\x0020\x0073\x0065\x0074\x0020\x0064\x0075\x0072\x0069\x006E\x0067\x0020\x0063\x006F\x006E\x0073\x0074\x0072\x0075\x0063\x0074\x0069\x006F\x006E\x00"
+ 8277 L"\x0041\x006E\x0020\x0069\x006E\x0076\x0061\x006C\x0069\x0064\x0020\x006D\x0075\x006C\x0074\x0069\x002D\x0062\x0079\x0074\x0065\x0020\x0073\x006F\x0075\x0072\x0063\x0065\x0020\x0074\x0065\x0078\x0074\x0020\x0073\x0065\x0071\x0075\x0065\x006E\x0063\x0065\x0020\x0077\x0061\x0073\x0020\x0065\x006E\x0063\x006F\x0075\x006E\x0074\x0065\x0072\x0065\x0064\x00"
+ 8278 L"\x007B\x0030\x007D\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0061\x0020\x0076\x0061\x006C\x0069\x0064\x0020\x0076\x0061\x006C\x0075\x0065\x0020\x0066\x006F\x0072\x0020\x0065\x006E\x0063\x006F\x0064\x0069\x006E\x0067\x0020\x007B\x0031\x007D\x00"
+ 8279 L"\x004C\x0065\x0061\x0064\x0069\x006E\x0067\x0020\x0073\x0075\x0072\x0072\x006F\x0067\x0061\x0074\x0065\x0020\x0077\x0061\x0073\x0020\x006E\x006F\x0074\x0020\x0066\x006F\x006C\x006C\x006F\x0077\x0065\x0064\x0020\x0062\x0079\x0020\x0074\x0072\x0061\x0069\x006C\x0069\x006E\x0067\x00"
+ 8280 L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0063\x0072\x0065\x0061\x0074\x0065\x0020\x0061\x0020\x0063\x006F\x006E\x0076\x0065\x0072\x0074\x0065\x0072\x0020\x0066\x006F\x0072\x0020\x0065\x006E\x0063\x006F\x0064\x0069\x006E\x0067\x003A\x0020\x007B\x0030\x007D\x00"
8281 L"\x0054\x0068\x0065\x0020\x0055\x0052\x004C\x0020\x0077\x0061\x0073\x0020\x006E\x006F\x0074\x0020\x0063\x006F\x0072\x0072\x0065\x0063\x0074\x006C\x0079\x0020\x0066\x006F\x0072\x006D\x0065\x0064\x00"
8282 L"\x0054\x0068\x0065\x0020\x0055\x0052\x004C\x0020\x0075\x0073\x0065\x0064\x0020\x0061\x006E\x0020\x0075\x006E\x0073\x0075\x0070\x0070\x006F\x0072\x0074\x0065\x0064\x0020\x0070\x0072\x006F\x0074\x006F\x0063\x006F\x006C\x00"
8283 L"\x0055\x006E\x0073\x0075\x0070\x0070\x006F\x0072\x0074\x0065\x0064\x0020\x0055\x0052\x004C\x0020\x0070\x0072\x006F\x0074\x006F\x0063\x006F\x006C\x003A\x0020\x0027\x007B\x0030\x007D\x0027\x00"
1.17 +5 -2 xml-xerces/c/src/util/Transcoders/Iconv/IconvTransService.cpp
Index: IconvTransService.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Transcoders/Iconv/IconvTransService.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- IconvTransService.cpp 2000/03/13 21:48:04 1.16
+++ IconvTransService.cpp 2000/03/28 19:43:24 1.17
@@ -56,6 +56,10 @@
/*
* $Log: IconvTransService.cpp,v $
+ * Revision 1.17 2000/03/28 19:43:24 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.16 2000/03/13 21:48:04 abagchi
* Changed XML_GNUG to XML_GCC
*
@@ -293,7 +297,7 @@
const unsigned int retVal = ::mbstowcs(NULL, srcText, 0);
- if (retVal == -1)
+ if (retVal == ~0)
return 0;
return retVal;
}
@@ -323,7 +327,7 @@
const unsigned int retVal = ::wcstombs(NULL, wideCharBuf, 0);
delete [] allocatedArray;
- if (retVal == -1)
+ if (retVal == ~0)
return 0;
return retVal;
}
1.5 +6 -1 xml-xerces/c/src/validators/DTD/CMLeaf.hpp
Index: CMLeaf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/DTD/CMLeaf.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CMLeaf.hpp 2000/03/02 19:55:37 1.4
+++ CMLeaf.hpp 2000/03/28 19:43:25 1.5
@@ -56,6 +56,10 @@
/*
* $Log: CMLeaf.hpp,v $
+ * Revision 1.5 2000/03/28 19:43:25 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.4 2000/03/02 19:55:37 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -98,7 +102,7 @@
CMLeaf
(
const unsigned int elemId
- , const unsigned int position = (unsigned int)-1
+ , const unsigned int position = ~0
);
~CMLeaf();
1.5 +6 -1 xml-xerces/c/src/validators/DTD/CMNode.hpp
Index: CMNode.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/DTD/CMNode.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CMNode.hpp 2000/03/02 19:55:37 1.4
+++ CMNode.hpp 2000/03/28 19:43:25 1.5
@@ -56,6 +56,10 @@
/*
* $Log: CMNode.hpp,v $
+ * Revision 1.5 2000/03/28 19:43:25 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.4 2000/03/02 19:55:37 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -168,7 +172,7 @@
fType(type)
, fFirstPos(0)
, fLastPos(0)
- , fMaxStates(-1)
+ , fMaxStates(~0)
{
}
1.5 +6 -1 xml-xerces/c/src/validators/DTD/DFAContentModel.cpp
Index: DFAContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/DTD/DFAContentModel.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DFAContentModel.cpp 2000/03/08 23:52:34 1.4
+++ DFAContentModel.cpp 2000/03/28 19:43:25 1.5
@@ -56,6 +56,10 @@
/*
* $Log: DFAContentModel.cpp,v $
+ * Revision 1.5 2000/03/28 19:43:25 roddey
+ * Fixes for signed/unsigned warnings. New work for two way transcoding
+ * stuff.
+ *
* Revision 1.4 2000/03/08 23:52:34 roddey
* Got rid of the use of -1 to represent an invalid transition state,
* and just created a const value that is unsigned. This should make
@@ -757,7 +761,7 @@
//
-// kInvalidTrans is used to represent bad transitions in the transition table
+// gInvalidTrans is used to represent bad transitions in the transition table
// entry for each state. So each entry is initialized to that value. This
// method creates a new entry and initializes it.
//