X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Ffb-limfd.c;h=e1756102b5afdf900bcfc4f203e15249402ea4ea;hb=1ca423dc7562584d7747416951855a47eef09e1f;hp=a1c218aa21388fb49ff3a65468e9e1e97074dedf;hpb=031256ad2e123eec58521f8e3eb9496c197641d2;p=libucw.git

diff --git a/ucw/fb-limfd.c b/ucw/fb-limfd.c
index a1c218aa..e1756102 100644
--- a/ucw/fb-limfd.c
+++ b/ucw/fb-limfd.c
@@ -7,8 +7,8 @@
  *	of the GNU Lesser General Public License.
  */
 
-#include "ucw/lib.h"
-#include "ucw/fastbuf.h"
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
 
 #include <unistd.h>
 
@@ -17,7 +17,7 @@ struct fb_limfd {
   int fd;				/* File descriptor */
   int limit;
 };
-#define FB_LIMFD(f) ((struct fb_limfd *)(f)->is_fastbuf)
+#define FB_LIMFD(f) ((struct fb_limfd *)(f))
 #define FB_BUFFER(f) (byte *)(FB_LIMFD(f) + 1)
 
 static int
@@ -27,7 +27,7 @@ bfl_refill(struct fastbuf *f)
   int max = MIN(FB_LIMFD(f)->limit - f->pos, f->bufend - f->buffer);
   int l = read(FB_LIMFD(f)->fd, f->buffer, max);
   if (l < 0)
-    die("Error reading %s: %m", f->name);
+    bthrow(f, "read", "Error reading %s: %m", f->name);
   f->bstop = f->buffer + l;
   f->pos += l;
   return l;
@@ -60,7 +60,7 @@ bopen_limited_fd(int fd, uns buflen, uns limit)
 
 #ifdef TEST
 
-int main(int argc, char **argv)
+int main(int UNUSED argc, char UNUSED **argv)
 {
   struct fastbuf *f = bopen_limited_fd(0, 3, 13);
   struct fastbuf *o = bfdopen_shared(1, 16);