From: Robert Spalek Date: Fri, 20 Aug 2004 09:35:55 +0000 (+0000) Subject: - use put_utf8_32() X-Git-Tag: holmes-import~910 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=da0b7706cf3bafa01f552f80bf16f12f58c3d936;hp=542dedf4edb4302c008004d751a9bb055dfaee3d;p=libucw.git - use put_utf8_32() - attr_set_type() renamed to put_attr_set_type() --- diff --git a/lib/obj2buck.c b/lib/obj2buck.c index 6cd25896..96a29f73 100644 --- a/lib/obj2buck.c +++ b/lib/obj2buck.c @@ -20,7 +20,7 @@ static uns use_v33; static int hdr_sep; void -attr_set_type(uns type) +put_attr_set_type(uns type) { switch (type) { @@ -60,7 +60,7 @@ put_attr(byte *ptr, uns type, byte *val, uns len) { if (use_v33) { - PUT_UTF8(ptr, len+1); + PUT_UTF8_32(ptr, len+1); memcpy(ptr, val, len); ptr += len; *ptr++ = type; @@ -90,7 +90,7 @@ put_attr_vformat(byte *ptr, uns type, byte *mask, va_list va) if (len >= 127) { byte tmp[6], *tmp_end = tmp; - PUT_UTF8(tmp_end, len+1); + PUT_UTF8_32(tmp_end, len+1); uns l = tmp_end - tmp; memmove(ptr+l, ptr+1, len); memcpy(ptr, tmp, l); @@ -150,7 +150,7 @@ bput_attr(struct fastbuf *b, uns type, byte *val, uns len) { if (use_v33) { - bput_utf8(b, len+1); + bput_utf8_32(b, len+1); bwrite(b, val, len); bputc(b, type); } @@ -176,7 +176,7 @@ bput_attr_vformat(struct fastbuf *b, uns type, byte *mask, va_list va) int len = vsnprintf(NULL, 0, mask, va); if (len < 0) die("vsnprintf() does not support size=0"); - bput_utf8(b, len+1); + bput_utf8_32(b, len+1); vbprintf(b, mask, va); bputc(b, type); }