TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

altered debug output and get_z_string

Browse Source
This commit is contained in:
Dave Schuyler 2004-12-17 02:08:55 +00:00
parent cdd7d20546
commit 23f8c497cb
1 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
panda/src/express/datagramIterator.cxx
View File

@ -30,8 +30,8 @@ get_string() {
// First, get the length of the string // First, get the length of the string
PN_uint16 s_len = get_uint16(); PN_uint16 s_len = get_uint16();
nassertr(_datagram != (const Datagram *)NULL && nassertr(_datagram != (const Datagram *)NULL, "");
_current_index + s_len <= _datagram->get_length(), ""); nassertr(_current_index + s_len <= _datagram->get_length(), "");
const char *ptr = (const char *)_datagram->get_data(); const char *ptr = (const char *)_datagram->get_data();
int last_index = _current_index; int last_index = _current_index;
@ -52,8 +52,8 @@ get_string32() {
// First, get the length of the string // First, get the length of the string
PN_uint32 s_len = get_uint32(); PN_uint32 s_len = get_uint32();
nassertr(_datagram != (const Datagram *)NULL && nassertr(_datagram != (const Datagram *)NULL, "");
_current_index + s_len <= _datagram->get_length(), ""); nassertr(_current_index + s_len <= _datagram->get_length(), "");
const char *ptr = (const char *)_datagram->get_data(); const char *ptr = (const char *)_datagram->get_data();
int last_index = _current_index; int last_index = _current_index;
@ -78,6 +78,7 @@ get_z_string() {
size_t length = _datagram->get_length(); size_t length = _datagram->get_length();
size_t p = _current_index; size_t p = _current_index;
while (p < length && ptr[p] != '\0') { while (p < length && ptr[p] != '\0') {
++p;
} }
nassertr(p < length, ""); // no NULL character? nassertr(p < length, ""); // no NULL character?
@ -96,8 +97,8 @@ get_z_string() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
string DatagramIterator:: string DatagramIterator::
get_fixed_string(size_t size) { get_fixed_string(size_t size) {
nassertr(_datagram != (const Datagram *)NULL && nassertr(_datagram != (const Datagram *)NULL, "");
_current_index + size <= _datagram->get_length(), ""); nassertr(_current_index + size <= _datagram->get_length(), "");
const char *ptr = (const char *)_datagram->get_data(); const char *ptr = (const char *)_datagram->get_data();
string s(ptr + _current_index, size); string s(ptr + _current_index, size);
@ -117,8 +118,8 @@ get_fixed_string(size_t size) {
string DatagramIterator:: string DatagramIterator::
extract_bytes(size_t size) { extract_bytes(size_t size) {
nassertr((int)size >= 0, ""); nassertr((int)size >= 0, "");
nassertr(_datagram != (const Datagram *)NULL && nassertr(_datagram != (const Datagram *)NULL, "");
_current_index + size <= _datagram->get_length(), ""); nassertr(_current_index + size <= _datagram->get_length(), "");
const char *ptr = (const char *)_datagram->get_data(); const char *ptr = (const char *)_datagram->get_data();
int last_index = _current_index; int last_index = _current_index;
@ -128,3 +129,37 @@ extract_bytes(size_t size) {
return string(ptr + last_index, size); return string(ptr + last_index, size);
} }
////////////////////////////////////////////////////////////////////
// Function : output
// Access : Public
// Description : Write a string representation of this instance to
// <out>.
////////////////////////////////////////////////////////////////////
void DatagramIterator::
output(ostream &out) const {
#ifndef NDEBUG //[
out<<""<<"DatagramIterator";
#endif //] NDEBUG
}
////////////////////////////////////////////////////////////////////
// Function : write
// Access : Public
// Description : Write a string representation of this instance to
// <out>.
////////////////////////////////////////////////////////////////////
void DatagramIterator::
write(ostream &out, unsigned int indent) const {
#ifndef NDEBUG //[
out.width(indent); out<<""<<"DatagramIterator:\n";
out.width(indent+2); out<<""<<"_current_index "<<_current_index;
if (_datagram) {
out<<""<<" (of "<<(get_datagram().get_length())<<")\n";
get_datagram().write(out, indent+2);
} else {
out<<""<<" (_datagram is null)\n";
}
#endif //] NDEBUG
}