tableprinter&xtypes: assert changed to die in tests, fix of timestamp parsing

[libucw.git] / images / context.c

diff --git a/images/context.c b/images/context.c
index 6281ba3cb0974874b0974383b45de2a2b1972820..82ff16557ca708fb8e446eafdd66d6a81124dcb8 100644 (file)
--- a/images/context.c
+++ b/images/context.c
@@ -9,10 +9,10 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/bbuf.h"
-#include "images/images.h"
-#include "images/error.h"
+#include <ucw/lib.h>
+#include <ucw/bbuf.h>
+#include <images/images.h>
+#include <images/error.h>
 
 #include <string.h>
 
@@ -35,7 +35,7 @@ image_context_cleanup(struct image_context *ctx)
 void
 image_context_msg_default(struct image_context *ctx)
 {
-  log(ctx->msg_code >> 24, "%s", ctx->msg);
+  msg(ctx->msg_code >> 24, "%s", ctx->msg);
 }
 
 void
@@ -44,7 +44,7 @@ image_context_msg_silent(struct image_context *ctx UNUSED)
 }
 
 void
-image_context_msg(struct image_context *ctx, uns code, char *msg, ...)
+image_context_msg(struct image_context *ctx, uint code, char *msg, ...)
 {
   va_list args;
   va_start(args, msg);
@@ -53,7 +53,7 @@ image_context_msg(struct image_context *ctx, uns code, char *msg, ...)
 }
 
 void
-image_context_vmsg(struct image_context *ctx, uns code, char *msg, va_list args)
+image_context_vmsg(struct image_context *ctx, uint code, char *msg, va_list args)
 {
   ctx->msg_code = code;
   ctx->msg = bb_vprintf(&ctx->msg_buf, msg, args);