diff --git a/include/tr/interface/reader.h b/include/tr/interface/reader.h index df7af4b..c5bf9ac 100644 --- a/include/tr/interface/reader.h +++ b/include/tr/interface/reader.h @@ -37,7 +37,14 @@ TR_INTERFACE(TR_StreamReader) { fptr_TR_streamReaderRead read; }; -extern ssize_t TR_streamReaderRead(void *, TR_Stream); +inline +ssize_t +TR_streamReaderRead(void * object, TR_Stream st) +{ + ssize_t ret; + TR_RETCALL(object, TR_StreamReader, read, ret, st); + return ret; +} #endif // __TR_INTERFACE_READER_H__ diff --git a/include/tr/interface/socket.h b/include/tr/interface/socket.h index b561b14..2336a30 100644 --- a/include/tr/interface/socket.h +++ b/include/tr/interface/socket.h @@ -42,8 +42,24 @@ TR_INTERFACE(TR_Socket) { fptr_TR_socketSend send; }; -extern int TR_socketBindAction(void *); -extern int TR_socketConnectAction(void *); +inline +int +TR_socketBindAction(void * _this) +{ + int callret; + TR_RETCALL(_this, TR_Socket, bind, callret); + return callret; +} + +inline +int +TR_socketConnectAction(void * _this) +{ + int callret; + TR_RETCALL(_this, TR_Socket, connect, callret); + return callret; +} + extern TR_RemoteData TR_socketRecv(void *, size_t); extern ssize_t TR_socketSend(void *, TR_RemoteData); diff --git a/include/tr/interface/writer.h b/include/tr/interface/writer.h index 85d4fb6..ecbc998 100644 --- a/include/tr/interface/writer.h +++ b/include/tr/interface/writer.h @@ -37,7 +37,14 @@ TR_INTERFACE(TR_StreamWriter) { fptr_TR_streamWriterWrite write; }; -ssize_t TR_streamWriterWrite(void *, TR_Stream); +inline +ssize_t +TR_streamWriterWrite(void * object, TR_Stream st) +{ + ssize_t ret; + TR_RETCALL(object, TR_StreamWriter, write, ret, st); + return ret; +} #endif // __TR_INTERFACE_WRITER_H__ diff --git a/src/i_reader.c b/src/i_reader.c index 1997854..ef89673 100644 --- a/src/i_reader.c +++ b/src/i_reader.c @@ -26,14 +26,6 @@ TR_CREATE_INTERFACE(TR_StreamReader, 1); -ssize_t -TR_streamReaderRead(void * object, TR_Stream st) -{ - ssize_t ret; - - TR_RETCALL(object, TR_StreamReader, read, ret, st); - - return ret; -} +extern inline ssize_t TR_streamReaderRead(void *, TR_Stream); // vim: set ts=4 sw=4: diff --git a/src/i_socket.c b/src/i_socket.c index 4e65e9e..4273978 100644 --- a/src/i_socket.c +++ b/src/i_socket.c @@ -28,25 +28,8 @@ TR_CREATE_INTERFACE(TR_Socket, 4); -int -TR_socketBindAction(void * _this) -{ - int callret; - - TR_RETCALL(_this, TR_Socket, bind, callret); - - return callret; -} - -int -TR_socketConnectAction(void * _this) -{ - int callret; - - TR_RETCALL(_this, TR_Socket, connect, callret); - - return callret; -} +extern inline int TR_socketBindAction(void *); +extern inline int TR_socketConnectAction(void *); TR_RemoteData TR_socketRecv(void * _this, size_t size) diff --git a/src/i_writer.c b/src/i_writer.c index a6ca64c..bf7c946 100644 --- a/src/i_writer.c +++ b/src/i_writer.c @@ -26,14 +26,6 @@ TR_CREATE_INTERFACE(TR_StreamWriter, 1); -ssize_t -TR_streamWriterWrite(void * object, TR_Stream st) -{ - ssize_t ret; - - TR_RETCALL(object, TR_StreamWriter, write, ret, st); - - return ret; -} +extern inline ssize_t TR_streamWriterWrite(void *, TR_Stream); // vim: set ts=4 sw=4: