diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/wee-backtrace.c | 2 | ||||
-rw-r--r-- | src/core/wee-config-file.c | 4 | ||||
-rw-r--r-- | src/core/wee-config.c | 2 | ||||
-rw-r--r-- | src/core/wee-hook.c | 58 | ||||
-rw-r--r-- | src/core/wee-list.c | 8 | ||||
-rw-r--r-- | src/core/wee-log.c | 28 | ||||
-rw-r--r-- | src/core/wee-log.h | 8 | ||||
-rw-r--r-- | src/core/weechat.c | 28 | ||||
-rw-r--r-- | src/gui/curses/gui-curses-window.c | 14 | ||||
-rw-r--r-- | src/gui/gtk/gui-gtk-window.c | 10 | ||||
-rw-r--r-- | src/gui/gui-buffer.c | 132 | ||||
-rw-r--r-- | src/gui/gui-chat.c | 2 | ||||
-rw-r--r-- | src/gui/gui-completion.c | 38 | ||||
-rw-r--r-- | src/gui/gui-hotlist.c | 22 | ||||
-rw-r--r-- | src/gui/gui-infobar.c | 2 | ||||
-rw-r--r-- | src/gui/gui-keyboard.c | 10 | ||||
-rw-r--r-- | src/gui/gui-window.c | 96 | ||||
-rw-r--r-- | src/plugins/plugin-config.c | 2 | ||||
-rw-r--r-- | src/plugins/plugin-list.c | 44 | ||||
-rw-r--r-- | src/plugins/plugin.c | 20 |
20 files changed, 265 insertions, 265 deletions
diff --git a/src/core/wee-backtrace.c b/src/core/wee-backtrace.c index 49ec1ec02..e9ea49c5b 100644 --- a/src/core/wee-backtrace.c +++ b/src/core/wee-backtrace.c @@ -59,7 +59,7 @@ weechat_backtrace_printf (char *message, ...) va_end (argptr); string_iconv_fprintf (stderr, "%s", buffer); - weechat_log_printf ("%s", buffer); + log_printf ("%s", buffer); } /* diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c index 1542878df..5a0cc431e 100644 --- a/src/core/wee-config-file.c +++ b/src/core/wee-config-file.c @@ -455,8 +455,8 @@ config_file_write_default (char **config_sections, struct t_config_option **opti _("%s: creating default config file \"%s\"...\n"), PACKAGE_NAME, config_filename); - weechat_log_printf (_("Creating default config file \"%s\"\n"), - config_filename); + log_printf (_("Creating default config file \"%s\"\n"), + config_filename); config_file_write_header (file); diff --git a/src/core/wee-config.c b/src/core/wee-config.c index b53779555..fe1a7fa84 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -1228,7 +1228,7 @@ weechat_config_write_keys_default_values (FILE *file, char *section_name, int weechat_config_write () { - weechat_log_printf (_("Saving WeeChat configuration to disk\n")); + log_printf (_("Saving WeeChat configuration to disk\n")); return config_file_write (weechat_config_sections, weechat_config_options, weechat_config_write_functions, WEECHAT_CONFIG_NAME); diff --git a/src/core/wee-hook.c b/src/core/wee-hook.c index e8452b6dc..fa1cf7ad1 100644 --- a/src/core/wee-hook.c +++ b/src/core/wee-hook.c @@ -752,49 +752,49 @@ hook_print_log () for (ptr_hook = weechat_hooks; ptr_hook; ptr_hook = ptr_hook->next_hook) { - weechat_log_printf ("\n"); - weechat_log_printf ("[hook (addr:0x%X)]\n", ptr_hook); - weechat_log_printf (" type . . . . . . . . . : %d\n", ptr_hook->type); - weechat_log_printf (" callback_data. . . . . : 0x%X\n", ptr_hook->callback_data); + log_printf ("\n"); + log_printf ("[hook (addr:0x%X)]\n", ptr_hook); + log_printf (" type . . . . . . . . . : %d\n", ptr_hook->type); + log_printf (" callback_data. . . . . : 0x%X\n", ptr_hook->callback_data); switch (ptr_hook->type) { case HOOK_TYPE_COMMAND: - weechat_log_printf (" command data:\n"); - weechat_log_printf (" callback . . . . . . : 0x%X\n", HOOK_COMMAND(ptr_hook, callback)); - weechat_log_printf (" command. . . . . . . : '%s'\n", HOOK_COMMAND(ptr_hook, command)); - weechat_log_printf (" command_desc . . . . : '%s'\n", HOOK_COMMAND(ptr_hook, description)); - weechat_log_printf (" command_args . . . . : '%s'\n", HOOK_COMMAND(ptr_hook, args)); - weechat_log_printf (" command_args_desc. . : '%s'\n", HOOK_COMMAND(ptr_hook, args_description)); - weechat_log_printf (" command_completion . : '%s'\n", HOOK_COMMAND(ptr_hook, completion)); + log_printf (" command data:\n"); + log_printf (" callback . . . . . . : 0x%X\n", HOOK_COMMAND(ptr_hook, callback)); + log_printf (" command. . . . . . . : '%s'\n", HOOK_COMMAND(ptr_hook, command)); + log_printf (" command_desc . . . . : '%s'\n", HOOK_COMMAND(ptr_hook, description)); + log_printf (" command_args . . . . : '%s'\n", HOOK_COMMAND(ptr_hook, args)); + log_printf (" command_args_desc. . : '%s'\n", HOOK_COMMAND(ptr_hook, args_description)); + log_printf (" command_completion . : '%s'\n", HOOK_COMMAND(ptr_hook, completion)); break; case HOOK_TYPE_TIMER: - weechat_log_printf (" timer data:\n"); - weechat_log_printf (" interval . . . . . . : %ld\n", HOOK_TIMER(ptr_hook, interval)); - weechat_log_printf (" last_exec.tv_sec . . : %ld\n", HOOK_TIMER(ptr_hook, last_exec.tv_sec)); - weechat_log_printf (" last_exec.tv_usec. . : %ld\n", HOOK_TIMER(ptr_hook, last_exec.tv_usec)); + log_printf (" timer data:\n"); + log_printf (" interval . . . . . . : %ld\n", HOOK_TIMER(ptr_hook, interval)); + log_printf (" last_exec.tv_sec . . : %ld\n", HOOK_TIMER(ptr_hook, last_exec.tv_sec)); + log_printf (" last_exec.tv_usec. . : %ld\n", HOOK_TIMER(ptr_hook, last_exec.tv_usec)); break; case HOOK_TYPE_FD: - weechat_log_printf (" fd data:\n"); - weechat_log_printf (" fd . . . . . . . . . : %ld\n", HOOK_FD(ptr_hook, fd)); - weechat_log_printf (" flags. . . . . . . . : %ld\n", HOOK_FD(ptr_hook, flags)); + log_printf (" fd data:\n"); + log_printf (" fd . . . . . . . . . : %ld\n", HOOK_FD(ptr_hook, fd)); + log_printf (" flags. . . . . . . . : %ld\n", HOOK_FD(ptr_hook, flags)); break; case HOOK_TYPE_PRINT: - weechat_log_printf (" print data:\n"); - weechat_log_printf (" buffer . . . . . . . : 0x%X\n", HOOK_PRINT(ptr_hook, buffer)); - weechat_log_printf (" message. . . . . . . : '%s'\n", HOOK_PRINT(ptr_hook, message)); + log_printf (" print data:\n"); + log_printf (" buffer . . . . . . . : 0x%X\n", HOOK_PRINT(ptr_hook, buffer)); + log_printf (" message. . . . . . . : '%s'\n", HOOK_PRINT(ptr_hook, message)); break; case HOOK_TYPE_EVENT: - weechat_log_printf (" event data:\n"); - weechat_log_printf (" event. . . . . . . . : '%s'\n", HOOK_EVENT(ptr_hook, event)); + log_printf (" event data:\n"); + log_printf (" event. . . . . . . . : '%s'\n", HOOK_EVENT(ptr_hook, event)); break; case HOOK_TYPE_CONFIG: - weechat_log_printf (" config data:\n"); - weechat_log_printf (" type . . . . . . . . : '%s'\n", HOOK_CONFIG(ptr_hook, type)); - weechat_log_printf (" option . . . . . . . : '%s'\n", HOOK_CONFIG(ptr_hook, option)); + log_printf (" config data:\n"); + log_printf (" type . . . . . . . . : '%s'\n", HOOK_CONFIG(ptr_hook, type)); + log_printf (" option . . . . . . . : '%s'\n", HOOK_CONFIG(ptr_hook, option)); break; } - weechat_log_printf (" running. . . . . . . . : %d\n", ptr_hook->running); - weechat_log_printf (" prev_hook. . . . . . . : 0x%X\n", ptr_hook->prev_hook); - weechat_log_printf (" next_hook. . . . . . . : 0x%X\n", ptr_hook->next_hook); + log_printf (" running. . . . . . . . : %d\n", ptr_hook->running); + log_printf (" prev_hook. . . . . . . : 0x%X\n", ptr_hook->prev_hook); + log_printf (" next_hook. . . . . . . : 0x%X\n", ptr_hook->next_hook); } } diff --git a/src/core/wee-list.c b/src/core/wee-list.c index 4de434329..8511d69d0 100644 --- a/src/core/wee-list.c +++ b/src/core/wee-list.c @@ -237,9 +237,9 @@ weelist_print_log (struct t_weelist *weelist, char *name) for (ptr_weelist = weelist; ptr_weelist; ptr_weelist = ptr_weelist->next_weelist) { - weechat_log_printf ("[%s (addr:0x%X)]\n", name, ptr_weelist); - weechat_log_printf (" data . . . . . . . . . : '%s'\n", ptr_weelist->data); - weechat_log_printf (" prev_weelist . . . . . : 0x%X\n", ptr_weelist->prev_weelist); - weechat_log_printf (" next_weelist . . . . . : 0x%X\n", ptr_weelist->next_weelist); + log_printf ("[%s (addr:0x%X)]\n", name, ptr_weelist); + log_printf (" data . . . . . . . . . : '%s'\n", ptr_weelist->data); + log_printf (" prev_weelist . . . . . : 0x%X\n", ptr_weelist->prev_weelist); + log_printf (" next_weelist . . . . . : 0x%X\n", ptr_weelist->next_weelist); } } diff --git a/src/core/wee-log.c b/src/core/wee-log.c index 0e2619c41..1363c6d4a 100644 --- a/src/core/wee-log.c +++ b/src/core/wee-log.c @@ -46,11 +46,11 @@ FILE *weechat_log_file = NULL; /* WeeChat log file */ /* - * weechat_log_open: initialize log file + * log_open: initialize log file */ int -weechat_log_open (char *filename, char *mode) +log_open (char *filename, char *mode) { int filename_length; @@ -95,13 +95,13 @@ weechat_log_open (char *filename, char *mode) } /* - * weechat_log_init: initialize log file + * log_init: initialize log file */ void -weechat_log_init () +log_init () { - if (!weechat_log_open (NULL, "w")) + if (!log_open (NULL, "w")) { string_iconv_fprintf (stderr, _("Error: unable to create/append to log file (weechat.log)\n" @@ -112,11 +112,11 @@ weechat_log_init () } /* - * weechat_log_printf: write a message in WeeChat log (<weechat_home>/weechat.log) + * log_printf: write a message in WeeChat log (<weechat_home>/weechat.log) */ void -weechat_log_printf (char *message, ...) +log_printf (char *message, ...) { static char buffer[4096]; char *ptr_buffer; @@ -156,11 +156,11 @@ weechat_log_printf (char *message, ...) } /* - * weechat_log_close: close log file + * log_close: close log file */ void -weechat_log_close () +log_close () { /* close log file */ if (weechat_log_file) @@ -181,11 +181,11 @@ weechat_log_close () } /* - * weechat_log_crash_rename: rename log file when crashing + * log_crash_rename: rename log file when crashing */ int -weechat_log_crash_rename () +log_crash_rename () { char *old_name, *new_name; int length; @@ -199,7 +199,7 @@ weechat_log_crash_rename () if (!old_name) return 0; - weechat_log_close (); + log_close (); length = strlen (weechat_home) + 128; new_name = (char *) malloc (length); @@ -218,7 +218,7 @@ weechat_log_crash_rename () { string_iconv_fprintf (stderr, "*** Full crash dump was saved to %s file.\n", new_name); - weechat_log_open (new_name, "a"); + log_open (new_name, "a"); free (old_name); free (new_name); return 1; @@ -227,6 +227,6 @@ weechat_log_crash_rename () } free (old_name); - weechat_log_open (NULL, "a"); + log_open (NULL, "a"); return 0; } diff --git a/src/core/wee-log.h b/src/core/wee-log.h index 1375b795b..e41e673ff 100644 --- a/src/core/wee-log.h +++ b/src/core/wee-log.h @@ -23,9 +23,9 @@ extern char *weechat_log_filename; extern FILE *weechat_log_file; -extern void weechat_log_init (); -extern void weechat_log_close (); -extern void weechat_log_printf (char *, ...); -extern int weechat_log_crash_rename (); +extern void log_init (); +extern void log_close (); +extern void log_printf (char *, ...); +extern int log_crash_rename (); #endif /* wee-log.h */ diff --git a/src/core/weechat.c b/src/core/weechat.c index 60ccb3023..e516e53b5 100644 --- a/src/core/weechat.c +++ b/src/core/weechat.c @@ -464,8 +464,8 @@ weechat_welcome_message () "%s-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-", GUI_COLOR(GUI_COLOR_CHAT_NICK)); - weechat_log_printf ("%s (%s %s %s)\n", - PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__); + log_printf ("%s (%s %s %s)\n", + PACKAGE_STRING, _("compiled on"), __DATE__, __TIME__); } /* @@ -479,7 +479,7 @@ weechat_shutdown (int return_code, int crash) free (weechat_argv0); if (weechat_home) free (weechat_home); - weechat_log_close (); + log_close (); if (local_charset) free (local_charset); alias_free_all (); @@ -504,19 +504,19 @@ weechat_dump (int crash) if (crash) { sigsegv = 1; - weechat_log_printf ("Very bad, WeeChat is crashing (SIGSEGV received)...\n"); + log_printf ("Very bad, WeeChat is crashing (SIGSEGV received)...\n"); } - weechat_log_printf ("\n"); + log_printf ("\n"); if (crash) { - weechat_log_printf ("****** WeeChat CRASH DUMP ******\n"); - weechat_log_printf ("****** Please send this file to WeeChat developers ******\n"); - weechat_log_printf ("****** and explain when this crash happened ******\n"); + log_printf ("****** WeeChat CRASH DUMP ******\n"); + log_printf ("****** Please send this file to WeeChat developers ******\n"); + log_printf ("****** and explain when this crash happened ******\n"); } else { - weechat_log_printf ("****** WeeChat dump request ******\n"); + log_printf ("****** WeeChat dump request ******\n"); } gui_window_print_log (); @@ -527,9 +527,9 @@ weechat_dump (int crash) plugin_print_log (); - weechat_log_printf ("\n"); - weechat_log_printf ("****** End of dump ******\n"); - weechat_log_printf ("\n"); + log_printf ("\n"); + log_printf ("****** End of dump ******\n"); + log_printf ("\n"); } /* @@ -545,7 +545,7 @@ weechat_sigsegv () string_iconv_fprintf (stderr, "\n"); string_iconv_fprintf (stderr, "*** Very bad! WeeChat is crashing (SIGSEGV received)\n"); - if (!weechat_log_crash_rename ()) + if (!log_crash_rename ()) string_iconv_fprintf (stderr, "*** Full crash dump was saved to %s/weechat.log file.\n", weechat_home); @@ -594,7 +594,7 @@ main (int argc, char *argv[]) gui_keyboard_init (); /* init keyb. (default key bindings)*/ weechat_parse_args (argc, argv); /* parse command line args */ weechat_create_home_dirs (); /* create WeeChat directories */ - weechat_log_init (); /* init log file */ + log_init (); /* init log file */ if (weechat_config_read () < 0) /* read WeeChat configuration */ exit (EXIT_FAILURE); command_index_build (); /* build cmd index for completion */ diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c index 2658a53a3..a2619a652 100644 --- a/src/gui/curses/gui-curses-window.c +++ b/src/gui/curses/gui-curses-window.c @@ -1407,11 +1407,11 @@ gui_window_title_reset () void gui_window_objects_print_log (struct t_gui_window *window) { - weechat_log_printf (" win_title . . . . . : 0x%X\n", GUI_CURSES(window)->win_title); - weechat_log_printf (" win_chat. . . . . . : 0x%X\n", GUI_CURSES(window)->win_chat); - weechat_log_printf (" win_nick. . . . . . : 0x%X\n", GUI_CURSES(window)->win_nick); - weechat_log_printf (" win_status. . . . . : 0x%X\n", GUI_CURSES(window)->win_status); - weechat_log_printf (" win_infobar . . . . : 0x%X\n", GUI_CURSES(window)->win_infobar); - weechat_log_printf (" win_input . . . . . : 0x%X\n", GUI_CURSES(window)->win_input); - weechat_log_printf (" win_separator . . . : 0x%X\n", GUI_CURSES(window)->win_separator); + log_printf (" win_title . . . . . : 0x%X\n", GUI_CURSES(window)->win_title); + log_printf (" win_chat. . . . . . : 0x%X\n", GUI_CURSES(window)->win_chat); + log_printf (" win_nick. . . . . . : 0x%X\n", GUI_CURSES(window)->win_nick); + log_printf (" win_status. . . . . : 0x%X\n", GUI_CURSES(window)->win_status); + log_printf (" win_infobar . . . . : 0x%X\n", GUI_CURSES(window)->win_infobar); + log_printf (" win_input . . . . . : 0x%X\n", GUI_CURSES(window)->win_input); + log_printf (" win_separator . . . : 0x%X\n", GUI_CURSES(window)->win_separator); } diff --git a/src/gui/gtk/gui-gtk-window.c b/src/gui/gtk/gui-gtk-window.c index 4af1d2c5a..e6f00e873 100644 --- a/src/gui/gtk/gui-gtk-window.c +++ b/src/gui/gtk/gui-gtk-window.c @@ -916,9 +916,9 @@ gui_window_title_reset () void gui_window_objects_print_log (struct t_gui_window *window) { - weechat_log_printf (" textview_chat . . . : 0x%X\n", GUI_GTK(window)->textview_chat); - weechat_log_printf (" textbuffer_chat . . : 0x%X\n", GUI_GTK(window)->textbuffer_chat); - weechat_log_printf (" texttag_chat. . . . : 0x%X\n", GUI_GTK(window)->texttag_chat); - weechat_log_printf (" textview_nicklist . : 0x%X\n", GUI_GTK(window)->textview_nicklist); - weechat_log_printf (" textbuffer_nicklist : 0x%X\n", GUI_GTK(window)->textbuffer_nicklist); + log_printf (" textview_chat . . . : 0x%X\n", GUI_GTK(window)->textview_chat); + log_printf (" textbuffer_chat . . : 0x%X\n", GUI_GTK(window)->textbuffer_chat); + log_printf (" texttag_chat. . . . : 0x%X\n", GUI_GTK(window)->texttag_chat); + log_printf (" textview_nicklist . : 0x%X\n", GUI_GTK(window)->textview_nicklist); + log_printf (" textbuffer_nicklist : 0x%X\n", GUI_GTK(window)->textbuffer_nicklist); } diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c index e477541c7..91bd41522 100644 --- a/src/gui/gui-buffer.c +++ b/src/gui/gui-buffer.c @@ -880,27 +880,27 @@ gui_buffer_dump_hexa (struct t_gui_buffer *buffer) char hexa[(16 * 3) + 1], ascii[(16 * 2) + 1]; int hexa_pos, ascii_pos; - weechat_log_printf ("[buffer dump hexa (addr:0x%X)]\n", buffer); + log_printf ("[buffer dump hexa (addr:0x%X)]\n", buffer); num_line = 1; for (ptr_line = buffer->lines; ptr_line; ptr_line = ptr_line->next_line) { /* display line without colors */ message_without_colors = (ptr_line->message) ? (char *)gui_color_decode ((unsigned char *)ptr_line->message) : NULL; - weechat_log_printf ("\n"); - weechat_log_printf (" line %d: %s\n", - num_line, - (message_without_colors) ? - message_without_colors : "(null)"); + log_printf ("\n"); + log_printf (" line %d: %s\n", + num_line, + (message_without_colors) ? + message_without_colors : "(null)"); if (message_without_colors) free (message_without_colors); /* display raw message for line */ if (ptr_line->message) { - weechat_log_printf ("\n"); - weechat_log_printf (" raw data for line %d (with color codes):\n", - num_line); + log_printf ("\n"); + log_printf (" raw data for line %d (with color codes):\n", + num_line); msg_pos = 0; hexa_pos = 0; ascii_pos = 0; @@ -916,14 +916,14 @@ gui_buffer_dump_hexa (struct t_gui_buffer *buffer) ascii_pos += 2; if (ascii_pos == 32) { - weechat_log_printf (" %-48s %s\n", hexa, ascii); + log_printf (" %-48s %s\n", hexa, ascii); hexa_pos = 0; ascii_pos = 0; } msg_pos++; } if (ascii_pos > 0) - weechat_log_printf (" %-48s %s\n", hexa, ascii); + log_printf (" %-48s %s\n", hexa, ascii); } num_line++; @@ -945,64 +945,64 @@ gui_buffer_print_log () for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) { - weechat_log_printf ("\n"); - weechat_log_printf ("[buffer (addr:0x%X)]\n", ptr_buffer); - weechat_log_printf (" plugin . . . . . . . . : 0x%X\n", ptr_buffer->plugin); - weechat_log_printf (" number . . . . . . . . : %d\n", ptr_buffer->number); - weechat_log_printf (" category . . . . . . . : '%s'\n", ptr_buffer->category); - weechat_log_printf (" name . . . . . . . . . : '%s'\n", ptr_buffer->name); - weechat_log_printf (" type . . . . . . . . . : %d\n", ptr_buffer->type); - weechat_log_printf (" notify_level . . . . . : %d\n", ptr_buffer->notify_level); - weechat_log_printf (" num_displayed. . . . . : %d\n", ptr_buffer->num_displayed); - weechat_log_printf (" title. . . . . . . . . : '%s'\n", ptr_buffer->title); - weechat_log_printf (" lines. . . . . . . . . : 0x%X\n", ptr_buffer->lines); - weechat_log_printf (" last_line. . . . . . . : 0x%X\n", ptr_buffer->last_line); - weechat_log_printf (" last_read_line . . . . : 0x%X\n", ptr_buffer->last_read_line); - weechat_log_printf (" lines_count. . . . . . : %d\n", ptr_buffer->lines_count); - weechat_log_printf (" prefix_max_length. . . : %d\n", ptr_buffer->prefix_max_length); - weechat_log_printf (" chat_refresh_needed. . : %d\n", ptr_buffer->chat_refresh_needed); - weechat_log_printf (" nicklist . . . . . . . : %d\n", ptr_buffer->nicklist); - weechat_log_printf (" nick_case_sensitive. . : %d\n", ptr_buffer->nick_case_sensitive); - weechat_log_printf (" nicks. . . . . . . . . : 0x%X\n", ptr_buffer->nicks); - weechat_log_printf (" last_nick. . . . . . . : 0x%X\n", ptr_buffer->last_nick); - weechat_log_printf (" nicks_count. . . . . . : %d\n", ptr_buffer->nicks_count); - weechat_log_printf (" input. . . . . . . . . : %d\n", ptr_buffer->input); - weechat_log_printf (" input_data_cb. . . . . : 0x%X\n", ptr_buffer->input_data_cb); - weechat_log_printf (" input_nick . . . . . . : '%s'\n", ptr_buffer->input_nick); - weechat_log_printf (" input_buffer . . . . . : '%s'\n", ptr_buffer->input_buffer); - weechat_log_printf (" input_buffer_color_mask: '%s'\n", ptr_buffer->input_buffer_color_mask); - weechat_log_printf (" input_buffer_alloc . . : %d\n", ptr_buffer->input_buffer_alloc); - weechat_log_printf (" input_buffer_size. . . : %d\n", ptr_buffer->input_buffer_size); - weechat_log_printf (" input_buffer_length. . : %d\n", ptr_buffer->input_buffer_length); - weechat_log_printf (" input_buffer_pos . . . : %d\n", ptr_buffer->input_buffer_pos); - weechat_log_printf (" input_buffer_1st_disp. : %d\n", ptr_buffer->input_buffer_1st_display); - weechat_log_printf (" completion . . . . . . : 0x%X\n", ptr_buffer->completion); - weechat_log_printf (" history. . . . . . . . : 0x%X\n", ptr_buffer->history); - weechat_log_printf (" last_history . . . . . : 0x%X\n", ptr_buffer->last_history); - weechat_log_printf (" ptr_history. . . . . . : 0x%X\n", ptr_buffer->ptr_history); - weechat_log_printf (" num_history. . . . . . : %d\n", ptr_buffer->num_history); - weechat_log_printf (" text_search. . . . . . : %d\n", ptr_buffer->text_search); - weechat_log_printf (" text_search_exact. . . : %d\n", ptr_buffer->text_search_exact); - weechat_log_printf (" text_search_found. . . : %d\n", ptr_buffer->text_search_found); - weechat_log_printf (" text_search_input. . . : '%s'\n", ptr_buffer->text_search_input); - weechat_log_printf (" prev_buffer. . . . . . : 0x%X\n", ptr_buffer->prev_buffer); - weechat_log_printf (" next_buffer. . . . . . : 0x%X\n", ptr_buffer->next_buffer); + log_printf ("\n"); + log_printf ("[buffer (addr:0x%X)]\n", ptr_buffer); + log_printf (" plugin . . . . . . . . : 0x%X\n", ptr_buffer->plugin); + log_printf (" number . . . . . . . . : %d\n", ptr_buffer->number); + log_printf (" category . . . . . . . : '%s'\n", ptr_buffer->category); + log_printf (" name . . . . . . . . . : '%s'\n", ptr_buffer->name); + log_printf (" type . . . . . . . . . : %d\n", ptr_buffer->type); + log_printf (" notify_level . . . . . : %d\n", ptr_buffer->notify_level); + log_printf (" num_displayed. . . . . : %d\n", ptr_buffer->num_displayed); + log_printf (" title. . . . . . . . . : '%s'\n", ptr_buffer->title); + log_printf (" lines. . . . . . . . . : 0x%X\n", ptr_buffer->lines); + log_printf (" last_line. . . . . . . : 0x%X\n", ptr_buffer->last_line); + log_printf (" last_read_line . . . . : 0x%X\n", ptr_buffer->last_read_line); + log_printf (" lines_count. . . . . . : %d\n", ptr_buffer->lines_count); + log_printf (" prefix_max_length. . . : %d\n", ptr_buffer->prefix_max_length); + log_printf (" chat_refresh_needed. . : %d\n", ptr_buffer->chat_refresh_needed); + log_printf (" nicklist . . . . . . . : %d\n", ptr_buffer->nicklist); + log_printf (" nick_case_sensitive. . : %d\n", ptr_buffer->nick_case_sensitive); + log_printf (" nicks. . . . . . . . . : 0x%X\n", ptr_buffer->nicks); + log_printf (" last_nick. . . . . . . : 0x%X\n", ptr_buffer->last_nick); + log_printf (" nicks_count. . . . . . : %d\n", ptr_buffer->nicks_count); + log_printf (" input. . . . . . . . . : %d\n", ptr_buffer->input); + log_printf (" input_data_cb. . . . . : 0x%X\n", ptr_buffer->input_data_cb); + log_printf (" input_nick . . . . . . : '%s'\n", ptr_buffer->input_nick); + log_printf (" input_buffer . . . . . : '%s'\n", ptr_buffer->input_buffer); + log_printf (" input_buffer_color_mask: '%s'\n", ptr_buffer->input_buffer_color_mask); + log_printf (" input_buffer_alloc . . : %d\n", ptr_buffer->input_buffer_alloc); + log_printf (" input_buffer_size. . . : %d\n", ptr_buffer->input_buffer_size); + log_printf (" input_buffer_length. . : %d\n", ptr_buffer->input_buffer_length); + log_printf (" input_buffer_pos . . . : %d\n", ptr_buffer->input_buffer_pos); + log_printf (" input_buffer_1st_disp. : %d\n", ptr_buffer->input_buffer_1st_display); + log_printf (" completion . . . . . . : 0x%X\n", ptr_buffer->completion); + log_printf (" history. . . . . . . . : 0x%X\n", ptr_buffer->history); + log_printf (" last_history . . . . . : 0x%X\n", ptr_buffer->last_history); + log_printf (" ptr_history. . . . . . : 0x%X\n", ptr_buffer->ptr_history); + log_printf (" num_history. . . . . . : %d\n", ptr_buffer->num_history); + log_printf (" text_search. . . . . . : %d\n", ptr_buffer->text_search); + log_printf (" text_search_exact. . . : %d\n", ptr_buffer->text_search_exact); + log_printf (" text_search_found. . . : %d\n", ptr_buffer->text_search_found); + log_printf (" text_search_input. . . : '%s'\n", ptr_buffer->text_search_input); + log_printf (" prev_buffer. . . . . . : 0x%X\n", ptr_buffer->prev_buffer); + log_printf (" next_buffer. . . . . . : 0x%X\n", ptr_buffer->next_buffer); for (ptr_nick = ptr_buffer->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick) { - weechat_log_printf ("\n"); - weechat_log_printf (" => nick %s (addr:0x%X):\n", ptr_nick->nick, ptr_nick); - weechat_log_printf (" sort_index. . . . . . : %d\n", ptr_nick->sort_index); - weechat_log_printf (" color_nick. . . . . . : %d\n", ptr_nick->color_nick); - weechat_log_printf (" prefix. . . . . . . . : '%c'\n", ptr_nick->prefix); - weechat_log_printf (" color_prefix. . . . . : %d\n", ptr_nick->color_prefix); - weechat_log_printf (" prev_nick . . . . . . : 0x%X\n", ptr_nick->prev_nick); - weechat_log_printf (" next_nick . . . . . . : 0x%X\n", ptr_nick->next_nick); + log_printf ("\n"); + log_printf (" => nick %s (addr:0x%X):\n", ptr_nick->nick, ptr_nick); + log_printf (" sort_index. . . . . . : %d\n", ptr_nick->sort_index); + log_printf (" color_nick. . . . . . : %d\n", ptr_nick->color_nick); + log_printf (" prefix. . . . . . . . : '%c'\n", ptr_nick->prefix); + log_printf (" color_prefix. . . . . : %d\n", ptr_nick->color_prefix); + log_printf (" prev_nick . . . . . . : 0x%X\n", ptr_nick->prev_nick); + log_printf (" next_nick . . . . . . : 0x%X\n", ptr_nick->next_nick); } - weechat_log_printf ("\n"); - weechat_log_printf (" => last 100 lines:\n"); + log_printf ("\n"); + log_printf (" => last 100 lines:\n"); num = 0; ptr_line = ptr_buffer->last_line; while (ptr_line && (num < 100)) @@ -1018,9 +1018,9 @@ gui_buffer_print_log () while (ptr_line) { num--; - weechat_log_printf (" line N-%05d: str_time:'%s', prefix:'%s'\n", + log_printf (" line N-%05d: str_time:'%s', prefix:'%s'\n", num, ptr_line->str_time, ptr_line->prefix); - weechat_log_printf (" data: '%s'\n", + log_printf (" data: '%s'\n", ptr_line->message); ptr_line = ptr_line->next_line; @@ -1028,7 +1028,7 @@ gui_buffer_print_log () if (ptr_buffer->completion) { - weechat_log_printf ("\n"); + log_printf ("\n"); gui_completion_print_log (ptr_buffer->completion); } } diff --git a/src/gui/gui-chat.c b/src/gui/gui-chat.c index c78215325..3c4ee4099 100644 --- a/src/gui/gui-chat.c +++ b/src/gui/gui-chat.c @@ -408,7 +408,7 @@ gui_chat_line_add (struct t_gui_buffer *buffer, time_t date, new_line = (struct t_gui_line *) malloc (sizeof (struct t_gui_line)); if (!new_line) { - weechat_log_printf (_("Not enough memory for new line\n")); + log_printf (_("Not enough memory for new line\n")); return; } diff --git a/src/gui/gui-completion.c b/src/gui/gui-completion.c index b74ce5010..bf0eb279d 100644 --- a/src/gui/gui-completion.c +++ b/src/gui/gui-completion.c @@ -1688,27 +1688,27 @@ gui_completion_search (struct t_gui_completion *completion, int direction, void gui_completion_print_log (struct t_gui_completion *completion) { - weechat_log_printf ("[completion (addr:0x%X)]\n", completion); - weechat_log_printf (" buffer . . . . . . . . : 0x%X\n", completion->buffer); - weechat_log_printf (" context. . . . . . . . : %d\n", completion->context); - weechat_log_printf (" base_command . . . . . : '%s'\n", completion->base_command); - weechat_log_printf (" base_command_arg . . . : %d\n", completion->base_command_arg); - weechat_log_printf (" arg_is_nick. . . . . . : %d\n", completion->arg_is_nick); - weechat_log_printf (" base_word. . . . . . . : '%s'\n", completion->base_word); - weechat_log_printf (" base_word_pos. . . . . : %d\n", completion->base_word_pos); - weechat_log_printf (" position . . . . . . . : %d\n", completion->position); - weechat_log_printf (" args . . . . . . . . . : '%s'\n", completion->args); - weechat_log_printf (" direction. . . . . . . : %d\n", completion->direction); - weechat_log_printf (" add_space. . . . . . . : %d\n", completion->add_space); - weechat_log_printf (" completion_list. . . . : 0x%X\n", completion->completion_list); - weechat_log_printf (" last_completion. . . . : 0x%X\n", completion->last_completion); - weechat_log_printf (" word_found . . . . . . : '%s'\n", completion->word_found); - weechat_log_printf (" position_replace . . . : %d\n", completion->position_replace); - weechat_log_printf (" diff_size. . . . . . . : %d\n", completion->diff_size); - weechat_log_printf (" diff_length. . . . . . : %d\n", completion->diff_length); + log_printf ("[completion (addr:0x%X)]\n", completion); + log_printf (" buffer . . . . . . . . : 0x%X\n", completion->buffer); + log_printf (" context. . . . . . . . : %d\n", completion->context); + log_printf (" base_command . . . . . : '%s'\n", completion->base_command); + log_printf (" base_command_arg . . . : %d\n", completion->base_command_arg); + log_printf (" arg_is_nick. . . . . . : %d\n", completion->arg_is_nick); + log_printf (" base_word. . . . . . . : '%s'\n", completion->base_word); + log_printf (" base_word_pos. . . . . : %d\n", completion->base_word_pos); + log_printf (" position . . . . . . . : %d\n", completion->position); + log_printf (" args . . . . . . . . . : '%s'\n", completion->args); + log_printf (" direction. . . . . . . : %d\n", completion->direction); + log_printf (" add_space. . . . . . . : %d\n", completion->add_space); + log_printf (" completion_list. . . . : 0x%X\n", completion->completion_list); + log_printf (" last_completion. . . . : 0x%X\n", completion->last_completion); + log_printf (" word_found . . . . . . : '%s'\n", completion->word_found); + log_printf (" position_replace . . . : %d\n", completion->position_replace); + log_printf (" diff_size. . . . . . . : %d\n", completion->diff_size); + log_printf (" diff_length. . . . . . : %d\n", completion->diff_length); if (completion->completion_list) { - weechat_log_printf ("\n"); + log_printf ("\n"); weelist_print_log (completion->completion_list, "completion list element"); } diff --git a/src/gui/gui-hotlist.c b/src/gui/gui-hotlist.c index 0b8049674..b969768be 100644 --- a/src/gui/gui-hotlist.c +++ b/src/gui/gui-hotlist.c @@ -208,9 +208,9 @@ gui_hotlist_add (struct t_gui_buffer *buffer, int priority, if ((new_hotlist = (struct t_gui_hotlist *) malloc (sizeof (struct t_gui_hotlist))) == NULL) { - weechat_log_printf (NULL, - _("Error: not enough memory to add a buffer to " - "hotlist\n")); + log_printf (NULL, + _("Error: not enough memory to add a buffer to " + "hotlist\n")); return; } @@ -345,13 +345,13 @@ gui_hotlist_print_log () for (ptr_hotlist = gui_hotlist; ptr_hotlist; ptr_hotlist = ptr_hotlist->next_hotlist) { - weechat_log_printf ("[hotlist (addr:0x%X)]\n", ptr_hotlist); - weechat_log_printf (" priority . . . . . . . : %d\n", ptr_hotlist->priority); - weechat_log_printf (" creation_time. . . . . : tv_sec:%d, tv_usec:%d\n", - ptr_hotlist->creation_time.tv_sec, - ptr_hotlist->creation_time.tv_usec); - weechat_log_printf (" buffer . . . . . . . . : 0x%X\n", ptr_hotlist->buffer); - weechat_log_printf (" prev_hotlist . . . . . : 0x%X\n", ptr_hotlist->prev_hotlist); - weechat_log_printf (" next_hotlist . . . . . : 0x%X\n", ptr_hotlist->next_hotlist); + log_printf ("[hotlist (addr:0x%X)]\n", ptr_hotlist); + log_printf (" priority . . . . . . . : %d\n", ptr_hotlist->priority); + log_printf (" creation_time. . . . . : tv_sec:%d, tv_usec:%d\n", + ptr_hotlist->creation_time.tv_sec, + ptr_hotlist->creation_time.tv_usec); + log_printf (" buffer . . . . . . . . : 0x%X\n", ptr_hotlist->buffer); + log_printf (" prev_hotlist . . . . . : 0x%X\n", ptr_hotlist->prev_hotlist); + log_printf (" next_hotlist . . . . . : 0x%X\n", ptr_hotlist->next_hotlist); } } diff --git a/src/gui/gui-infobar.c b/src/gui/gui-infobar.c index 9641b09c2..66d211637 100644 --- a/src/gui/gui-infobar.c +++ b/src/gui/gui-infobar.c @@ -72,7 +72,7 @@ gui_infobar_printf (int time_displayed, int color, char *message, ...) free (buf2); } else - weechat_log_printf (_("Error: not enough memory for infobar message\n")); + log_printf (_("Error: not enough memory for infobar message\n")); } /* diff --git a/src/gui/gui-keyboard.c b/src/gui/gui-keyboard.c index be5f25316..ea927f841 100644 --- a/src/gui/gui-keyboard.c +++ b/src/gui/gui-keyboard.c @@ -519,8 +519,7 @@ gui_keyboard_bind (char *key, char *command) if (!key || !command) { - weechat_log_printf (_("Error: unable to bind key \"%s\"\n"), - key); + log_printf (_("Error: unable to bind key \"%s\"\n"), key); return NULL; } @@ -547,8 +546,9 @@ gui_keyboard_bind (char *key, char *command) } if (!ptr_function) { - weechat_log_printf (_("Error: unable to bind key \"%s\" (invalid function name: \"%s\")\n"), - key, command); + log_printf (_("Error: unable to bind key \"%s\" " + "(invalid function name: \"%s\")\n"), + key, command); return NULL; } } @@ -561,7 +561,7 @@ gui_keyboard_bind (char *key, char *command) ptr_args); if (!new_key) { - weechat_log_printf (_("Error: not enough memory for key binding\n")); + log_printf (_("Error: not enough memory for key binding\n")); return NULL; } diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c index e911a6f5b..f7baa1bad 100644 --- a/src/gui/gui-window.c +++ b/src/gui/gui-window.c @@ -769,57 +769,57 @@ gui_window_print_log () { struct t_gui_window *ptr_window; - weechat_log_printf ("\n"); - weechat_log_printf ("current window = 0x%X\n", gui_current_window); + log_printf ("\n"); + log_printf ("current window = 0x%X\n", gui_current_window); for (ptr_window = gui_windows; ptr_window; ptr_window = ptr_window->next_window) { - weechat_log_printf ("\n"); - weechat_log_printf ("[window (addr:0x%X)]\n", ptr_window); - weechat_log_printf (" win_x . . . . . . . : %d\n", ptr_window->win_x); - weechat_log_printf (" win_y . . . . . . . : %d\n", ptr_window->win_y); - weechat_log_printf (" win_width . . . . . : %d\n", ptr_window->win_width); - weechat_log_printf (" win_height. . . . . : %d\n", ptr_window->win_height); - weechat_log_printf (" win_width_pct . . . : %d\n", ptr_window->win_width_pct); - weechat_log_printf (" win_height_pct. . . : %d\n", ptr_window->win_height_pct); - weechat_log_printf (" win_chat_x. . . . . : %d\n", ptr_window->win_chat_x); - weechat_log_printf (" win_chat_y. . . . . : %d\n", ptr_window->win_chat_y); - weechat_log_printf (" win_chat_width. . . : %d\n", ptr_window->win_chat_width); - weechat_log_printf (" win_chat_height . . : %d\n", ptr_window->win_chat_height); - weechat_log_printf (" win_chat_cursor_x . : %d\n", ptr_window->win_chat_cursor_x); - weechat_log_printf (" win_chat_cursor_y . : %d\n", ptr_window->win_chat_cursor_y); - weechat_log_printf (" win_nick_x. . . . . : %d\n", ptr_window->win_nick_x); - weechat_log_printf (" win_nick_y. . . . . : %d\n", ptr_window->win_nick_y); - weechat_log_printf (" win_nick_width. . . : %d\n", ptr_window->win_nick_width); - weechat_log_printf (" win_nick_height . . : %d\n", ptr_window->win_nick_height); - weechat_log_printf (" win_nick_start. . . : %d\n", ptr_window->win_nick_start); - weechat_log_printf (" win_title_x . . . . : %d\n", ptr_window->win_title_x); - weechat_log_printf (" win_title_y . . . . : %d\n", ptr_window->win_title_y); - weechat_log_printf (" win_title_width . . : %d\n", ptr_window->win_title_width); - weechat_log_printf (" win_title_height. . : %d\n", ptr_window->win_title_height); - weechat_log_printf (" win_title_start . . : %d\n", ptr_window->win_title_start); - weechat_log_printf (" win_status_x. . . . : %d\n", ptr_window->win_status_x); - weechat_log_printf (" win_status_y. . . . : %d\n", ptr_window->win_status_y); - weechat_log_printf (" win_status_width. . : %d\n", ptr_window->win_status_width); - weechat_log_printf (" win_status_height . : %d\n", ptr_window->win_status_height); - weechat_log_printf (" win_infobar_x . . . : %d\n", ptr_window->win_infobar_x); - weechat_log_printf (" win_infobar_y . . . : %d\n", ptr_window->win_infobar_y); - weechat_log_printf (" win_infobar_width . : %d\n", ptr_window->win_infobar_width); - weechat_log_printf (" win_infobar_height. : %d\n", ptr_window->win_infobar_height); - weechat_log_printf (" win_input_x . . . . : %d\n", ptr_window->win_input_x); - weechat_log_printf (" win_input_y . . . . : %d\n", ptr_window->win_input_y); - weechat_log_printf (" win_input_width . . : %d\n", ptr_window->win_input_width); - weechat_log_printf (" win_input_height. . : %d\n", ptr_window->win_input_height); - weechat_log_printf (" win_input_cursor_x. : %d\n", ptr_window->win_input_cursor_x); + log_printf ("\n"); + log_printf ("[window (addr:0x%X)]\n", ptr_window); + log_printf (" win_x . . . . . . . : %d\n", ptr_window->win_x); + log_printf (" win_y . . . . . . . : %d\n", ptr_window->win_y); + log_printf (" win_width . . . . . : %d\n", ptr_window->win_width); + log_printf (" win_height. . . . . : %d\n", ptr_window->win_height); + log_printf (" win_width_pct . . . : %d\n", ptr_window->win_width_pct); + log_printf (" win_height_pct. . . : %d\n", ptr_window->win_height_pct); + log_printf (" win_chat_x. . . . . : %d\n", ptr_window->win_chat_x); + log_printf (" win_chat_y. . . . . : %d\n", ptr_window->win_chat_y); + log_printf (" win_chat_width. . . : %d\n", ptr_window->win_chat_width); + log_printf (" win_chat_height . . : %d\n", ptr_window->win_chat_height); + log_printf (" win_chat_cursor_x . : %d\n", ptr_window->win_chat_cursor_x); + log_printf (" win_chat_cursor_y . : %d\n", ptr_window->win_chat_cursor_y); + log_printf (" win_nick_x. . . . . : %d\n", ptr_window->win_nick_x); + log_printf (" win_nick_y. . . . . : %d\n", ptr_window->win_nick_y); + log_printf (" win_nick_width. . . : %d\n", ptr_window->win_nick_width); + log_printf (" win_nick_height . . : %d\n", ptr_window->win_nick_height); + log_printf (" win_nick_start. . . : %d\n", ptr_window->win_nick_start); + log_printf (" win_title_x . . . . : %d\n", ptr_window->win_title_x); + log_printf (" win_title_y . . . . : %d\n", ptr_window->win_title_y); + log_printf (" win_title_width . . : %d\n", ptr_window->win_title_width); + log_printf (" win_title_height. . : %d\n", ptr_window->win_title_height); + log_printf (" win_title_start . . : %d\n", ptr_window->win_title_start); + log_printf (" win_status_x. . . . : %d\n", ptr_window->win_status_x); + log_printf (" win_status_y. . . . : %d\n", ptr_window->win_status_y); + log_printf (" win_status_width. . : %d\n", ptr_window->win_status_width); + log_printf (" win_status_height . : %d\n", ptr_window->win_status_height); + log_printf (" win_infobar_x . . . : %d\n", ptr_window->win_infobar_x); + log_printf (" win_infobar_y . . . : %d\n", ptr_window->win_infobar_y); + log_printf (" win_infobar_width . : %d\n", ptr_window->win_infobar_width); + log_printf (" win_infobar_height. : %d\n", ptr_window->win_infobar_height); + log_printf (" win_input_x . . . . : %d\n", ptr_window->win_input_x); + log_printf (" win_input_y . . . . : %d\n", ptr_window->win_input_y); + log_printf (" win_input_width . . : %d\n", ptr_window->win_input_width); + log_printf (" win_input_height. . : %d\n", ptr_window->win_input_height); + log_printf (" win_input_cursor_x. : %d\n", ptr_window->win_input_cursor_x); gui_window_objects_print_log (ptr_window); - weechat_log_printf (" dcc_first . . . . . : 0x%X\n", ptr_window->dcc_first); - weechat_log_printf (" dcc_selected. . . . : 0x%X\n", ptr_window->dcc_selected); - weechat_log_printf (" dcc_last_displayed. : 0x%X\n", ptr_window->dcc_last_displayed); - weechat_log_printf (" buffer. . . . . . . : 0x%X\n", ptr_window->buffer); - weechat_log_printf (" first_line_displayed: %d\n", ptr_window->first_line_displayed); - weechat_log_printf (" start_line. . . . . : 0x%X\n", ptr_window->start_line); - weechat_log_printf (" start_line_pos. . . : %d\n", ptr_window->start_line_pos); - weechat_log_printf (" prev_window . . . . : 0x%X\n", ptr_window->prev_window); - weechat_log_printf (" next_window . . . . : 0x%X\n", ptr_window->next_window); + log_printf (" dcc_first . . . . . : 0x%X\n", ptr_window->dcc_first); + log_printf (" dcc_selected. . . . : 0x%X\n", ptr_window->dcc_selected); + log_printf (" dcc_last_displayed. : 0x%X\n", ptr_window->dcc_last_displayed); + log_printf (" buffer. . . . . . . : 0x%X\n", ptr_window->buffer); + log_printf (" first_line_displayed: %d\n", ptr_window->first_line_displayed); + log_printf (" start_line. . . . . : 0x%X\n", ptr_window->start_line); + log_printf (" start_line_pos. . . : %d\n", ptr_window->start_line_pos); + log_printf (" prev_window . . . . : 0x%X\n", ptr_window->prev_window); + log_printf (" next_window . . . . : 0x%X\n", ptr_window->next_window); } } diff --git a/src/plugins/plugin-config.c b/src/plugins/plugin-config.c index 9c15cd620..197fe1182 100644 --- a/src/plugins/plugin-config.c +++ b/src/plugins/plugin-config.c @@ -328,7 +328,7 @@ plugin_config_write_options (FILE *file, char *section_name, int plugin_config_write () { - weechat_log_printf (_("Saving plugins configuration to disk\n")); + log_printf (_("Saving plugins configuration to disk\n")); return config_file_write (plugin_config_sections, plugin_config_options, plugin_config_write_functions, WEECHAT_PLUGIN_CONFIG_NAME); diff --git a/src/plugins/plugin-list.c b/src/plugins/plugin-list.c index 4316bb9c4..47bf4843f 100644 --- a/src/plugins/plugin-list.c +++ b/src/plugins/plugin-list.c @@ -564,36 +564,36 @@ plugin_list_print_log () for (ptr_list = plugin_lists; ptr_list; ptr_list = ptr_list->next_list) { - weechat_log_printf ("\n"); - weechat_log_printf ("[plugin list (addr:0x%X)]\n", ptr_list); - weechat_log_printf (" items. . . . . . . . . : 0x%X\n", ptr_list->items); - weechat_log_printf (" last_item. . . . . . . : 0x%X\n", ptr_list->last_item); - weechat_log_printf (" ptr_item . . . . . . . : 0x%X\n", ptr_list->ptr_item); - weechat_log_printf (" prev_list. . . . . . . : 0x%X\n", ptr_list->prev_list); - weechat_log_printf (" next_list. . . . . . . : 0x%X\n", ptr_list->next_list); + log_printf ("\n"); + log_printf ("[plugin list (addr:0x%X)]\n", ptr_list); + log_printf (" items. . . . . . . . . : 0x%X\n", ptr_list->items); + log_printf (" last_item. . . . . . . : 0x%X\n", ptr_list->last_item); + log_printf (" ptr_item . . . . . . . : 0x%X\n", ptr_list->ptr_item); + log_printf (" prev_list. . . . . . . : 0x%X\n", ptr_list->prev_list); + log_printf (" next_list. . . . . . . : 0x%X\n", ptr_list->next_list); for (ptr_item = ptr_list->items; ptr_item; ptr_item = ptr_item->next_item) { - weechat_log_printf ("\n"); - weechat_log_printf (" [item (addr:0x%X)]\n", ptr_item); - weechat_log_printf (" vars . . . . . . . . . : 0x%X\n", ptr_item->vars); - weechat_log_printf (" last_var . . . . . . . : 0x%X\n", ptr_item->last_var); - weechat_log_printf (" prev_item. . . . . . . : 0x%X\n", ptr_item->prev_item); - weechat_log_printf (" next_item. . . . . . . : 0x%X\n", ptr_item->next_item); + log_printf ("\n"); + log_printf (" [item (addr:0x%X)]\n", ptr_item); + log_printf (" vars . . . . . . . . . : 0x%X\n", ptr_item->vars); + log_printf (" last_var . . . . . . . : 0x%X\n", ptr_item->last_var); + log_printf (" prev_item. . . . . . . : 0x%X\n", ptr_item->prev_item); + log_printf (" next_item. . . . . . . : 0x%X\n", ptr_item->next_item); for (ptr_var = ptr_item->vars; ptr_var; ptr_var = ptr_var->next_var) { - weechat_log_printf ("\n"); - weechat_log_printf (" [var (addr:0x%X)]\n", ptr_var); - weechat_log_printf (" name . . . . . . . . : '%s'\n", ptr_var->name); - weechat_log_printf (" type . . . . . . . . : %d\n", ptr_var->type); - weechat_log_printf (" value_int. . . . . . : %d\n", ptr_var->value_int); - weechat_log_printf (" value_string . . . . : '%s'\n", ptr_var->value_string); - weechat_log_printf (" value_time . . . . . : %ld\n", ptr_var->value_time); - weechat_log_printf (" prev_var . . . . . . : 0x%X\n", ptr_var->prev_var); - weechat_log_printf (" next_var . . . . . . : 0x%X\n", ptr_var->next_var); + log_printf ("\n"); + log_printf (" [var (addr:0x%X)]\n", ptr_var); + log_printf (" name . . . . . . . . : '%s'\n", ptr_var->name); + log_printf (" type . . . . . . . . : %d\n", ptr_var->type); + log_printf (" value_int. . . . . . : %d\n", ptr_var->value_int); + log_printf (" value_string . . . . : '%s'\n", ptr_var->value_string); + log_printf (" value_time . . . . . : %ld\n", ptr_var->value_time); + log_printf (" prev_var . . . . . . : 0x%X\n", ptr_var->prev_var); + log_printf (" next_var . . . . . . : 0x%X\n", ptr_var->next_var); } } } diff --git a/src/plugins/plugin.c b/src/plugins/plugin.c index adc5bb67c..7734d8503 100644 --- a/src/plugins/plugin.c +++ b/src/plugins/plugin.c @@ -593,16 +593,16 @@ plugin_print_log () for (ptr_plugin = weechat_plugins; ptr_plugin; ptr_plugin = ptr_plugin->next_plugin) { - weechat_log_printf ("\n"); - weechat_log_printf ("[plugin (addr:0x%X)]\n", ptr_plugin); - weechat_log_printf (" filename . . . . . . . : '%s'\n", ptr_plugin->filename); - weechat_log_printf (" handle . . . . . . . . : 0x%X\n", ptr_plugin->handle); - weechat_log_printf (" name . . . . . . . . . : '%s'\n", ptr_plugin->name); - weechat_log_printf (" description. . . . . . : '%s'\n", ptr_plugin->description); - weechat_log_printf (" version. . . . . . . . : '%s'\n", ptr_plugin->version); - weechat_log_printf (" charset. . . . . . . . : '%s'\n", ptr_plugin->charset); - weechat_log_printf (" prev_plugin. . . . . . : 0x%X\n", ptr_plugin->prev_plugin); - weechat_log_printf (" next_plugin. . . . . . : 0x%X\n", ptr_plugin->next_plugin); + log_printf ("\n"); + log_printf ("[plugin (addr:0x%X)]\n", ptr_plugin); + log_printf (" filename . . . . . . . : '%s'\n", ptr_plugin->filename); + log_printf (" handle . . . . . . . . : 0x%X\n", ptr_plugin->handle); + log_printf (" name . . . . . . . . . : '%s'\n", ptr_plugin->name); + log_printf (" description. . . . . . : '%s'\n", ptr_plugin->description); + log_printf (" version. . . . . . . . : '%s'\n", ptr_plugin->version); + log_printf (" charset. . . . . . . . : '%s'\n", ptr_plugin->charset); + log_printf (" prev_plugin. . . . . . : 0x%X\n", ptr_plugin->prev_plugin); + log_printf (" next_plugin. . . . . . : 0x%X\n", ptr_plugin->next_plugin); } plugin_list_print_log (); |