Inline simple accessor functions

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__
 

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);
 

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__
 

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:

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)

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: