walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[util] Prefix trace lines with "trace:", and error lines with "error:"

This commit is contained in:
Behdad Esfahbod 2017-08-15 17:30:18 -07:00
parent 7ea10c35a3
commit a9e52a1af4
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/hb-shape.cc
View File

@ -97,7 +97,7 @@ struct output_buffer_t
void error (const char *message) void error (const char *message)
{ {
g_string_set_size (gs, 0); g_string_set_size (gs, 0);
format.serialize_message (line_no, message, gs); format.serialize_message (line_no, "error", message, gs);
fprintf (options.fp, "%s", gs->str); fprintf (options.fp, "%s", gs->str);
} }
void consume_glyphs (hb_buffer_t *buffer, void consume_glyphs (hb_buffer_t *buffer,
@ -126,18 +126,18 @@ struct output_buffer_t
void *user_data) void *user_data)
{ {
output_buffer_t *that = (output_buffer_t *) user_data; output_buffer_t *that = (output_buffer_t *) user_data;
that->message (buffer, font, message); that->trace (buffer, font, message);
return true; return true;
} }
void void
message (hb_buffer_t *buffer, trace (hb_buffer_t *buffer,
hb_font_t *font, hb_font_t *font,
const char *message) const char *message)
{ {
g_string_set_size (gs, 0); g_string_set_size (gs, 0);
format.serialize_line_no (line_no, gs); format.serialize_line_no (line_no, gs);
g_string_append_printf (gs, "HB: %s buffer: ", message); g_string_append_printf (gs, "trace: %s buffer: ", message);
format.serialize_glyphs (buffer, font, output_format, format_flags, gs); format.serialize_glyphs (buffer, font, output_format, format_flags, gs);
g_string_append_c (gs, '\n'); g_string_append_c (gs, '\n');
fprintf (options.fp, "%s", gs->str); fprintf (options.fp, "%s", gs->str);

4
util/options.cc
View File

@ -871,12 +871,12 @@ format_options_t::serialize_buffer_of_text (hb_buffer_t *buffer,
} }
void void
format_options_t::serialize_message (unsigned int line_no, format_options_t::serialize_message (unsigned int line_no,
const char *type,
const char *msg, const char *msg,
GString *gs) GString *gs)
{ {
serialize_line_no (line_no, gs); serialize_line_no (line_no, gs);
g_string_append_printf (gs, "message: "); g_string_append_printf (gs, "%s: %s", type, msg);
g_string_append_printf (gs, "%s", msg);
g_string_append_c (gs, '\n'); g_string_append_c (gs, '\n');
} }
void void

1
util/options.hh
View File

@ -640,6 +640,7 @@ struct format_options_t : option_group_t
hb_font_t *font, hb_font_t *font,
GString *gs); GString *gs);
void serialize_message (unsigned int line_no, void serialize_message (unsigned int line_no,
const char *type,
const char *msg, const char *msg,
GString *gs); GString *gs);
void serialize_buffer_of_glyphs (hb_buffer_t *buffer, void serialize_buffer_of_glyphs (hb_buffer_t *buffer,