Merge branch 'master' into table

[libucw.git] / ucw / tbf.c

diff --git a/ucw/tbf.c b/ucw/tbf.c
index 9f8404e18dd96fc41b49d8ad9a2ca39e1b7fac80..62b0c41cd51f49a66c7289405f8d1ede7b2da6a7 100644 (file)
--- a/ucw/tbf.c
+++ b/ucw/tbf.c
@@ -7,8 +7,8 @@
  *     of the GNU Lesser General Public License.
  */
 
  *     of the GNU Lesser General Public License.
  */
 

-#include "ucw/lib.h"
-#include "ucw/tbf.h"
+#include <ucw/lib.h>
+#include <ucw/tbf.h>

 
 void
 tbf_init(struct token_bucket_filter *f)
 
 void
 tbf_init(struct token_bucket_filter *f)


@@ -29,7 +29,7 @@ tbf_limit(struct token_bucket_filter *f, timestamp_t now)
   b = MIN(b, f->burst);
   if (b >= 1)
     {
   b = MIN(b, f->burst);
   if (b >= 1)
     {

-      uns dropped = f->drop_count;
+      uint dropped = f->drop_count;

       f->bucket = b - 1;
       f->drop_count = 0;
       return dropped;
       f->bucket = b - 1;
       f->drop_count = 0;
       return dropped;


@@ -51,7 +51,7 @@ int main(void)
   for (timestamp_t now = 0; now < 3000; now += 77)
     {
       int res = tbf_limit(&t, now);
   for (timestamp_t now = 0; now < 3000; now += 77)
     {
       int res = tbf_limit(&t, now);

-      msg(L_DEBUG, "t=%u result=%d bucket=%f", (uns) now, res, t.bucket);
+      msg(L_DEBUG, "t=%u result=%d bucket=%f", (uint) now, res, t.bucket);

     }
   return 0;
 }
     }
   return 0;
 }