pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-10 19:53:13 +02:00
Code Activity

core: add prefix in addition of message in output of /debug buffer

Browse Source
This commit is contained in:
Sebastien Helleu
2011-04-07 14:56:29 +02:00
parent 6929486649
commit 176454afa1
3 changed files with 60 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-log.c
+34
View File
@@ -169,6 +169,40 @@ log_printf (const char *message, ...)
fflush (weechat_log_file);
}
/*
* log_printf_hexa: dump a string as hexa data in log file
*/
void
log_printf_hexa (const char *spaces, const char *string)
{
int msg_pos, hexa_pos, ascii_pos;
char hexa[(16 * 3) + 1], ascii[(16 * 2) + 1];
msg_pos = 0;
hexa_pos = 0;
ascii_pos = 0;
while (string[msg_pos])
{
snprintf (hexa + hexa_pos, 4, "%02X ", (unsigned char)(string[msg_pos]));
hexa_pos += 3;
snprintf (ascii + ascii_pos, 3, "%c ",
((((unsigned char)string[msg_pos]) < 32)
|| (((unsigned char)string[msg_pos]) > 127)) ?
'.' : (unsigned char)(string[msg_pos]));
ascii_pos += 2;
if (ascii_pos == 32)
{
log_printf ("%s%-48s %s", spaces, hexa, ascii);
hexa_pos = 0;
ascii_pos = 0;
}
msg_pos++;
}
if (ascii_pos > 0)
log_printf ("%s%-48s %s", spaces, hexa, ascii);
}
/*
* log_close: close log file
*/
src/core/wee-log.h
+1
View File
@@ -27,6 +27,7 @@ extern int weechat_log_use_time;
extern void log_init ();
extern void log_close ();
extern void log_printf (const char *message, ...);
extern void log_printf_hexa (const char *spaces, const char *string);
extern int log_crash_rename ();
#endif /* __WEECHAT_LOG_H */
src/gui/gui-buffer.c
+25 -30
View File
@@ -3001,10 +3001,8 @@ void
gui_buffer_dump_hexa (struct t_gui_buffer *buffer)
{
struct t_gui_line *ptr_line;
int num_line, msg_pos;
char *message_without_colors, *tags;
char hexa[(16 * 3) + 1], ascii[(16 * 2) + 1];
int hexa_pos, ascii_pos;
int num_line;
char *prefix_without_colors, *message_without_colors, *tags;
log_printf ("[buffer dump hexa (addr:0x%lx)]", buffer);
num_line = 1;
@@ -3012,13 +3010,17 @@ gui_buffer_dump_hexa (struct t_gui_buffer *buffer)
ptr_line = ptr_line->next_line)
{
/* display line without colors */
prefix_without_colors = (ptr_line->data->prefix) ?
gui_color_decode (ptr_line->data->prefix, NULL) : NULL;
message_without_colors = (ptr_line->data->message) ?
gui_color_decode (ptr_line->data->message, NULL) : NULL;
log_printf ("");
log_printf (" line %d: %s",
log_printf (" line %d: %s | %s",
num_line,
(message_without_colors) ?
message_without_colors : "(null)");
(prefix_without_colors) ? prefix_without_colors : "(null)",
(message_without_colors) ? message_without_colors : "(null)");
if (prefix_without_colors)
free (prefix_without_colors);
if (message_without_colors)
free (message_without_colors);
tags = string_build_with_split_string ((const char **)ptr_line->data->tags_array,
@@ -3031,31 +3033,24 @@ gui_buffer_dump_hexa (struct t_gui_buffer *buffer)
if (ptr_line->data->message)
{
log_printf ("");
log_printf (" raw data for line %d (with color codes):",
num_line);
msg_pos = 0;
hexa_pos = 0;
ascii_pos = 0;
while (ptr_line->data->message[msg_pos])
if (ptr_line->data->prefix && ptr_line->data->prefix[0])
{
snprintf (hexa + hexa_pos, 4, "%02X ",
(unsigned char)(ptr_line->data->message[msg_pos]));
hexa_pos += 3;
snprintf (ascii + ascii_pos, 3, "%c ",
((((unsigned char)ptr_line->data->message[msg_pos]) < 32)
|| (((unsigned char)ptr_line->data->message[msg_pos]) > 127)) ?
'.' : (unsigned char)(ptr_line->data->message[msg_pos]));
ascii_pos += 2;
if (ascii_pos == 32)
{
log_printf (" %-48s %s", hexa, ascii);
hexa_pos = 0;
ascii_pos = 0;
}
msg_pos++;
log_printf (" raw prefix for line %d:", num_line);
log_printf_hexa (" ", ptr_line->data->prefix);
}
else
{
log_printf (" no prefix for line %d", num_line);
}
if (ptr_line->data->message && ptr_line->data->message[0])
{
log_printf (" raw message for line %d:", num_line);
log_printf_hexa (" ", ptr_line->data->message);
}
else
{
log_printf (" no message for line %d", num_line);
}
if (ascii_pos > 0)
log_printf (" %-48s %s", hexa, ascii);
}
num_line++;