1 files changed, 14 insertions, 12 deletions

diff --git a/src/buffer.h b/src/buffer.h
index 4943e3b..3ffc145 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -3,11 +3,12 @@
 *
 * RCS ID: $Id$
 \*=========================================================================*/
-#ifndef BUF_H_
-#define BUF_H_ 
+#ifndef BUF_H
+#define BUF_H 
 
 #include <lua.h>
-#include "lsbase.h"
+#include "io.h"
+#include "tm.h"
 
 /* buffer size in bytes */
 #define BUF_SIZE 8192
@@ -15,10 +16,11 @@
 /*-------------------------------------------------------------------------*\
 * Buffer control structure
 \*-------------------------------------------------------------------------*/
-typedef struct t_buf_tag {
-        size_t buf_first, buf_last;
-        char buf_data[BUF_SIZE];
-    p_base buf_base;
+typedef struct t_buf_ {
+    p_io io;                /* IO driver used for this buffer */
+    p_tm tm;                /* timeout management for this buffer */
+        size_t first, last;     /* index of first and last bytes of stored data */
+        char data[BUF_SIZE];    /* storage space for buffer data */
 } t_buf;
 typedef t_buf *p_buf;
 
@@ -26,9 +28,9 @@ typedef t_buf *p_buf;
 * Exported functions
 \*-------------------------------------------------------------------------*/
 void buf_open(lua_State *L);
-void buf_init(lua_State *L, p_buf buf, p_base base);
-int buf_send(lua_State *L, p_buf buf);
-int buf_receive(lua_State *L, p_buf buf);
-int buf_isempty(lua_State *L, p_buf buf);
+void buf_init(p_buf buf, p_io io, p_tm tm);
+int buf_meth_send(lua_State *L, p_buf buf);
+int buf_meth_receive(lua_State *L, p_buf buf);
+int buf_isempty(p_buf buf);
 
-#endif /* BUF_H_ */
+#endif /* BUF_H */