peiyongz 2004/02/20 12:57:39
Modified: c/src/xercesc/internal XSerializeEngine.hpp
XSerializeEngine.cpp
Log:
Bug#27046: path from David Bertoni
Revision Changes Path
1.15 +100 -8 xml-xerces/c/src/xercesc/internal/XSerializeEngine.hpp
Index: XSerializeEngine.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XSerializeEngine.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSerializeEngine.hpp 11 Feb 2004 20:38:50 -0000 1.14
+++ XSerializeEngine.hpp 20 Feb 2004 20:57:39 -0000 1.15
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.15 2004/02/20 20:57:39 peiyongz
+ * Bug#27046: path from David Bertoni
+ *
* Revision 1.14 2004/02/11 20:38:50 peiyongz
* Fix to bug#26864, thanks to David Bertoni.
*
@@ -129,9 +132,6 @@
static const bool toReadBufferLen;
- static int defaultBufferLen;
- static int defaultDataLen;
-
typedef unsigned int XSerializedObjectId_t;
@@ -381,10 +381,39 @@
*
***/
void readString(XMLCh*& toRead
- , int& bufferLen = defaultBufferLen
- , int& dataLen = defaultDataLen
+ , int& bufferLen
+ , int& dataLen
, bool toReadBufLen = false);
+ /***
+ *
+ * Read a stream of XMLCh from the internal buffer.
+ *
+ * Read the bufferLen first if requested, then the length
+ * of the stream followed by the stream.
+ *
+ * Param
+ * toRead: the pointer to the buffer to hold the XMLCh stream
+ * bufferLen: the size of the buffer created
+ *
+ * Return:
+ *
+ ***/
+ inline void readString(XMLCh*& toRead
+ , int& bufferLen);
+
+ /***
+ *
+ * Read a stream of XMLCh from the internal buffer.
+ *
+ * Param
+ * toRead: the pointer to the buffer to hold the XMLCh stream
+ *
+ * Return:
+ *
+ ***/
+ inline void readString(XMLCh*& toRead);
+
/***
*
* Read a stream of XMLByte from the internal buffer.
@@ -402,11 +431,46 @@
*
***/
void readString(XMLByte*& toRead
- , int& bufferLen = defaultBufferLen
- , int& dataLen = defaultDataLen
+ , int& bufferLen
+ , int& dataLen
, bool toReadBufLen = false);
+ /***
+ *
+ * Read a stream of XMLByte from the internal buffer.
+ *
+ * Read the bufferLen first if requested, then the length
+ * of the stream followed by the stream.
+ *
+ * Param
+ * toRead: the pointer to the buffer to hold the XMLByte stream
+ * bufferLen: the size of the buffer created
+ *
+ * Return:
+ *
+ ***/
+ inline void readString(XMLByte*& toRead
+ , int& bufferLen);
+
+ /***
+ *
+ * Read a stream of XMLByte from the internal buffer.
+ *
+ * Read the bufferLen first if requested, then the length
+ * of the stream followed by the stream.
+ *
+ * Param
+ * toRead: the pointer to the buffer to hold the XMLByte stream
+ * bufferLen: the size of the buffer created
+ * dataLen: the length of the stream
+ * toReadBufLen: specify if the bufferLen need to be read or not
+ *
+ * Return:
+ *
+ ***/
+ inline void readString(XMLByte*& toRead);
+
/***
*
* Check if the template object has been stored or not
@@ -716,6 +780,34 @@
inline void XSerializeEngine::allignBufCur()
{
fBufCur+=allignAdjust();
+}
+
+inline void XSerializeEngine::readString(XMLCh*& toRead
+ , int& bufferLen)
+{
+ int dummyDataLen;
+ readString(toRead, bufferLen, dummyDataLen);
+}
+
+inline void XSerializeEngine::readString(XMLCh*& toRead)
+{
+ int dummyBufferLen;
+ int dummyDataLen;
+ readString(toRead, dummyBufferLen, dummyDataLen);
+}
+
+inline void XSerializeEngine::readString(XMLByte*& toRead
+ , int& bufferLen)
+{
+ int dummyDataLen;
+ readString(toRead, bufferLen, dummyDataLen);
+}
+
+inline void XSerializeEngine::readString(XMLByte*& toRead)
+{
+ int dummyBufferLen;
+ int dummyDataLen;
+ readString(toRead, dummyBufferLen, dummyDataLen);
}
/***
1.15 +4 -3 xml-xerces/c/src/xercesc/internal/XSerializeEngine.cpp
Index: XSerializeEngine.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XSerializeEngine.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSerializeEngine.cpp 29 Jan 2004 11:46:30 -0000 1.14
+++ XSerializeEngine.cpp 20 Feb 2004 20:57:39 -0000 1.15
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.15 2004/02/20 20:57:39 peiyongz
+ * Bug#27046: path from David Bertoni
+ *
* Revision 1.14 2004/01/29 11:46:30 cargilld
* Code cleanup changes to get rid of various compiler diagnostic messages.
*
@@ -114,8 +117,6 @@
const bool XSerializeEngine::toWriteBufferLen = true;
const bool XSerializeEngine::toReadBufferLen = true;
- int XSerializeEngine::defaultBufferLen = 0;
- int XSerializeEngine::defaultDataLen = 0;
static const int noDataFollowed = -1;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
