Merge remote-tracking branch 'origin/dev-table' into dev-table

[libucw.git] / ucw / fb-socket.c

diff --git a/ucw/fb-socket.c b/ucw/fb-socket.c
index 84395f09891c889b1d31eb39bdbbec8d2d78d318..1402f7ba5a4953d8d3f89e68a9d21d17106a8897 100644 (file)
--- a/ucw/fb-socket.c
+++ b/ucw/fb-socket.c
@@ -7,9 +7,9 @@
  *     of the GNU Lesser General Public License.
  */
 
  *     of the GNU Lesser General Public License.
  */
 

-#include "ucw/lib.h"
-#include "ucw/fastbuf.h"
-#include "ucw/fb-socket.h"
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/fb-socket.h>

 
 #include <stdio.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <unistd.h>


@@ -22,7 +22,7 @@ struct fb_sock {
   byte buf[0];
 };
 
   byte buf[0];
 };
 

-#define FB_SOCK(f) ((struct fb_sock *)(f)->is_fastbuf)
+#define FB_SOCK(f) ((struct fb_sock *)(f))

 
 static int
 fbs_refill(struct fastbuf *f)
 
 static int
 fbs_refill(struct fastbuf *f)


@@ -71,9 +71,9 @@ fbs_spout(struct fastbuf *f)
       .events = POLLOUT,
   };
 
       .events = POLLOUT,
   };
 

-  int l = f->bptr - f->buffer;
-  f->bptr = f->buffer;
-  char *buf = f->buffer;
+  int l = f->bptr - f->bstop;
+  f->bptr = f->bstop;
+  char *buf = f->bstop;

 
   while (l)
     {
 
   while (l)
     {


@@ -133,7 +133,7 @@ fbsock_create(struct fbsock_params *p)
 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 

-static void test_err(void *x UNUSED, uns flags, char *msg UNUSED)
+static void test_err(void *x UNUSED, uint flags, char *msg UNUSED)

 {
   if (flags & FBSOCK_READ)
     printf("READ");
 {
   if (flags & FBSOCK_READ)
     printf("READ");