Merge remote-tracking branch 'origin/master'

[libucw.git] / charset / fb-charconv.c

diff --git a/charset/fb-charconv.c b/charset/fb-charconv.c
index c119a1bea87d55a3ee7855434d9b7b56263bfe40..c1701e55c6fb93d9b9fc7f772d631b895b71c2b0 100644 (file)
--- a/charset/fb-charconv.c
+++ b/charset/fb-charconv.c
@@ -7,10 +7,10 @@
  *     of the GNU Lesser General Public License.
  */
 
  *     of the GNU Lesser General Public License.
  */
 

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

 
 #define BUFSIZE 1024
 
 
 #define BUFSIZE 1024
 


@@ -20,7 +20,7 @@ struct fb_charconv {
   struct conv_context ctxt;
   byte buf[BUFSIZE];
 };
   struct conv_context ctxt;
   byte buf[BUFSIZE];
 };

-#define FB_CC(f) ((struct fb_charconv *)(f)->is_fastbuf)
+#define FB_CC(f) ((struct fb_charconv *)(f))

 
 static void
 fb_cc_spout(struct fastbuf *f)
 
 static void
 fb_cc_spout(struct fastbuf *f)


@@ -35,7 +35,7 @@ fb_cc_spout(struct fastbuf *f)
       flags = conv_run(ct);
       if (ct->dest > ct->dest_start)
        bdirect_write_commit(FB_CC(f)->orig, ct->dest);
       flags = conv_run(ct);
       if (ct->dest > ct->dest_start)
        bdirect_write_commit(FB_CC(f)->orig, ct->dest);

-      uns l = bdirect_write_prepare(FB_CC(f)->orig, &ct->dest_start);
+      uint l = bdirect_write_prepare(FB_CC(f)->orig, &ct->dest_start);

       ct->dest = ct->dest_start;
       ct->dest_end = ct->dest + l;
     }
       ct->dest = ct->dest_start;
       ct->dest_end = ct->dest + l;
     }


@@ -54,7 +54,7 @@ fb_cc_refill(struct fastbuf *f)
   do
     {
       byte *src;
   do
     {
       byte *src;

-      uns len = bdirect_read_prepare(FB_CC(f)->orig, &src);
+      uint len = bdirect_read_prepare(FB_CC(f)->orig, &src);

       if (!len)
        break;
       ct->source = src;
       if (!len)
        break;
       ct->source = src;