Commit f93ea16d4989b14d7ef825177984d82f026e8aaa
2023-04-19T20:16:51
minor changes
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130
diff --git a/libc3/buf.h b/libc3/buf.h
index d2088d6..c71019e 100644
--- a/libc3/buf.h
+++ b/libc3/buf.h
@@ -28,7 +28,6 @@
#define BUF_SIZE 10240
extern const sw buf_u8_to_hex_size;
-extern const sw buf_inspect_str_byte_size;
/* Stack constructors, call buf_clean after use. */
s_buf * buf_init (s_buf *buf, bool free, uw size, s8 *p);
diff --git a/libc3/buf_inspect.c b/libc3/buf_inspect.c
index 2a0264c..22e363c 100644
--- a/libc3/buf_inspect.c
+++ b/libc3/buf_inspect.c
@@ -176,13 +176,14 @@
DEF_BUF_INSPECT_U_BASE(bits, hexadecimal) \
DEF_BUF_INSPECT_U_BASE(bits, octal)
-sw buf_inspect_ident_reserved (s_buf *buf, const s_ident *x);
-sw buf_inspect_ident_reserved_size (const s_ident *x);
+sw buf_inspect_ident_reserved (s_buf *buf, const s_ident *ident);
+sw buf_inspect_ident_reserved_size (const s_ident *ident);
sw buf_inspect_str_byte (s_buf *buf, const u8 *byte);
-sw buf_inspect_str_reserved (s_buf *buf, const s_str *x);
-sw buf_inspect_str_reserved_size (const s_str *x);
-sw buf_inspect_sym_reserved (s_buf *buf, const s_sym *x);
-sw buf_inspect_sym_reserved_size (const s_sym *x);
+static const sw buf_inspect_str_byte_size = 4;
+sw buf_inspect_str_reserved (s_buf *buf, const s_str *str);
+sw buf_inspect_str_reserved_size (const s_str *str);
+sw buf_inspect_sym_reserved (s_buf *buf, const s_sym *sym);
+sw buf_inspect_sym_reserved_size (const s_sym *sym);
f_buf_inspect buf_inspect (e_tag_type type)
{
@@ -1029,22 +1030,22 @@ sw buf_inspect_str_byte (s_buf *buf, const u8 *byte)
sw result = 0;
s_buf_save save;
buf_save_init(buf, &save);
- if ((r = buf_write_u8(buf, '\\')) <= 0) {
- if (! r)
+ if ((r = buf_write_u8(buf, '\\')) != 1) {
+ if (r >= 0)
r = -1;
goto clean;
}
result += r;
- if ((r = buf_write_u8(buf, 'x')) <= 0)
+ if ((r = buf_write_u8(buf, 'x')) != 1)
goto restore;
result += r;
- if ((r = buf_u8_to_hex(buf, *byte)) <= 0)
+ if ((r = buf_u8_to_hex(buf, *byte)) != 2)
goto restore;
result += r;
r = result;
goto clean;
restore:
- if (! r)
+ if (r >= 0)
r = -1;
buf_save_restore_wpos(buf, &save);
clean:
@@ -1065,7 +1066,7 @@ sw buf_inspect_str_character (s_buf *buf, const character *c)
if (! str_character_is_reserved(*c))
return buf_write_character_utf8(buf, *c);
buf_save_init(buf, &save);
- if ((r = buf_write_u8(buf, '\\')) <= 0)
+ if ((r = buf_write_u8(buf, '\\')) != 1)
goto restore;
result += r;
switch (*c) {
@@ -1083,17 +1084,17 @@ sw buf_inspect_str_character (s_buf *buf, const character *c)
goto restore;
i = r - 1;
j = 0;
- if ((r = buf_write_u8(buf, 'x')) <= 0)
+ if ((r = buf_write_u8(buf, 'x')) != 1)
goto restore;
result1 += r;
- if ((r = buf_u8_to_hex(buf, char_buf.ptr.pu8[j++])) <= 0)
+ if ((r = buf_u8_to_hex(buf, char_buf.ptr.pu8[j++])) != 2)
goto restore;
result1 += r;
while (i--) {
- if ((r = buf_write_1(buf, "\\x")) <= 0)
+ if ((r = buf_write_1(buf, "\\x")) != 2)
goto restore;
result1 += r;
- if ((r = buf_u8_to_hex(buf, char_buf.ptr.pu8[j++])) <= 0)
+ if ((r = buf_u8_to_hex(buf, char_buf.ptr.pu8[j++])) != 2)
goto restore;
result1 += r;
}
@@ -1103,6 +1104,8 @@ sw buf_inspect_str_character (s_buf *buf, const character *c)
r = result;
goto clean;
restore:
+ if (r >= 0)
+ r = -1;
buf_save_restore_wpos(buf, &save);
clean:
buf_save_clean(buf, &save);
@@ -1198,8 +1201,11 @@ sw buf_inspect_str_reserved_size (const s_str *str)
if ((r = str_read_character_utf8(&s, &c)) < 0)
return r;
if (r) {
- if ((r = buf_inspect_str_character_size(&c)) <= 0)
- goto ko;
+ if ((r = buf_inspect_str_character_size(&c)) <= 0) {
+ if (! r)
+ r = -1;
+ return r;
+ }
result += r;
}
else if ((r = str_read_u8(&s, &byte)) < 0)
@@ -1209,10 +1215,6 @@ sw buf_inspect_str_reserved_size (const s_str *str)
}
result += sizeof('"');
return result;
- ko:
- if (! r)
- r = -1;
- return r;
}
sw buf_inspect_str_size (const s_str *str)