#undef LOCAL_DEBUG
#include "sherlock/sherlock.h"
-#include "lib/unaligned.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
-#include "lib/unicode.h"
+#include "ucw/unaligned.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
+#include "ucw/unicode.h"
#include "sherlock/object.h"
#include "sherlock/objread.h"
-#include "lib/lizard.h"
-#include "lib/bbuf.h"
-#include "lib/ff-unicode.h"
+#include "ucw/lizard.h"
+#include "ucw/bbuf.h"
+#include "ucw/ff-unicode.h"
#include <errno.h>
#include <unistd.h>
else
{
uns len;
- GET_UTF8_32(ptr, len);
+ ptr = utf8_32_get(ptr, &len);
if (!len--)
{
*pos = ptr;
while (ptr < end)
{
uns len;
- GET_UTF8_32(ptr, len);
+ ptr = utf8_32_get(ptr, &len);
if (!len--)
break;
byte type = ptr[len];
while (ptr < end)
{
uns len;
- GET_UTF8_32(ptr, len);
+ ptr = utf8_32_get(ptr, &len);
if (!len--)
break;
byte type = ptr[len];
obj_read_start(&st, o_hdr);
byte *b;
// ignore empty lines and read until the end of the bucket
- sh_off_t end = btell(body) + buck_len;
+ ucw_off_t end = btell(body) + buck_len;
while (btell(body) < end && bgets_bb(body, &buf->bb, ~0U))
if ((b = buf->bb.ptr)[0])
obj_read_attr(&st, b[0], b+1);
}
else if (buck_type == BUCKET_TYPE_V30)
{
- sh_off_t start = btell(body);
- sh_off_t end = start + buck_len;
+ ucw_off_t start = btell(body);
+ ucw_off_t end = start + buck_len;
byte *b;
struct obj_read_state st;
obj_read_start(&st, o_hdr);
/* Avoid reading the whole bucket if only its header is needed. */
if (body_start)
{
- sh_off_t start = btell(body);
- sh_off_t end = start + buck_len;
+ ucw_off_t start = btell(body);
+ ucw_off_t end = start + buck_len;
obj_read_start(&st, o_hdr);
while (btell(body) < end)
{