refact
This commit is contained in:
Hongze Cheng
parent
7c56458122
commit
3311fec1b3
|
|
@ -71,102 +71,102 @@ int main( int argc, char** argv ) {
|
|||
*/
|
||||
|
||||
typedef struct SBufferReader {
|
||||
bool endian;
|
||||
bool endian;
|
||||
const char* data;
|
||||
size_t pos;
|
||||
size_t size;
|
||||
size_t pos;
|
||||
size_t size;
|
||||
} SBufferReader;
|
||||
|
||||
typedef struct SBufferWriter {
|
||||
bool endian;
|
||||
char* data;
|
||||
bool endian;
|
||||
char* data;
|
||||
size_t pos;
|
||||
size_t size;
|
||||
void* (*allocator)( void*, size_t );
|
||||
void* (*allocator)(void*, size_t);
|
||||
} SBufferWriter;
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// common functions & macros for both reader & writer
|
||||
|
||||
#define tbufTell( buf ) ((buf)->pos)
|
||||
|
||||
#define tbufTell(buf) ((buf)->pos)
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// reader functions & macros
|
||||
|
||||
// *Endian*, if true, reader functions of primitive types will do 'ntoh' automatically
|
||||
#define tbufInitReader( Data, Size, Endian ) {.endian = (Endian), .data = (Data), .pos = 0, .size = ((Data) == NULL ? 0 :(Size))}
|
||||
#define tbufInitReader(Data, Size, Endian) \
|
||||
{ .endian = (Endian), .data = (Data), .pos = 0, .size = ((Data) == NULL ? 0 : (Size)) }
|
||||
|
||||
size_t tbufSkip( SBufferReader* buf, size_t size );
|
||||
size_t tbufSkip(SBufferReader* buf, size_t size);
|
||||
|
||||
const char* tbufRead( SBufferReader* buf, size_t size );
|
||||
void tbufReadToBuffer( SBufferReader* buf, void* dst, size_t size );
|
||||
const char* tbufReadString( SBufferReader* buf, size_t* len );
|
||||
size_t tbufReadToString( SBufferReader* buf, char* dst, size_t size );
|
||||
const char* tbufReadBinary( SBufferReader* buf, size_t *len );
|
||||
size_t tbufReadToBinary( SBufferReader* buf, void* dst, size_t size );
|
||||
|
||||
bool tbufReadBool( SBufferReader* buf );
|
||||
char tbufReadChar( SBufferReader* buf );
|
||||
int8_t tbufReadInt8( SBufferReader* buf );
|
||||
uint8_t tbufReadUint8( SBufferReader* buf );
|
||||
int16_t tbufReadInt16( SBufferReader* buf );
|
||||
uint16_t tbufReadUint16( SBufferReader* buf );
|
||||
int32_t tbufReadInt32( SBufferReader* buf );
|
||||
uint32_t tbufReadUint32( SBufferReader* buf );
|
||||
int64_t tbufReadInt64( SBufferReader* buf );
|
||||
uint64_t tbufReadUint64( SBufferReader* buf );
|
||||
float tbufReadFloat( SBufferReader* buf );
|
||||
double tbufReadDouble( SBufferReader* buf );
|
||||
const char* tbufRead(SBufferReader* buf, size_t size);
|
||||
void tbufReadToBuffer(SBufferReader* buf, void* dst, size_t size);
|
||||
const char* tbufReadString(SBufferReader* buf, size_t* len);
|
||||
size_t tbufReadToString(SBufferReader* buf, char* dst, size_t size);
|
||||
const char* tbufReadBinary(SBufferReader* buf, size_t* len);
|
||||
size_t tbufReadToBinary(SBufferReader* buf, void* dst, size_t size);
|
||||
|
||||
bool tbufReadBool(SBufferReader* buf);
|
||||
char tbufReadChar(SBufferReader* buf);
|
||||
int8_t tbufReadInt8(SBufferReader* buf);
|
||||
uint8_t tbufReadUint8(SBufferReader* buf);
|
||||
int16_t tbufReadInt16(SBufferReader* buf);
|
||||
uint16_t tbufReadUint16(SBufferReader* buf);
|
||||
int32_t tbufReadInt32(SBufferReader* buf);
|
||||
uint32_t tbufReadUint32(SBufferReader* buf);
|
||||
int64_t tbufReadInt64(SBufferReader* buf);
|
||||
uint64_t tbufReadUint64(SBufferReader* buf);
|
||||
float tbufReadFloat(SBufferReader* buf);
|
||||
double tbufReadDouble(SBufferReader* buf);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// writer functions & macros
|
||||
|
||||
// *Allocator*, function to allocate memory, will use 'realloc' if NULL
|
||||
// *Endian*, if true, writer functions of primitive types will do 'hton' automatically
|
||||
#define tbufInitWriter( Allocator, Endian ) {.endian = (Endian), .data = NULL, .pos = 0, .size = 0, .allocator = ((Allocator) == NULL ? realloc : (Allocator))}
|
||||
void tbufCloseWriter( SBufferWriter* buf );
|
||||
#define tbufInitWriter(Allocator, Endian) \
|
||||
{ .endian = (Endian), .data = NULL, .pos = 0, .size = 0, .allocator = ((Allocator) == NULL ? realloc : (Allocator)) }
|
||||
void tbufCloseWriter(SBufferWriter* buf);
|
||||
|
||||
void tbufEnsureCapacity( SBufferWriter* buf, size_t size );
|
||||
size_t tbufReserve( SBufferWriter* buf, size_t size );
|
||||
char* tbufGetData( SBufferWriter* buf, bool takeOver );
|
||||
void tbufEnsureCapacity(SBufferWriter* buf, size_t size);
|
||||
size_t tbufReserve(SBufferWriter* buf, size_t size);
|
||||
char* tbufGetData(SBufferWriter* buf, bool takeOver);
|
||||
|
||||
void tbufWrite( SBufferWriter* buf, const void* data, size_t size );
|
||||
void tbufWriteAt( SBufferWriter* buf, size_t pos, const void* data, size_t size );
|
||||
void tbufWriteStringLen( SBufferWriter* buf, const char* str, size_t len );
|
||||
void tbufWriteString( SBufferWriter* buf, const char* str );
|
||||
void tbufWrite(SBufferWriter* buf, const void* data, size_t size);
|
||||
void tbufWriteAt(SBufferWriter* buf, size_t pos, const void* data, size_t size);
|
||||
void tbufWriteStringLen(SBufferWriter* buf, const char* str, size_t len);
|
||||
void tbufWriteString(SBufferWriter* buf, const char* str);
|
||||
// the prototype of tbufWriteBinary and tbufWrite are identical
|
||||
// the difference is: tbufWriteBinary writes the length of the data to the buffer
|
||||
// first, then the actual data, which means the reader don't need to know data
|
||||
// size before read. Write only write the data itself, which means the reader
|
||||
// need to know data size before read.
|
||||
void tbufWriteBinary( SBufferWriter* buf, const void* data, size_t len );
|
||||
void tbufWriteBinary(SBufferWriter* buf, const void* data, size_t len);
|
||||
|
||||
void tbufWriteBool( SBufferWriter* buf, bool data );
|
||||
void tbufWriteBoolAt( SBufferWriter* buf, size_t pos, bool data );
|
||||
void tbufWriteChar( SBufferWriter* buf, char data );
|
||||
void tbufWriteCharAt( SBufferWriter* buf, size_t pos, char data );
|
||||
void tbufWriteInt8( SBufferWriter* buf, int8_t data );
|
||||
void tbufWriteInt8At( SBufferWriter* buf, size_t pos, int8_t data );
|
||||
void tbufWriteUint8( SBufferWriter* buf, uint8_t data );
|
||||
void tbufWriteUint8At( SBufferWriter* buf, size_t pos, uint8_t data );
|
||||
void tbufWriteInt16( SBufferWriter* buf, int16_t data );
|
||||
void tbufWriteInt16At( SBufferWriter* buf, size_t pos, int16_t data );
|
||||
void tbufWriteUint16( SBufferWriter* buf, uint16_t data );
|
||||
void tbufWriteUint16At( SBufferWriter* buf, size_t pos, uint16_t data );
|
||||
void tbufWriteInt32( SBufferWriter* buf, int32_t data );
|
||||
void tbufWriteInt32At( SBufferWriter* buf, size_t pos, int32_t data );
|
||||
void tbufWriteUint32( SBufferWriter* buf, uint32_t data );
|
||||
void tbufWriteUint32At( SBufferWriter* buf, size_t pos, uint32_t data );
|
||||
void tbufWriteInt64( SBufferWriter* buf, int64_t data );
|
||||
void tbufWriteInt64At( SBufferWriter* buf, size_t pos, int64_t data );
|
||||
void tbufWriteUint64( SBufferWriter* buf, uint64_t data );
|
||||
void tbufWriteUint64At( SBufferWriter* buf, size_t pos, uint64_t data );
|
||||
void tbufWriteFloat( SBufferWriter* buf, float data );
|
||||
void tbufWriteFloatAt( SBufferWriter* buf, size_t pos, float data );
|
||||
void tbufWriteDouble( SBufferWriter* buf, double data );
|
||||
void tbufWriteDoubleAt( SBufferWriter* buf, size_t pos, double data );
|
||||
void tbufWriteBool(SBufferWriter* buf, bool data);
|
||||
void tbufWriteBoolAt(SBufferWriter* buf, size_t pos, bool data);
|
||||
void tbufWriteChar(SBufferWriter* buf, char data);
|
||||
void tbufWriteCharAt(SBufferWriter* buf, size_t pos, char data);
|
||||
void tbufWriteInt8(SBufferWriter* buf, int8_t data);
|
||||
void tbufWriteInt8At(SBufferWriter* buf, size_t pos, int8_t data);
|
||||
void tbufWriteUint8(SBufferWriter* buf, uint8_t data);
|
||||
void tbufWriteUint8At(SBufferWriter* buf, size_t pos, uint8_t data);
|
||||
void tbufWriteInt16(SBufferWriter* buf, int16_t data);
|
||||
void tbufWriteInt16At(SBufferWriter* buf, size_t pos, int16_t data);
|
||||
void tbufWriteUint16(SBufferWriter* buf, uint16_t data);
|
||||
void tbufWriteUint16At(SBufferWriter* buf, size_t pos, uint16_t data);
|
||||
void tbufWriteInt32(SBufferWriter* buf, int32_t data);
|
||||
void tbufWriteInt32At(SBufferWriter* buf, size_t pos, int32_t data);
|
||||
void tbufWriteUint32(SBufferWriter* buf, uint32_t data);
|
||||
void tbufWriteUint32At(SBufferWriter* buf, size_t pos, uint32_t data);
|
||||
void tbufWriteInt64(SBufferWriter* buf, int64_t data);
|
||||
void tbufWriteInt64At(SBufferWriter* buf, size_t pos, int64_t data);
|
||||
void tbufWriteUint64(SBufferWriter* buf, uint64_t data);
|
||||
void tbufWriteUint64At(SBufferWriter* buf, size_t pos, uint64_t data);
|
||||
void tbufWriteFloat(SBufferWriter* buf, float data);
|
||||
void tbufWriteFloatAt(SBufferWriter* buf, size_t pos, float data);
|
||||
void tbufWriteDouble(SBufferWriter* buf, double data);
|
||||
void tbufWriteDoubleAt(SBufferWriter* buf, size_t pos, double data);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "os.h"
|
||||
#include "tbuffer.h"
|
||||
#include "exception.h"
|
||||
#include "os.h"
|
||||
//#include "taoserror.h"
|
||||
|
||||
typedef union Un4B {
|
||||
uint32_t ui;
|
||||
float f;
|
||||
float f;
|
||||
} Un4B;
|
||||
#if __STDC_VERSION__ >= 201112L
|
||||
static_assert(sizeof(Un4B) == sizeof(uint32_t), "sizeof(Un4B) must equal to sizeof(uint32_t)");
|
||||
|
|
@ -29,7 +29,7 @@ static_assert(sizeof(Un4B) == sizeof(float), "sizeof(Un4B) must equal to sizeof(
|
|||
|
||||
typedef union Un8B {
|
||||
uint64_t ull;
|
||||
double d;
|
||||
double d;
|
||||
} Un8B;
|
||||
#if __STDC_VERSION__ >= 201112L
|
||||
static_assert(sizeof(Un8B) == sizeof(uint64_t), "sizeof(Un8B) must equal to sizeof(uint64_t)");
|
||||
|
|
@ -40,172 +40,172 @@ static_assert(sizeof(Un8B) == sizeof(double), "sizeof(Un8B) must equal to sizeof
|
|||
// reader functions
|
||||
|
||||
size_t tbufSkip(SBufferReader* buf, size_t size) {
|
||||
if( (buf->pos + size) > buf->size ) {
|
||||
THROW( -1 );
|
||||
if ((buf->pos + size) > buf->size) {
|
||||
THROW(-1);
|
||||
}
|
||||
size_t old = buf->pos;
|
||||
buf->pos += size;
|
||||
return old;
|
||||
}
|
||||
|
||||
const char* tbufRead( SBufferReader* buf, size_t size ) {
|
||||
const char* tbufRead(SBufferReader* buf, size_t size) {
|
||||
const char* ret = buf->data + buf->pos;
|
||||
tbufSkip( buf, size );
|
||||
tbufSkip(buf, size);
|
||||
return ret;
|
||||
}
|
||||
|
||||
void tbufReadToBuffer( SBufferReader* buf, void* dst, size_t size ) {
|
||||
assert( dst != NULL );
|
||||
void tbufReadToBuffer(SBufferReader* buf, void* dst, size_t size) {
|
||||
assert(dst != NULL);
|
||||
// always using memcpy, leave optimization to compiler
|
||||
memcpy( dst, tbufRead(buf, size), size );
|
||||
memcpy(dst, tbufRead(buf, size), size);
|
||||
}
|
||||
|
||||
static size_t tbufReadLength( SBufferReader* buf ) {
|
||||
static size_t tbufReadLength(SBufferReader* buf) {
|
||||
// maximum length is 65535, if larger length is required
|
||||
// this function and the corresponding write function need to be
|
||||
// revised.
|
||||
uint16_t l = tbufReadUint16( buf );
|
||||
uint16_t l = tbufReadUint16(buf);
|
||||
return l;
|
||||
}
|
||||
|
||||
const char* tbufReadString( SBufferReader* buf, size_t* len ) {
|
||||
size_t l = tbufReadLength( buf );
|
||||
const char* tbufReadString(SBufferReader* buf, size_t* len) {
|
||||
size_t l = tbufReadLength(buf);
|
||||
const char* ret = buf->data + buf->pos;
|
||||
tbufSkip( buf, l + 1 );
|
||||
if( ret[l] != 0 ) {
|
||||
THROW( -1 );
|
||||
tbufSkip(buf, l + 1);
|
||||
if (ret[l] != 0) {
|
||||
THROW(-1);
|
||||
}
|
||||
if( len != NULL ) {
|
||||
if (len != NULL) {
|
||||
*len = l;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
size_t tbufReadToString( SBufferReader* buf, char* dst, size_t size ) {
|
||||
assert( dst != NULL );
|
||||
size_t len;
|
||||
const char* str = tbufReadString( buf, &len );
|
||||
size_t tbufReadToString(SBufferReader* buf, char* dst, size_t size) {
|
||||
assert(dst != NULL);
|
||||
size_t len;
|
||||
const char* str = tbufReadString(buf, &len);
|
||||
if (len >= size) {
|
||||
len = size - 1;
|
||||
}
|
||||
memcpy( dst, str, len );
|
||||
memcpy(dst, str, len);
|
||||
dst[len] = 0;
|
||||
return len;
|
||||
}
|
||||
|
||||
const char* tbufReadBinary( SBufferReader* buf, size_t *len ) {
|
||||
size_t l = tbufReadLength( buf );
|
||||
const char* tbufReadBinary(SBufferReader* buf, size_t* len) {
|
||||
size_t l = tbufReadLength(buf);
|
||||
const char* ret = buf->data + buf->pos;
|
||||
tbufSkip( buf, l );
|
||||
if( len != NULL ) {
|
||||
tbufSkip(buf, l);
|
||||
if (len != NULL) {
|
||||
*len = l;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
size_t tbufReadToBinary( SBufferReader* buf, void* dst, size_t size ) {
|
||||
assert( dst != NULL );
|
||||
size_t len;
|
||||
const char* data = tbufReadBinary( buf, &len );
|
||||
if( len >= size ) {
|
||||
size_t tbufReadToBinary(SBufferReader* buf, void* dst, size_t size) {
|
||||
assert(dst != NULL);
|
||||
size_t len;
|
||||
const char* data = tbufReadBinary(buf, &len);
|
||||
if (len >= size) {
|
||||
len = size;
|
||||
}
|
||||
memcpy( dst, data, len );
|
||||
memcpy(dst, data, len);
|
||||
return len;
|
||||
}
|
||||
|
||||
bool tbufReadBool( SBufferReader* buf ) {
|
||||
bool tbufReadBool(SBufferReader* buf) {
|
||||
bool ret;
|
||||
tbufReadToBuffer( buf, &ret, sizeof(ret) );
|
||||
tbufReadToBuffer(buf, &ret, sizeof(ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
char tbufReadChar( SBufferReader* buf ) {
|
||||
char tbufReadChar(SBufferReader* buf) {
|
||||
char ret;
|
||||
tbufReadToBuffer( buf, &ret, sizeof(ret) );
|
||||
tbufReadToBuffer(buf, &ret, sizeof(ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
int8_t tbufReadInt8( SBufferReader* buf ) {
|
||||
int8_t tbufReadInt8(SBufferReader* buf) {
|
||||
int8_t ret;
|
||||
tbufReadToBuffer( buf, &ret, sizeof(ret) );
|
||||
tbufReadToBuffer(buf, &ret, sizeof(ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
uint8_t tbufReadUint8( SBufferReader* buf ) {
|
||||
uint8_t tbufReadUint8(SBufferReader* buf) {
|
||||
uint8_t ret;
|
||||
tbufReadToBuffer( buf, &ret, sizeof(ret) );
|
||||
tbufReadToBuffer(buf, &ret, sizeof(ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
int16_t tbufReadInt16( SBufferReader* buf ) {
|
||||
int16_t tbufReadInt16(SBufferReader* buf) {
|
||||
int16_t ret;
|
||||
tbufReadToBuffer( buf, &ret, sizeof(ret) );
|
||||
if( buf->endian ) {
|
||||
return (int16_t)ntohs( ret );
|
||||
tbufReadToBuffer(buf, &ret, sizeof(ret));
|
||||
if (buf->endian) {
|
||||
return (int16_t)ntohs(ret);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
uint16_t tbufReadUint16( SBufferReader* buf ) {
|
||||
uint16_t tbufReadUint16(SBufferReader* buf) {
|
||||
uint16_t ret;
|
||||
tbufReadToBuffer( buf, &ret, sizeof(ret) );
|
||||
if( buf->endian ) {
|
||||
return ntohs( ret );
|
||||
tbufReadToBuffer(buf, &ret, sizeof(ret));
|
||||
if (buf->endian) {
|
||||
return ntohs(ret);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
int32_t tbufReadInt32( SBufferReader* buf ) {
|
||||
int32_t tbufReadInt32(SBufferReader* buf) {
|
||||
int32_t ret;
|
||||
tbufReadToBuffer( buf, &ret, sizeof(ret) );
|
||||
if( buf->endian ) {
|
||||
return (int32_t)ntohl( ret );
|
||||
tbufReadToBuffer(buf, &ret, sizeof(ret));
|
||||
if (buf->endian) {
|
||||
return (int32_t)ntohl(ret);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
uint32_t tbufReadUint32( SBufferReader* buf ) {
|
||||
uint32_t tbufReadUint32(SBufferReader* buf) {
|
||||
uint32_t ret;
|
||||
tbufReadToBuffer( buf, &ret, sizeof(ret) );
|
||||
if( buf->endian ) {
|
||||
return ntohl( ret );
|
||||
tbufReadToBuffer(buf, &ret, sizeof(ret));
|
||||
if (buf->endian) {
|
||||
return ntohl(ret);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
int64_t tbufReadInt64( SBufferReader* buf ) {
|
||||
int64_t tbufReadInt64(SBufferReader* buf) {
|
||||
int64_t ret;
|
||||
tbufReadToBuffer( buf, &ret, sizeof(ret) );
|
||||
if( buf->endian ) {
|
||||
return (int64_t)htobe64( ret ); // TODO: ntohll
|
||||
tbufReadToBuffer(buf, &ret, sizeof(ret));
|
||||
if (buf->endian) {
|
||||
return (int64_t)htobe64(ret); // TODO: ntohll
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
uint64_t tbufReadUint64( SBufferReader* buf ) {
|
||||
uint64_t tbufReadUint64(SBufferReader* buf) {
|
||||
uint64_t ret;
|
||||
tbufReadToBuffer( buf, &ret, sizeof(ret) );
|
||||
if( buf->endian ) {
|
||||
return htobe64( ret ); // TODO: ntohll
|
||||
tbufReadToBuffer(buf, &ret, sizeof(ret));
|
||||
if (buf->endian) {
|
||||
return htobe64(ret); // TODO: ntohll
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
float tbufReadFloat( SBufferReader* buf ) {
|
||||
float tbufReadFloat(SBufferReader* buf) {
|
||||
Un4B _un;
|
||||
tbufReadToBuffer( buf, &_un, sizeof(_un) );
|
||||
if( buf->endian ) {
|
||||
_un.ui = ntohl( _un.ui );
|
||||
tbufReadToBuffer(buf, &_un, sizeof(_un));
|
||||
if (buf->endian) {
|
||||
_un.ui = ntohl(_un.ui);
|
||||
}
|
||||
return _un.f;
|
||||
}
|
||||
|
||||
double tbufReadDouble(SBufferReader* buf) {
|
||||
Un8B _un;
|
||||
tbufReadToBuffer( buf, &_un, sizeof(_un) );
|
||||
if( buf->endian ) {
|
||||
_un.ull = htobe64( _un.ull );
|
||||
tbufReadToBuffer(buf, &_un, sizeof(_un));
|
||||
if (buf->endian) {
|
||||
_un.ull = htobe64(_un.ull);
|
||||
}
|
||||
return _un.d;
|
||||
}
|
||||
|
|
@ -213,38 +213,38 @@ double tbufReadDouble(SBufferReader* buf) {
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
// writer functions
|
||||
|
||||
void tbufCloseWriter( SBufferWriter* buf ) {
|
||||
void tbufCloseWriter(SBufferWriter* buf) {
|
||||
tfree(buf->data);
|
||||
// (*buf->allocator)( buf->data, 0 ); // potential memory leak.
|
||||
// (*buf->allocator)( buf->data, 0 ); // potential memory leak.
|
||||
buf->data = NULL;
|
||||
buf->pos = 0;
|
||||
buf->size = 0;
|
||||
}
|
||||
|
||||
void tbufEnsureCapacity( SBufferWriter* buf, size_t size ) {
|
||||
void tbufEnsureCapacity(SBufferWriter* buf, size_t size) {
|
||||
size += buf->pos;
|
||||
if( size > buf->size ) {
|
||||
if (size > buf->size) {
|
||||
size_t nsize = size + buf->size;
|
||||
char* data = (*buf->allocator)( buf->data, nsize );
|
||||
char* data = (*buf->allocator)(buf->data, nsize);
|
||||
// TODO: the exception should be thrown by the allocator function
|
||||
if( data == NULL ) {
|
||||
THROW( -1 );
|
||||
if (data == NULL) {
|
||||
THROW(-1);
|
||||
}
|
||||
buf->data = data;
|
||||
buf->size = nsize;
|
||||
}
|
||||
}
|
||||
|
||||
size_t tbufReserve( SBufferWriter* buf, size_t size ) {
|
||||
tbufEnsureCapacity( buf, size );
|
||||
size_t tbufReserve(SBufferWriter* buf, size_t size) {
|
||||
tbufEnsureCapacity(buf, size);
|
||||
size_t old = buf->pos;
|
||||
buf->pos += size;
|
||||
return old;
|
||||
}
|
||||
|
||||
char* tbufGetData( SBufferWriter* buf, bool takeOver ) {
|
||||
char* tbufGetData(SBufferWriter* buf, bool takeOver) {
|
||||
char* ret = buf->data;
|
||||
if( takeOver ) {
|
||||
if (takeOver) {
|
||||
buf->pos = 0;
|
||||
buf->size = 0;
|
||||
buf->data = NULL;
|
||||
|
|
@ -252,192 +252,174 @@ char* tbufGetData( SBufferWriter* buf, bool takeOver ) {
|
|||
return ret;
|
||||
}
|
||||
|
||||
void tbufWrite( SBufferWriter* buf, const void* data, size_t size ) {
|
||||
assert( data != NULL );
|
||||
tbufEnsureCapacity( buf, size );
|
||||
memcpy( buf->data + buf->pos, data, size );
|
||||
void tbufWrite(SBufferWriter* buf, const void* data, size_t size) {
|
||||
assert(data != NULL);
|
||||
tbufEnsureCapacity(buf, size);
|
||||
memcpy(buf->data + buf->pos, data, size);
|
||||
buf->pos += size;
|
||||
}
|
||||
|
||||
void tbufWriteAt( SBufferWriter* buf, size_t pos, const void* data, size_t size ) {
|
||||
assert( data != NULL );
|
||||
void tbufWriteAt(SBufferWriter* buf, size_t pos, const void* data, size_t size) {
|
||||
assert(data != NULL);
|
||||
// this function can only be called to fill the gap on previous writes,
|
||||
// so 'pos + size <= buf->pos' must be true
|
||||
assert( pos + size <= buf->pos );
|
||||
memcpy( buf->data + pos, data, size );
|
||||
assert(pos + size <= buf->pos);
|
||||
memcpy(buf->data + pos, data, size);
|
||||
}
|
||||
|
||||
static void tbufWriteLength( SBufferWriter* buf, size_t len ) {
|
||||
static void tbufWriteLength(SBufferWriter* buf, size_t len) {
|
||||
// maximum length is 65535, if larger length is required
|
||||
// this function and the corresponding read function need to be
|
||||
// revised.
|
||||
assert( len <= 0xffff );
|
||||
tbufWriteUint16( buf, (uint16_t)len );
|
||||
assert(len <= 0xffff);
|
||||
tbufWriteUint16(buf, (uint16_t)len);
|
||||
}
|
||||
|
||||
void tbufWriteStringLen( SBufferWriter* buf, const char* str, size_t len ) {
|
||||
tbufWriteLength( buf, len );
|
||||
tbufWrite( buf, str, len );
|
||||
tbufWriteChar( buf, '\0' );
|
||||
void tbufWriteStringLen(SBufferWriter* buf, const char* str, size_t len) {
|
||||
tbufWriteLength(buf, len);
|
||||
tbufWrite(buf, str, len);
|
||||
tbufWriteChar(buf, '\0');
|
||||
}
|
||||
|
||||
void tbufWriteString( SBufferWriter* buf, const char* str ) {
|
||||
tbufWriteStringLen( buf, str, strlen(str) );
|
||||
void tbufWriteString(SBufferWriter* buf, const char* str) { tbufWriteStringLen(buf, str, strlen(str)); }
|
||||
|
||||
void tbufWriteBinary(SBufferWriter* buf, const void* data, size_t len) {
|
||||
tbufWriteLength(buf, len);
|
||||
tbufWrite(buf, data, len);
|
||||
}
|
||||
|
||||
void tbufWriteBinary( SBufferWriter* buf, const void* data, size_t len ) {
|
||||
tbufWriteLength( buf, len );
|
||||
tbufWrite( buf, data, len );
|
||||
}
|
||||
void tbufWriteBool(SBufferWriter* buf, bool data) { tbufWrite(buf, &data, sizeof(data)); }
|
||||
|
||||
void tbufWriteBool( SBufferWriter* buf, bool data ) {
|
||||
tbufWrite( buf, &data, sizeof(data) );
|
||||
}
|
||||
void tbufWriteBoolAt(SBufferWriter* buf, size_t pos, bool data) { tbufWriteAt(buf, pos, &data, sizeof(data)); }
|
||||
|
||||
void tbufWriteBoolAt( SBufferWriter* buf, size_t pos, bool data ) {
|
||||
tbufWriteAt( buf, pos, &data, sizeof(data) );
|
||||
}
|
||||
void tbufWriteChar(SBufferWriter* buf, char data) { tbufWrite(buf, &data, sizeof(data)); }
|
||||
|
||||
void tbufWriteChar( SBufferWriter* buf, char data ) {
|
||||
tbufWrite( buf, &data, sizeof(data) );
|
||||
}
|
||||
void tbufWriteCharAt(SBufferWriter* buf, size_t pos, char data) { tbufWriteAt(buf, pos, &data, sizeof(data)); }
|
||||
|
||||
void tbufWriteCharAt( SBufferWriter* buf, size_t pos, char data ) {
|
||||
tbufWriteAt( buf, pos, &data, sizeof(data) );
|
||||
}
|
||||
void tbufWriteInt8(SBufferWriter* buf, int8_t data) { tbufWrite(buf, &data, sizeof(data)); }
|
||||
|
||||
void tbufWriteInt8( SBufferWriter* buf, int8_t data ) {
|
||||
tbufWrite( buf, &data, sizeof(data) );
|
||||
}
|
||||
void tbufWriteInt8At(SBufferWriter* buf, size_t pos, int8_t data) { tbufWriteAt(buf, pos, &data, sizeof(data)); }
|
||||
|
||||
void tbufWriteInt8At( SBufferWriter* buf, size_t pos, int8_t data ) {
|
||||
tbufWriteAt( buf, pos, &data, sizeof(data) );
|
||||
}
|
||||
void tbufWriteUint8(SBufferWriter* buf, uint8_t data) { tbufWrite(buf, &data, sizeof(data)); }
|
||||
|
||||
void tbufWriteUint8( SBufferWriter* buf, uint8_t data ) {
|
||||
tbufWrite( buf, &data, sizeof(data) );
|
||||
}
|
||||
void tbufWriteUint8At(SBufferWriter* buf, size_t pos, uint8_t data) { tbufWriteAt(buf, pos, &data, sizeof(data)); }
|
||||
|
||||
void tbufWriteUint8At( SBufferWriter* buf, size_t pos, uint8_t data ) {
|
||||
tbufWriteAt( buf, pos, &data, sizeof(data) );
|
||||
}
|
||||
|
||||
void tbufWriteInt16( SBufferWriter* buf, int16_t data ) {
|
||||
if( buf->endian ) {
|
||||
data = (int16_t)htons( data );
|
||||
void tbufWriteInt16(SBufferWriter* buf, int16_t data) {
|
||||
if (buf->endian) {
|
||||
data = (int16_t)htons(data);
|
||||
}
|
||||
tbufWrite( buf, &data, sizeof(data) );
|
||||
tbufWrite(buf, &data, sizeof(data));
|
||||
}
|
||||
|
||||
void tbufWriteInt16At( SBufferWriter* buf, size_t pos, int16_t data ) {
|
||||
if( buf->endian ) {
|
||||
data = (int16_t)htons( data );
|
||||
void tbufWriteInt16At(SBufferWriter* buf, size_t pos, int16_t data) {
|
||||
if (buf->endian) {
|
||||
data = (int16_t)htons(data);
|
||||
}
|
||||
tbufWriteAt( buf, pos, &data, sizeof(data) );
|
||||
tbufWriteAt(buf, pos, &data, sizeof(data));
|
||||
}
|
||||
|
||||
void tbufWriteUint16( SBufferWriter* buf, uint16_t data ) {
|
||||
if( buf->endian ) {
|
||||
data = htons( data );
|
||||
void tbufWriteUint16(SBufferWriter* buf, uint16_t data) {
|
||||
if (buf->endian) {
|
||||
data = htons(data);
|
||||
}
|
||||
tbufWrite( buf, &data, sizeof(data) );
|
||||
tbufWrite(buf, &data, sizeof(data));
|
||||
}
|
||||
|
||||
void tbufWriteUint16At( SBufferWriter* buf, size_t pos, uint16_t data ) {
|
||||
if( buf->endian ) {
|
||||
data = htons( data );
|
||||
void tbufWriteUint16At(SBufferWriter* buf, size_t pos, uint16_t data) {
|
||||
if (buf->endian) {
|
||||
data = htons(data);
|
||||
}
|
||||
tbufWriteAt( buf, pos, &data, sizeof(data) );
|
||||
tbufWriteAt(buf, pos, &data, sizeof(data));
|
||||
}
|
||||
|
||||
void tbufWriteInt32( SBufferWriter* buf, int32_t data ) {
|
||||
if( buf->endian ) {
|
||||
data = (int32_t)htonl( data );
|
||||
void tbufWriteInt32(SBufferWriter* buf, int32_t data) {
|
||||
if (buf->endian) {
|
||||
data = (int32_t)htonl(data);
|
||||
}
|
||||
tbufWrite( buf, &data, sizeof(data) );
|
||||
tbufWrite(buf, &data, sizeof(data));
|
||||
}
|
||||
|
||||
void tbufWriteInt32At( SBufferWriter* buf, size_t pos, int32_t data ) {
|
||||
if( buf->endian ) {
|
||||
data = (int32_t)htonl( data );
|
||||
void tbufWriteInt32At(SBufferWriter* buf, size_t pos, int32_t data) {
|
||||
if (buf->endian) {
|
||||
data = (int32_t)htonl(data);
|
||||
}
|
||||
tbufWriteAt( buf, pos, &data, sizeof(data) );
|
||||
tbufWriteAt(buf, pos, &data, sizeof(data));
|
||||
}
|
||||
|
||||
void tbufWriteUint32( SBufferWriter* buf, uint32_t data ) {
|
||||
if( buf->endian ) {
|
||||
data = htonl( data );
|
||||
void tbufWriteUint32(SBufferWriter* buf, uint32_t data) {
|
||||
if (buf->endian) {
|
||||
data = htonl(data);
|
||||
}
|
||||
tbufWrite( buf, &data, sizeof(data) );
|
||||
tbufWrite(buf, &data, sizeof(data));
|
||||
}
|
||||
|
||||
void tbufWriteUint32At( SBufferWriter* buf, size_t pos, uint32_t data ) {
|
||||
if( buf->endian ) {
|
||||
data = htonl( data );
|
||||
void tbufWriteUint32At(SBufferWriter* buf, size_t pos, uint32_t data) {
|
||||
if (buf->endian) {
|
||||
data = htonl(data);
|
||||
}
|
||||
tbufWriteAt( buf, pos, &data, sizeof(data) );
|
||||
tbufWriteAt(buf, pos, &data, sizeof(data));
|
||||
}
|
||||
|
||||
void tbufWriteInt64( SBufferWriter* buf, int64_t data ) {
|
||||
if( buf->endian ) {
|
||||
data = (int64_t)htobe64( data );
|
||||
void tbufWriteInt64(SBufferWriter* buf, int64_t data) {
|
||||
if (buf->endian) {
|
||||
data = (int64_t)htobe64(data);
|
||||
}
|
||||
tbufWrite( buf, &data, sizeof(data) );
|
||||
tbufWrite(buf, &data, sizeof(data));
|
||||
}
|
||||
|
||||
void tbufWriteInt64At( SBufferWriter* buf, size_t pos, int64_t data ) {
|
||||
if( buf->endian ) {
|
||||
data = (int64_t)htobe64( data );
|
||||
void tbufWriteInt64At(SBufferWriter* buf, size_t pos, int64_t data) {
|
||||
if (buf->endian) {
|
||||
data = (int64_t)htobe64(data);
|
||||
}
|
||||
tbufWriteAt( buf, pos, &data, sizeof(data) );
|
||||
tbufWriteAt(buf, pos, &data, sizeof(data));
|
||||
}
|
||||
|
||||
void tbufWriteUint64( SBufferWriter* buf, uint64_t data ) {
|
||||
if( buf->endian ) {
|
||||
data = htobe64( data );
|
||||
void tbufWriteUint64(SBufferWriter* buf, uint64_t data) {
|
||||
if (buf->endian) {
|
||||
data = htobe64(data);
|
||||
}
|
||||
tbufWrite( buf, &data, sizeof(data) );
|
||||
tbufWrite(buf, &data, sizeof(data));
|
||||
}
|
||||
|
||||
void tbufWriteUint64At( SBufferWriter* buf, size_t pos, uint64_t data ) {
|
||||
if( buf->endian ) {
|
||||
data = htobe64( data );
|
||||
void tbufWriteUint64At(SBufferWriter* buf, size_t pos, uint64_t data) {
|
||||
if (buf->endian) {
|
||||
data = htobe64(data);
|
||||
}
|
||||
tbufWriteAt( buf, pos, &data, sizeof(data) );
|
||||
tbufWriteAt(buf, pos, &data, sizeof(data));
|
||||
}
|
||||
|
||||
void tbufWriteFloat( SBufferWriter* buf, float data ) {
|
||||
void tbufWriteFloat(SBufferWriter* buf, float data) {
|
||||
Un4B _un;
|
||||
_un.f = data;
|
||||
if( buf->endian ) {
|
||||
_un.ui = htonl( _un.ui );
|
||||
if (buf->endian) {
|
||||
_un.ui = htonl(_un.ui);
|
||||
}
|
||||
tbufWrite( buf, &_un, sizeof(_un) );
|
||||
tbufWrite(buf, &_un, sizeof(_un));
|
||||
}
|
||||
|
||||
void tbufWriteFloatAt( SBufferWriter* buf, size_t pos, float data ) {
|
||||
void tbufWriteFloatAt(SBufferWriter* buf, size_t pos, float data) {
|
||||
Un4B _un;
|
||||
_un.f = data;
|
||||
if( buf->endian ) {
|
||||
_un.ui = htonl( _un.ui );
|
||||
if (buf->endian) {
|
||||
_un.ui = htonl(_un.ui);
|
||||
}
|
||||
tbufWriteAt( buf, pos, &_un, sizeof(_un) );
|
||||
tbufWriteAt(buf, pos, &_un, sizeof(_un));
|
||||
}
|
||||
|
||||
void tbufWriteDouble( SBufferWriter* buf, double data ) {
|
||||
void tbufWriteDouble(SBufferWriter* buf, double data) {
|
||||
Un8B _un;
|
||||
_un.d = data;
|
||||
if( buf->endian ) {
|
||||
_un.ull = htobe64( _un.ull );
|
||||
if (buf->endian) {
|
||||
_un.ull = htobe64(_un.ull);
|
||||
}
|
||||
tbufWrite( buf, &_un, sizeof(_un) );
|
||||
tbufWrite(buf, &_un, sizeof(_un));
|
||||
}
|
||||
|
||||
void tbufWriteDoubleAt( SBufferWriter* buf, size_t pos, double data ) {
|
||||
void tbufWriteDoubleAt(SBufferWriter* buf, size_t pos, double data) {
|
||||
Un8B _un;
|
||||
_un.d = data;
|
||||
if( buf->endian ) {
|
||||
_un.ull = htobe64( _un.ull );
|
||||
if (buf->endian) {
|
||||
_un.ull = htobe64(_un.ull);
|
||||
}
|
||||
tbufWriteAt( buf, pos, &_un, sizeof(_un) );
|
||||
tbufWriteAt(buf, pos, &_un, sizeof(_un));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue