TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

By interrogate conventions, char * means a string, while unsigned char * means a data buffer.

Browse Source
This commit is contained in:
David Rose 2013-08-23 22:26:17 +00:00
parent b41e04dc60
commit 93afeb40f2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dtool/src/prc/streamReader.cxx
View File

@ -140,12 +140,12 @@ extract_bytes(size_t size) {
// that were successfully written. // that were successfully written.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
size_t StreamReader:: size_t StreamReader::
extract_bytes(char *into, size_t size) { extract_bytes(unsigned char *into, size_t size) {
if (_in->eof() || _in->fail()) { if (_in->eof() || _in->fail()) {
return 0; return 0;
} }
_in->read(into, size); _in->read((char *)into, size);
return _in->gcount(); return _in->gcount();
} }

2
dtool/src/prc/streamReader.h
View File

@ -67,7 +67,7 @@ PUBLISHED:
BLOCKING void skip_bytes(size_t size); BLOCKING void skip_bytes(size_t size);
BLOCKING string extract_bytes(size_t size); BLOCKING string extract_bytes(size_t size);
BLOCKING size_t extract_bytes(char *into, size_t size); BLOCKING size_t extract_bytes(unsigned char *into, size_t size);
BLOCKING string readline(); BLOCKING string readline();

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

@ -159,7 +159,7 @@ extract_bytes(size_t size) {
// that were successfully written. // that were successfully written.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
size_t DatagramIterator:: size_t DatagramIterator::
extract_bytes(char *into, size_t size) { extract_bytes(unsigned char *into, size_t size) {
nassertr((int)size >= 0, 0); nassertr((int)size >= 0, 0);
nassertr(_datagram != (const Datagram *)NULL, 0); nassertr(_datagram != (const Datagram *)NULL, 0);
nassertr(_current_index + size <= _datagram->get_length(), 0); nassertr(_current_index + size <= _datagram->get_length(), 0);

2
panda/src/express/datagramIterator.h
View File

@ -68,7 +68,7 @@ PUBLISHED:
INLINE void skip_bytes(size_t size); INLINE void skip_bytes(size_t size);
string extract_bytes(size_t size); string extract_bytes(size_t size);
size_t extract_bytes(char *into, size_t size); size_t extract_bytes(unsigned char *into, size_t size);
INLINE string get_remaining_bytes() const; INLINE string get_remaining_bytes() const;
INLINE int get_remaining_size() const; INLINE int get_remaining_size() const;