diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2008-11-04 15:34:44 +0100 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2008-11-04 15:34:44 +0100 |
| commit | d32b22f76f9d677780780ec3ab1a497f0ad7a9d5 (patch) | |
| tree | b1e6fda619e9d3d6f3d8d42b17dcac60ba0be23d | |
| parent | e2a19660959d17b2ff615f90259dd543388c362a (diff) | |
| download | weechat-d32b22f76f9d677780780ec3ab1a497f0ad7a9d5.zip | |
Fix bug with pointer conversions on 64 bits architecture
32 files changed, 504 insertions, 506 deletions
diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c index 5aa48ae9f..e18a22440 100644 --- a/src/core/wee-config-file.c +++ b/src/core/wee-config-file.c @@ -2526,54 +2526,54 @@ config_file_print_log () ptr_config_file = ptr_config_file->next_config) { log_printf (""); - log_printf ("[config (addr:0x%x)]", ptr_config_file); - log_printf (" plugin . . . . . . . . : 0x%x ('%s')", + log_printf ("[config (addr:0x%lx)]", ptr_config_file); + log_printf (" plugin . . . . . . . . : 0x%lx ('%s')", ptr_config_file->plugin, plugin_get_name (ptr_config_file->plugin)); - log_printf (" name . . . . . . . . . : '%s'", ptr_config_file->name); - log_printf (" filename . . . . . . . : '%s'", ptr_config_file->filename); - log_printf (" file . . . . . . . . . : 0x%x", ptr_config_file->file); - log_printf (" callback_reload. . . . : 0x%x", ptr_config_file->callback_reload); - log_printf (" callback_reload_data . : 0x%x", ptr_config_file->callback_reload_data); - log_printf (" sections . . . . . . . : 0x%x", ptr_config_file->sections); - log_printf (" last_section . . . . . : 0x%x", ptr_config_file->last_section); - log_printf (" prev_config. . . . . . : 0x%x", ptr_config_file->prev_config); - log_printf (" next_config. . . . . . : 0x%x", ptr_config_file->next_config); + log_printf (" name . . . . . . . . . : '%s'", ptr_config_file->name); + log_printf (" filename . . . . . . . : '%s'", ptr_config_file->filename); + log_printf (" file . . . . . . . . . : 0x%lx", ptr_config_file->file); + log_printf (" callback_reload. . . . : 0x%lx", ptr_config_file->callback_reload); + log_printf (" callback_reload_data . : 0x%lx", ptr_config_file->callback_reload_data); + log_printf (" sections . . . . . . . : 0x%lx", ptr_config_file->sections); + log_printf (" last_section . . . . . : 0x%lx", ptr_config_file->last_section); + log_printf (" prev_config. . . . . . : 0x%lx", ptr_config_file->prev_config); + log_printf (" next_config. . . . . . : 0x%lx", ptr_config_file->next_config); for (ptr_section = ptr_config_file->sections; ptr_section; ptr_section = ptr_section->next_section) { log_printf (""); - log_printf (" [section (addr:0x%x)]", ptr_section); - log_printf (" name . . . . . . . . . . . : '%s'", ptr_section->name); - log_printf (" callback_read. . . . . . . : 0x%x", ptr_section->callback_read); - log_printf (" callback_read_data . . . . : 0x%x", ptr_section->callback_read_data); - log_printf (" callback_write . . . . . . : 0x%x", ptr_section->callback_write); - log_printf (" callback_write_data. . . . : 0x%x", ptr_section->callback_write_data); - log_printf (" callback_write_default . . : 0x%x", ptr_section->callback_write_default); - log_printf (" callback_write_default_data: 0x%x", ptr_section->callback_write_default_data); - log_printf (" callback_create_option. . .: 0x%x", ptr_section->callback_create_option); - log_printf (" callback_create_option_data: 0x%x", ptr_section->callback_create_option_data); - log_printf (" callback_delete_option. . .: 0x%x", ptr_section->callback_delete_option); - log_printf (" callback_delete_option_data: 0x%x", ptr_section->callback_delete_option_data); - log_printf (" options. . . . . . . . . . : 0x%x", ptr_section->options); - log_printf (" last_option. . . . . . . . : 0x%x", ptr_section->last_option); - log_printf (" prev_section . . . . . . . : 0x%x", ptr_section->prev_section); - log_printf (" next_section . . . . . . . : 0x%x", ptr_section->next_section); + log_printf (" [section (addr:0x%lx)]", ptr_section); + log_printf (" name . . . . . . . . . . . : '%s'", ptr_section->name); + log_printf (" callback_read. . . . . . . : 0x%lx", ptr_section->callback_read); + log_printf (" callback_read_data . . . . : 0x%lx", ptr_section->callback_read_data); + log_printf (" callback_write . . . . . . : 0x%lx", ptr_section->callback_write); + log_printf (" callback_write_data. . . . : 0x%lx", ptr_section->callback_write_data); + log_printf (" callback_write_default . . : 0x%lx", ptr_section->callback_write_default); + log_printf (" callback_write_default_data: 0x%lx", ptr_section->callback_write_default_data); + log_printf (" callback_create_option. . .: 0x%lx", ptr_section->callback_create_option); + log_printf (" callback_create_option_data: 0x%lx", ptr_section->callback_create_option_data); + log_printf (" callback_delete_option. . .: 0x%lx", ptr_section->callback_delete_option); + log_printf (" callback_delete_option_data: 0x%lx", ptr_section->callback_delete_option_data); + log_printf (" options. . . . . . . . . . : 0x%lx", ptr_section->options); + log_printf (" last_option. . . . . . . . : 0x%lx", ptr_section->last_option); + log_printf (" prev_section . . . . . . . : 0x%lx", ptr_section->prev_section); + log_printf (" next_section . . . . . . . : 0x%lx", ptr_section->next_section); for (ptr_option = ptr_section->options; ptr_option; ptr_option = ptr_option->next_option) { log_printf (""); - log_printf (" [option (addr:0x%x)]", ptr_option); - log_printf (" config_file. . . . . : 0x%x", ptr_option->config_file); - log_printf (" section. . . . . . . : 0x%x", ptr_option->section); - log_printf (" name . . . . . . . . : '%s'", ptr_option->name); - log_printf (" type . . . . . . . . : %d", ptr_option->type); - log_printf (" description. . . . . : '%s'", ptr_option->description); - log_printf (" string_values. . . . : 0x%x", ptr_option->string_values); - log_printf (" min. . . . . . . . . : %d", ptr_option->min); - log_printf (" max. . . . . . . . . : %d", ptr_option->max); + log_printf (" [option (addr:0x%lx)]", ptr_option); + log_printf (" config_file. . . . . : 0x%lx", ptr_option->config_file); + log_printf (" section. . . . . . . : 0x%lx", ptr_option->section); + log_printf (" name . . . . . . . . : '%s'", ptr_option->name); + log_printf (" type . . . . . . . . : %d", ptr_option->type); + log_printf (" description. . . . . : '%s'", ptr_option->description); + log_printf (" string_values. . . . : 0x%lx", ptr_option->string_values); + log_printf (" min. . . . . . . . . : %d", ptr_option->min); + log_printf (" max. . . . . . . . . : %d", ptr_option->max); switch (ptr_option->type) { case CONFIG_OPTION_TYPE_BOOLEAN: @@ -2617,10 +2617,10 @@ config_file_print_log () case CONFIG_NUM_OPTION_TYPES: break; } - log_printf (" callback_change. . . : 0x%x", ptr_option->callback_change); - log_printf (" loaded . . . . . . . : %d", ptr_option->loaded); - log_printf (" prev_option. . . . . : 0x%x", ptr_option->prev_option); - log_printf (" next_option. . . . . : 0x%x", ptr_option->next_option); + log_printf (" callback_change. . . : 0x%lx", ptr_option->callback_change); + log_printf (" loaded . . . . . . . : %d", ptr_option->loaded); + log_printf (" prev_option. . . . . : 0x%lx", ptr_option->prev_option); + log_printf (" next_option. . . . . : 0x%lx", ptr_option->next_option); } } } diff --git a/src/core/wee-debug.c b/src/core/wee-debug.c index e7c2ec075..744a49040 100644 --- a/src/core/wee-debug.c +++ b/src/core/wee-debug.c @@ -185,8 +185,8 @@ debug_windows_tree_display (struct t_gui_window_tree *tree, int indent) /* leaf */ snprintf (format, sizeof (format), - "%%-%dsleaf: 0x%%X (parent:0x%%X), win=0x%%X, " - "child1=0x%%X, child2=0x%%X, %%d,%%d %%dx%%d, " + "%%-%dsleaf: 0x%%lx (parent:0x%%lx), win=0x%%lx, " + "child1=0x%%lx, child2=0x%%lx, %%d,%%d %%dx%%d, " "%%d%%%%x%%d%%%%", indent * 2); gui_chat_printf (NULL, @@ -203,8 +203,8 @@ debug_windows_tree_display (struct t_gui_window_tree *tree, int indent) /* node */ snprintf (format, sizeof (format), - "%%-%dsnode: 0x%%X (parent:0x%%X), win=0x%%X, " - "child1=0x%%X, child2=0x%%X)", + "%%-%dsnode: 0x%%lx (parent:0x%%lx), win=0x%%lx, " + "child1=0x%%lx, child2=0x%%lx)", indent * 2); gui_chat_printf (NULL, format, diff --git a/src/core/wee-hook.c b/src/core/wee-hook.c index 1a57b42d8..3f660b20e 100644 --- a/src/core/wee-hook.c +++ b/src/core/wee-hook.c @@ -2040,140 +2040,140 @@ hook_print_log () ptr_hook = ptr_hook->next_hook) { log_printf (""); - log_printf ("[hook (addr:0x%x)]", ptr_hook); - log_printf (" plugin . . . . . . . . : 0x%x ('%s')", + log_printf ("[hook (addr:0x%lx)]", ptr_hook); + log_printf (" plugin . . . . . . . . : 0x%lx ('%s')", ptr_hook->plugin, plugin_get_name (ptr_hook->plugin)); - log_printf (" deleted. . . . . . . . : %d", ptr_hook->deleted); - log_printf (" running. . . . . . . . : %d", ptr_hook->running); + log_printf (" deleted. . . . . . . . : %d", ptr_hook->deleted); + log_printf (" running. . . . . . . . : %d", ptr_hook->running); log_printf (" type . . . . . . . . . : %d (%s)", ptr_hook->type, hook_type_string[ptr_hook->type]); - log_printf (" callback_data. . . . . : 0x%x", ptr_hook->callback_data); + log_printf (" callback_data. . . . . : 0x%lx", ptr_hook->callback_data); switch (ptr_hook->type) { case HOOK_TYPE_COMMAND: if (!ptr_hook->deleted) { log_printf (" command data:"); - log_printf (" callback . . . . . . : 0x%x", HOOK_COMMAND(ptr_hook, callback)); - log_printf (" command. . . . . . . : '%s'", HOOK_COMMAND(ptr_hook, command)); - log_printf (" level. . . . . . . . : %d", HOOK_COMMAND(ptr_hook, level)); - log_printf (" description. . . . . : '%s'", HOOK_COMMAND(ptr_hook, description)); - log_printf (" args . . . . . . . . : '%s'", HOOK_COMMAND(ptr_hook, args)); - log_printf (" args_description . . : '%s'", HOOK_COMMAND(ptr_hook, args_description)); - log_printf (" completion . . . . . : '%s'", HOOK_COMMAND(ptr_hook, completion)); + log_printf (" callback . . . . . . : 0x%lx", HOOK_COMMAND(ptr_hook, callback)); + log_printf (" command. . . . . . . : '%s'", HOOK_COMMAND(ptr_hook, command)); + log_printf (" level. . . . . . . . : %d", HOOK_COMMAND(ptr_hook, level)); + log_printf (" description. . . . . : '%s'", HOOK_COMMAND(ptr_hook, description)); + log_printf (" args . . . . . . . . : '%s'", HOOK_COMMAND(ptr_hook, args)); + log_printf (" args_description . . : '%s'", HOOK_COMMAND(ptr_hook, args_description)); + log_printf (" completion . . . . . : '%s'", HOOK_COMMAND(ptr_hook, completion)); } break; case HOOK_TYPE_TIMER: if (!ptr_hook->deleted) { log_printf (" timer data:"); - log_printf (" callback . . . . . . : 0x%x", HOOK_TIMER(ptr_hook, callback)); - log_printf (" interval . . . . . . : %ld", HOOK_TIMER(ptr_hook, interval)); - log_printf (" align_second . . . . : %d", HOOK_TIMER(ptr_hook, align_second)); - log_printf (" remaining_calls. . . : %d", HOOK_TIMER(ptr_hook, remaining_calls)); + log_printf (" callback . . . . . . : 0x%lx", HOOK_TIMER(ptr_hook, callback)); + log_printf (" interval . . . . . . : %ld", HOOK_TIMER(ptr_hook, interval)); + log_printf (" align_second . . . . : %d", HOOK_TIMER(ptr_hook, align_second)); + log_printf (" remaining_calls. . . : %d", HOOK_TIMER(ptr_hook, remaining_calls)); local_time = localtime (&HOOK_TIMER(ptr_hook, last_exec).tv_sec); strftime (text_time, sizeof (text_time), "%d/%m/%Y %H:%M:%S", local_time); log_printf (" last_exec.tv_sec . . : %ld (%s)", HOOK_TIMER(ptr_hook, last_exec.tv_sec), text_time); - log_printf (" last_exec.tv_usec. . : %ld", HOOK_TIMER(ptr_hook, last_exec.tv_usec)); + log_printf (" last_exec.tv_usec. . : %ld", HOOK_TIMER(ptr_hook, last_exec.tv_usec)); local_time = localtime (&HOOK_TIMER(ptr_hook, next_exec).tv_sec); strftime (text_time, sizeof (text_time), "%d/%m/%Y %H:%M:%S", local_time); log_printf (" next_exec.tv_sec . . : %ld (%s)", HOOK_TIMER(ptr_hook, next_exec.tv_sec), text_time); - log_printf (" next_exec.tv_usec. . : %ld", HOOK_TIMER(ptr_hook, next_exec.tv_usec)); + log_printf (" next_exec.tv_usec. . : %ld", HOOK_TIMER(ptr_hook, next_exec.tv_usec)); } break; case HOOK_TYPE_FD: if (!ptr_hook->deleted) { log_printf (" fd data:"); - log_printf (" callback . . . . . . : 0x%x", HOOK_FD(ptr_hook, callback)); - log_printf (" fd . . . . . . . . . : %d", HOOK_FD(ptr_hook, fd)); - log_printf (" flags. . . . . . . . : %d", HOOK_FD(ptr_hook, flags)); + log_printf (" callback . . . . . . : 0x%lx", HOOK_FD(ptr_hook, callback)); + log_printf (" fd . . . . . . . . . : %d", HOOK_FD(ptr_hook, fd)); + log_printf (" flags. . . . . . . . : %d", HOOK_FD(ptr_hook, flags)); } break; case HOOK_TYPE_CONNECT: if (!ptr_hook->deleted) { log_printf (" connect data:"); - log_printf (" callback . . . . . . : 0x%x", HOOK_CONNECT(ptr_hook, callback)); - log_printf (" address. . . . . . . : '%s'", HOOK_CONNECT(ptr_hook, address)); - log_printf (" port . . . . . . . . : %d", HOOK_CONNECT(ptr_hook, port)); - log_printf (" sock . . . . . . . . : %d", HOOK_CONNECT(ptr_hook, sock)); - log_printf (" ipv6 . . . . . . . . : %d", HOOK_CONNECT(ptr_hook, ipv6)); + log_printf (" callback . . . . . . : 0x%lx", HOOK_CONNECT(ptr_hook, callback)); + log_printf (" address. . . . . . . : '%s'", HOOK_CONNECT(ptr_hook, address)); + log_printf (" port . . . . . . . . : %d", HOOK_CONNECT(ptr_hook, port)); + log_printf (" sock . . . . . . . . : %d", HOOK_CONNECT(ptr_hook, sock)); + log_printf (" ipv6 . . . . . . . . : %d", HOOK_CONNECT(ptr_hook, ipv6)); #ifdef HAVE_GNUTLS - log_printf (" gnutls_sess. . . . . : 0x%x", HOOK_CONNECT(ptr_hook, gnutls_sess)); + log_printf (" gnutls_sess. . . . . : 0x%lx", HOOK_CONNECT(ptr_hook, gnutls_sess)); #endif - log_printf (" local_hostname . . . : '%s'", HOOK_CONNECT(ptr_hook, local_hostname)); - log_printf (" child_read . . . . . : %d", HOOK_CONNECT(ptr_hook, child_read)); - log_printf (" child_write. . . . . : %d", HOOK_CONNECT(ptr_hook, child_write)); - log_printf (" hook_fd. . . . . . . : 0x%x", HOOK_CONNECT(ptr_hook, hook_fd)); + log_printf (" local_hostname . . . : '%s'", HOOK_CONNECT(ptr_hook, local_hostname)); + log_printf (" child_read . . . . . : %d", HOOK_CONNECT(ptr_hook, child_read)); + log_printf (" child_write. . . . . : %d", HOOK_CONNECT(ptr_hook, child_write)); + log_printf (" hook_fd. . . . . . . : 0x%lx", HOOK_CONNECT(ptr_hook, hook_fd)); } break; case HOOK_TYPE_PRINT: if (!ptr_hook->deleted) { log_printf (" print data:"); - log_printf (" callback . . . . . . : 0x%x", HOOK_PRINT(ptr_hook, callback)); - log_printf (" buffer . . . . . . . : 0x%x", HOOK_PRINT(ptr_hook, buffer)); - log_printf (" tags_count . . . . . : %d", HOOK_PRINT(ptr_hook, tags_count)); - log_printf (" tags_array . . . . . : 0x%x", HOOK_PRINT(ptr_hook, tags_array)); - log_printf (" message. . . . . . . : '%s'", HOOK_PRINT(ptr_hook, message)); - log_printf (" strip_colors . . . . : %d", HOOK_PRINT(ptr_hook, strip_colors)); + log_printf (" callback . . . . . . : 0x%lx", HOOK_PRINT(ptr_hook, callback)); + log_printf (" buffer . . . . . . . : 0x%lx", HOOK_PRINT(ptr_hook, buffer)); + log_printf (" tags_count . . . . . : %d", HOOK_PRINT(ptr_hook, tags_count)); + log_printf (" tags_array . . . . . : 0x%lx", HOOK_PRINT(ptr_hook, tags_array)); + log_printf (" message. . . . . . . : '%s'", HOOK_PRINT(ptr_hook, message)); + log_printf (" strip_colors . . . . : %d", HOOK_PRINT(ptr_hook, strip_colors)); } break; case HOOK_TYPE_SIGNAL: if (!ptr_hook->deleted) { log_printf (" signal data:"); - log_printf (" callback . . . . . . : 0x%x", HOOK_SIGNAL(ptr_hook, callback)); - log_printf (" signal . . . . . . . : '%s'", HOOK_SIGNAL(ptr_hook, signal)); + log_printf (" callback . . . . . . : 0x%lx", HOOK_SIGNAL(ptr_hook, callback)); + log_printf (" signal . . . . . . . : '%s'", HOOK_SIGNAL(ptr_hook, signal)); } break; case HOOK_TYPE_CONFIG: if (!ptr_hook->deleted) { log_printf (" config data:"); - log_printf (" callback . . . . . . : 0x%x", HOOK_CONFIG(ptr_hook, callback)); - log_printf (" option . . . . . . . : '%s'", HOOK_CONFIG(ptr_hook, option)); + log_printf (" callback . . . . . . : 0x%lx", HOOK_CONFIG(ptr_hook, callback)); + log_printf (" option . . . . . . . : '%s'", HOOK_CONFIG(ptr_hook, option)); } break; case HOOK_TYPE_COMPLETION: if (!ptr_hook->deleted) { log_printf (" completion data:"); - log_printf (" callback . . . . . . : 0x%x", HOOK_COMPLETION(ptr_hook, callback)); - log_printf (" completion_item. . . : '%s'", HOOK_COMPLETION(ptr_hook, completion_item)); + log_printf (" callback . . . . . . : 0x%lx", HOOK_COMPLETION(ptr_hook, callback)); + log_printf (" completion_item. . . : '%s'", HOOK_COMPLETION(ptr_hook, completion_item)); } break; case HOOK_TYPE_MODIFIER: if (!ptr_hook->deleted) { log_printf (" modifier data:"); - log_printf (" callback . . . . . . : 0x%x", HOOK_MODIFIER(ptr_hook, callback)); - log_printf (" modifier . . . . . . : '%s'", HOOK_MODIFIER(ptr_hook, modifier)); + log_printf (" callback . . . . . . : 0x%lx", HOOK_MODIFIER(ptr_hook, callback)); + log_printf (" modifier . . . . . . : '%s'", HOOK_MODIFIER(ptr_hook, modifier)); } break; case HOOK_TYPE_INFO: if (!ptr_hook->deleted) { log_printf (" info data:"); - log_printf (" callback . . . . . . : 0x%x", HOOK_INFO(ptr_hook, callback)); - log_printf (" info_name. . . . . . : '%s'", HOOK_INFO(ptr_hook, info_name)); - log_printf (" description. . . . . : '%s'", HOOK_INFO(ptr_hook, description)); + log_printf (" callback . . . . . . : 0x%lx", HOOK_INFO(ptr_hook, callback)); + log_printf (" info_name. . . . . . : '%s'", HOOK_INFO(ptr_hook, info_name)); + log_printf (" description. . . . . : '%s'", HOOK_INFO(ptr_hook, description)); } break; case HOOK_TYPE_INFOLIST: if (!ptr_hook->deleted) { log_printf (" infolist data:"); - log_printf (" callback . . . . . . : 0x%x", HOOK_INFOLIST(ptr_hook, callback)); - log_printf (" infolist_name. . . . : '%s'", HOOK_INFOLIST(ptr_hook, infolist_name)); - log_printf (" description. . . . . : '%s'", HOOK_INFOLIST(ptr_hook, description)); + log_printf (" callback . . . . . . : 0x%lx", HOOK_INFOLIST(ptr_hook, callback)); + log_printf (" infolist_name. . . . : '%s'", HOOK_INFOLIST(ptr_hook, infolist_name)); + log_printf (" description. . . . . : '%s'", HOOK_INFOLIST(ptr_hook, description)); } break; case HOOK_NUM_TYPES: @@ -2181,8 +2181,8 @@ hook_print_log () it is never used as type */ break; } - log_printf (" prev_hook. . . . . . . : 0x%x", ptr_hook->prev_hook); - log_printf (" next_hook. . . . . . . : 0x%x", ptr_hook->next_hook); + log_printf (" prev_hook. . . . . . . : 0x%lx", ptr_hook->prev_hook); + log_printf (" next_hook. . . . . . . : 0x%lx", ptr_hook->next_hook); } } } diff --git a/src/core/wee-infolist.c b/src/core/wee-infolist.c index 64d4cb8a7..07c59bcaf 100644 --- a/src/core/wee-infolist.c +++ b/src/core/wee-infolist.c @@ -657,51 +657,51 @@ infolist_print_log () ptr_infolist = ptr_infolist->next_infolist) { log_printf (""); - log_printf ("[infolist (addr:0x%x)]", ptr_infolist); - log_printf (" items. . . . . . . . . : 0x%x", ptr_infolist->items); - log_printf (" last_item. . . . . . . : 0x%x", ptr_infolist->last_item); - log_printf (" ptr_item . . . . . . . : 0x%x", ptr_infolist->ptr_item); - log_printf (" prev_infolist. . . . . : 0x%x", ptr_infolist->prev_infolist); - log_printf (" next_infolist. . . . . : 0x%x", ptr_infolist->next_infolist); + log_printf ("[infolist (addr:0x%lx)]", ptr_infolist); + log_printf (" items. . . . . . . . . : 0x%lx", ptr_infolist->items); + log_printf (" last_item. . . . . . . : 0x%lx", ptr_infolist->last_item); + log_printf (" ptr_item . . . . . . . : 0x%lx", ptr_infolist->ptr_item); + log_printf (" prev_infolist. . . . . : 0x%lx", ptr_infolist->prev_infolist); + log_printf (" next_infolist. . . . . : 0x%lx", ptr_infolist->next_infolist); for (ptr_item = ptr_infolist->items; ptr_item; ptr_item = ptr_item->next_item) { log_printf (""); - log_printf (" [item (addr:0x%x)]", ptr_item); - log_printf (" vars . . . . . . . . . : 0x%x", ptr_item->vars); - log_printf (" last_var . . . . . . . : 0x%x", ptr_item->last_var); - log_printf (" prev_item. . . . . . . : 0x%x", ptr_item->prev_item); - log_printf (" next_item. . . . . . . : 0x%x", ptr_item->next_item); + log_printf (" [item (addr:0x%lx)]", ptr_item); + log_printf (" vars . . . . . . . . . : 0x%lx", ptr_item->vars); + log_printf (" last_var . . . . . . . : 0x%lx", ptr_item->last_var); + log_printf (" prev_item. . . . . . . : 0x%lx", ptr_item->prev_item); + log_printf (" next_item. . . . . . . : 0x%lx", ptr_item->next_item); for (ptr_var = ptr_item->vars; ptr_var; ptr_var = ptr_var->next_var) { log_printf (""); - log_printf (" [var (addr:0x%x)]", ptr_var); + log_printf (" [var (addr:0x%lx)]", ptr_var); log_printf (" name . . . . . . . . : '%s'", ptr_var->name); log_printf (" type . . . . . . . . : %d", ptr_var->type); switch (ptr_var->type) { case INFOLIST_INTEGER: - log_printf (" value (integer). . . : %d", *((int *)ptr_var->value)); + log_printf (" value (integer). . . : %d", *((int *)ptr_var->value)); break; case INFOLIST_STRING: - log_printf (" value (string) . . . : '%s'", (char *)ptr_var->value); + log_printf (" value (string) . . . : '%s'", (char *)ptr_var->value); break; case INFOLIST_POINTER: - log_printf (" value (pointer). . . : 0x%x", ptr_var->value); + log_printf (" value (pointer). . . : 0x%lx", ptr_var->value); break; case INFOLIST_BUFFER: - log_printf (" value (buffer) . . . : 0x%x", ptr_var->value); - log_printf (" size of buffer . . . : %d", ptr_var->size); + log_printf (" value (buffer) . . . : 0x%lx", ptr_var->value); + log_printf (" size of buffer . . . : %d", ptr_var->size); break; case INFOLIST_TIME: log_printf (" value (time) . . . . : %ld", *((time_t *)ptr_var->value)); break; } - log_printf (" prev_var . . . . . . : 0x%x", ptr_var->prev_var); - log_printf (" next_var . . . . . . : 0x%x", ptr_var->next_var); + log_printf (" prev_var . . . . . . : 0x%lx", ptr_var->prev_var); + log_printf (" next_var . . . . . . : 0x%lx", ptr_var->next_var); } } } diff --git a/src/core/wee-list.c b/src/core/wee-list.c index a261cdbbc..e6917b4a8 100644 --- a/src/core/wee-list.c +++ b/src/core/wee-list.c @@ -389,13 +389,13 @@ weelist_print_log (struct t_weelist *weelist, const char *name) { struct t_weelist_item *ptr_item; - log_printf ("[%s (addr:0x%x)]", name, weelist); + log_printf ("[%s (addr:0x%lx)]", name, weelist); for (ptr_item = weelist->items; ptr_item; ptr_item = ptr_item->next_item) { - log_printf (" data . . . . . . . . . : '%s'", ptr_item->data); - log_printf (" prev_item. . . . . . . : 0x%x", ptr_item->prev_item); - log_printf (" next_item. . . . . . . : 0x%x", ptr_item->next_item); + log_printf (" data . . . . . . . . . : '%s'", ptr_item->data); + log_printf (" prev_item. . . . . . . : 0x%lx", ptr_item->prev_item); + log_printf (" next_item. . . . . . . : 0x%lx", ptr_item->next_item); } } diff --git a/src/core/wee-network.c b/src/core/wee-network.c index d87862d25..592a4a093 100644 --- a/src/core/wee-network.c +++ b/src/core/wee-network.c @@ -692,7 +692,7 @@ network_connect_child (struct t_hook *hook_connect) if (status_ok_with_address) { snprintf (status_ok_with_address, length, "%s%05d%s", - status_str, strlen (ptr_address), ptr_address); + status_str, (int)strlen (ptr_address), ptr_address); } } diff --git a/src/gui/curses/gui-curses-bar.c b/src/gui/curses/gui-curses-bar.c index a44c448fb..98032984f 100644 --- a/src/gui/curses/gui-curses-bar.c +++ b/src/gui/curses/gui-curses-bar.c @@ -1462,21 +1462,21 @@ void gui_bar_window_print_log (struct t_gui_bar_window *bar_window) { log_printf (""); - log_printf (" [window bar (addr:0x%x)]", bar_window); - log_printf (" bar . . . . . . . : 0x%x ('%s')", + log_printf (" [window bar (addr:0x%lx)]", bar_window); + log_printf (" bar . . . . . . . : 0x%lx ('%s')", bar_window->bar, (bar_window->bar) ? bar_window->bar->name : ""); - log_printf (" x . . . . . . . . : %d", bar_window->x); - log_printf (" y . . . . . . . . : %d", bar_window->y); - log_printf (" width . . . . . . : %d", bar_window->width); - log_printf (" height. . . . . . : %d", bar_window->height); - log_printf (" scroll_x. . . . . : %d", bar_window->scroll_x); - log_printf (" scroll_y. . . . . : %d", bar_window->scroll_y); - log_printf (" cursor_x. . . . . : %d", bar_window->cursor_x); - log_printf (" cursor_y. . . . . : %d", bar_window->cursor_y); - log_printf (" current_size. . . : %d", bar_window->current_size); - log_printf (" win_bar . . . . . : 0x%x", bar_window->win_bar); - log_printf (" win_separator . . : 0x%x", bar_window->win_separator); - log_printf (" prev_bar_window . : 0x%x", bar_window->prev_bar_window); - log_printf (" next_bar_window . : 0x%x", bar_window->next_bar_window); + log_printf (" x . . . . . . . . : %d", bar_window->x); + log_printf (" y . . . . . . . . : %d", bar_window->y); + log_printf (" width . . . . . . : %d", bar_window->width); + log_printf (" height. . . . . . : %d", bar_window->height); + log_printf (" scroll_x. . . . . : %d", bar_window->scroll_x); + log_printf (" scroll_y. . . . . : %d", bar_window->scroll_y); + log_printf (" cursor_x. . . . . : %d", bar_window->cursor_x); + log_printf (" cursor_y. . . . . : %d", bar_window->cursor_y); + log_printf (" current_size. . . : %d", bar_window->current_size); + log_printf (" win_bar . . . . . : 0x%lx", bar_window->win_bar); + log_printf (" win_separator . . : 0x%lx", bar_window->win_separator); + log_printf (" prev_bar_window . : 0x%lx", bar_window->prev_bar_window); + log_printf (" next_bar_window . : 0x%lx", bar_window->next_bar_window); } diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c index af2f96c67..defe8e3f1 100644 --- a/src/gui/curses/gui-curses-window.c +++ b/src/gui/curses/gui-curses-window.c @@ -1447,10 +1447,10 @@ gui_window_objects_print_log (struct t_gui_window *window) log_printf (""); log_printf (" window specific objects:"); - log_printf (" win_chat. . . . . . : 0x%x", GUI_CURSES(window)->win_chat); - log_printf (" win_separator . . . : 0x%x", GUI_CURSES(window)->win_separator); - log_printf (" bar_windows . . . . : 0x%x", GUI_CURSES(window)->bar_windows); - log_printf (" last_bar_windows. . : 0x%x", GUI_CURSES(window)->last_bar_window); + log_printf (" win_chat. . . . . . : 0x%lx", GUI_CURSES(window)->win_chat); + log_printf (" win_separator . . . : 0x%lx", GUI_CURSES(window)->win_separator); + log_printf (" bar_windows . . . . : 0x%lx", GUI_CURSES(window)->bar_windows); + log_printf (" last_bar_windows. . : 0x%lx", GUI_CURSES(window)->last_bar_window); for (ptr_bar_win = GUI_CURSES(window)->bar_windows; ptr_bar_win; ptr_bar_win = ptr_bar_win->next_bar_window) diff --git a/src/gui/gtk/gui-gtk-bar.c b/src/gui/gtk/gui-gtk-bar.c index f07f2cceb..bab0c2a2e 100644 --- a/src/gui/gtk/gui-gtk-bar.c +++ b/src/gui/gtk/gui-gtk-bar.c @@ -431,14 +431,14 @@ void gui_bar_window_print_log (struct t_gui_bar_window *bar_window) { log_printf (""); - log_printf (" [window bar (addr:0x%x)]", bar_window); - log_printf (" bar . . . . . . . : 0x%x", bar_window->bar); - log_printf (" x . . . . . . . . : %d", bar_window->x); - log_printf (" y . . . . . . . . : %d", bar_window->y); - log_printf (" width . . . . . . : %d", bar_window->width); - log_printf (" height. . . . . . : %d", bar_window->height); - log_printf (" scroll_x. . . . . : %d", bar_window->scroll_x); - log_printf (" scroll_y. . . . . : %d", bar_window->scroll_y); - log_printf (" prev_bar_window . : 0x%x", bar_window->prev_bar_window); - log_printf (" next_bar_window . : 0x%x", bar_window->next_bar_window); + log_printf (" [window bar (addr:0x%lx)]", bar_window); + log_printf (" bar . . . . . . . : 0x%lx", bar_window->bar); + log_printf (" x . . . . . . . . : %d", bar_window->x); + log_printf (" y . . . . . . . . : %d", bar_window->y); + log_printf (" width . . . . . . : %d", bar_window->width); + log_printf (" height. . . . . . : %d", bar_window->height); + log_printf (" scroll_x. . . . . : %d", bar_window->scroll_x); + log_printf (" scroll_y. . . . . : %d", bar_window->scroll_y); + log_printf (" prev_bar_window . : 0x%lx", bar_window->prev_bar_window); + log_printf (" next_bar_window . : 0x%lx", bar_window->next_bar_window); } diff --git a/src/gui/gtk/gui-gtk-window.c b/src/gui/gtk/gui-gtk-window.c index 2872c54d0..01a2fa31f 100644 --- a/src/gui/gtk/gui-gtk-window.c +++ b/src/gui/gtk/gui-gtk-window.c @@ -813,25 +813,25 @@ gui_window_objects_print_log (struct t_gui_window *window) { struct t_gui_bar_window *ptr_bar_win; - log_printf (" textview_chat . . . : 0x%x", GUI_GTK(window)->textview_chat); - log_printf (" textbuffer_chat . . : 0x%x", GUI_GTK(window)->textbuffer_chat); - log_printf (" texttag_chat. . . . : 0x%x", GUI_GTK(window)->texttag_chat); - log_printf (" bar_windows . . . . : 0x%x", GUI_GTK(window)->bar_windows); - log_printf (" last_bar_windows. . : 0x%x", GUI_GTK(window)->last_bar_window); - log_printf (" current_style_fg. . : %d", GUI_GTK(window)->current_style_fg); - log_printf (" current_style_bg. . : %d", GUI_GTK(window)->current_style_bg); - log_printf (" current_style_attr. : %d", GUI_GTK(window)->current_style_attr); - log_printf (" current_color_attr. : %d", GUI_GTK(window)->current_color_attr); + log_printf (" textview_chat . . . : 0x%lx", GUI_GTK(window)->textview_chat); + log_printf (" textbuffer_chat . . : 0x%lx", GUI_GTK(window)->textbuffer_chat); + log_printf (" texttag_chat. . . . : 0x%lx", GUI_GTK(window)->texttag_chat); + log_printf (" bar_windows . . . . : 0x%lx", GUI_GTK(window)->bar_windows); + log_printf (" last_bar_windows. . : 0x%lx", GUI_GTK(window)->last_bar_window); + log_printf (" current_style_fg. . : %d", GUI_GTK(window)->current_style_fg); + log_printf (" current_style_bg. . : %d", GUI_GTK(window)->current_style_bg); + log_printf (" current_style_attr. : %d", GUI_GTK(window)->current_style_attr); + log_printf (" current_color_attr. : %d", GUI_GTK(window)->current_color_attr); for (ptr_bar_win = GUI_GTK(window)->bar_windows; ptr_bar_win; ptr_bar_win = ptr_bar_win->next_bar_window) { log_printf (""); - log_printf (" [window bar (addr:0x%x)]", ptr_bar_win); - log_printf (" bar . . . . . . . : 0x%x", ptr_bar_win->bar); - log_printf (" x . . . . . . . . : %d", ptr_bar_win->x); - log_printf (" y . . . . . . . . : %d", ptr_bar_win->y); - log_printf (" width . . . . . . : %d", ptr_bar_win->width); - log_printf (" height. . . . . . : %d", ptr_bar_win->height); + log_printf (" [window bar (addr:0x%lx)]", ptr_bar_win); + log_printf (" bar . . . . . . . : 0x%lx", ptr_bar_win->bar); + log_printf (" x . . . . . . . . : %d", ptr_bar_win->x); + log_printf (" y . . . . . . . . : %d", ptr_bar_win->y); + log_printf (" width . . . . . . : %d", ptr_bar_win->width); + log_printf (" height. . . . . . : %d", ptr_bar_win->height); } } diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c index 087d46147..79ca1797c 100644 --- a/src/gui/gui-bar-item.c +++ b/src/gui/gui-bar-item.c @@ -740,9 +740,9 @@ gui_bar_item_default_input_text (void *data, struct t_gui_bar_item *item, if (!window) window = gui_current_window; - + snprintf (str_buffer, sizeof (str_buffer), - "0x%x", (unsigned int)(window->buffer)); + "0x%lx", (long unsigned int)(window->buffer)); new_input = hook_modifier_exec (NULL, "weechat_input_text_display", @@ -1453,13 +1453,13 @@ gui_bar_item_print_log () for (ptr_item = gui_bar_items; ptr_item; ptr_item = ptr_item->next_item) { log_printf (""); - log_printf ("[bar item (addr:0x%x)]", ptr_item); - log_printf (" plugin . . . . . . . . : 0x%x ('%s')", + log_printf ("[bar item (addr:0x%lx)]", ptr_item); + log_printf (" plugin . . . . . . . . : 0x%lx ('%s')", ptr_item->plugin, plugin_get_name (ptr_item->plugin)); - log_printf (" name . . . . . . . . . : '%s'", ptr_item->name); - log_printf (" build_callback . . . . : 0x%x", ptr_item->build_callback); - log_printf (" build_callback_data. . : 0x%x", ptr_item->build_callback_data); - log_printf (" prev_item. . . . . . . : 0x%x", ptr_item->prev_item); - log_printf (" next_item. . . . . . . : 0x%x", ptr_item->next_item); + log_printf (" name . . . . . . . . . : '%s'", ptr_item->name); + log_printf (" build_callback . . . . : 0x%lx", ptr_item->build_callback); + log_printf (" build_callback_data. . : 0x%lx", ptr_item->build_callback_data); + log_printf (" prev_item. . . . . . . : 0x%lx", ptr_item->prev_item); + log_printf (" next_item. . . . . . . : 0x%lx", ptr_item->next_item); } } diff --git a/src/gui/gui-bar.c b/src/gui/gui-bar.c index d4e79d671..1bb43d897 100644 --- a/src/gui/gui-bar.c +++ b/src/gui/gui-bar.c @@ -1990,18 +1990,18 @@ gui_bar_print_log () for (ptr_bar = gui_bars; ptr_bar; ptr_bar = ptr_bar->next_bar) { log_printf (""); - log_printf ("[bar (addr:0x%x)]", ptr_bar); - log_printf (" plugin . . . . . . . . : 0x%x ('%s')", + log_printf ("[bar (addr:0x%lx)]", ptr_bar); + log_printf (" plugin . . . . . . . . : 0x%lx ('%s')", ptr_bar->plugin, plugin_get_name (ptr_bar->plugin)); - log_printf (" name . . . . . . . . . : '%s'", ptr_bar->name); - log_printf (" hidden . . . . . . . . : %d", CONFIG_INTEGER(ptr_bar->hidden)); - log_printf (" priority . . . . . . . : %d", CONFIG_INTEGER(ptr_bar->priority)); + log_printf (" name . . . . . . . . . : '%s'", ptr_bar->name); + log_printf (" hidden . . . . . . . . : %d", CONFIG_INTEGER(ptr_bar->hidden)); + log_printf (" priority . . . . . . . : %d", CONFIG_INTEGER(ptr_bar->priority)); log_printf (" type . . . . . . . . . : %d (%s)", CONFIG_INTEGER(ptr_bar->type), gui_bar_type_string[CONFIG_INTEGER(ptr_bar->type)]); - log_printf (" conditions . . . . . . : '%s'", CONFIG_STRING(ptr_bar->conditions)); - log_printf (" conditions_count . . . : %d", ptr_bar->conditions_count); - log_printf (" conditions_array . . . : 0x%x", ptr_bar->conditions_array); + log_printf (" conditions . . . . . . : '%s'", CONFIG_STRING(ptr_bar->conditions)); + log_printf (" conditions_count . . . : %d", ptr_bar->conditions_count); + log_printf (" conditions_array . . . : 0x%lx", ptr_bar->conditions_array); log_printf (" position . . . . . . . : %d (%s)", CONFIG_INTEGER(ptr_bar->position), gui_bar_position_string[CONFIG_INTEGER(ptr_bar->position)]); @@ -2011,8 +2011,8 @@ gui_bar_print_log () log_printf (" filling_left_right . . : %d (%s)", CONFIG_INTEGER(ptr_bar->filling_left_right), gui_bar_filling_string[CONFIG_INTEGER(ptr_bar->filling_left_right)]); - log_printf (" size . . . . . . . . . : %d", CONFIG_INTEGER(ptr_bar->size)); - log_printf (" size_max . . . . . . . : %d", CONFIG_INTEGER(ptr_bar->size_max)); + log_printf (" size . . . . . . . . . : %d", CONFIG_INTEGER(ptr_bar->size)); + log_printf (" size_max . . . . . . . : %d", CONFIG_INTEGER(ptr_bar->size_max)); log_printf (" color_fg . . . . . . . : %d", CONFIG_COLOR(ptr_bar->color_fg), gui_color_get_name (CONFIG_COLOR(ptr_bar->color_fg))); @@ -2022,13 +2022,13 @@ gui_bar_print_log () log_printf (" color_bg . . . . . . . : %d", CONFIG_COLOR(ptr_bar->color_bg), gui_color_get_name (CONFIG_COLOR(ptr_bar->color_bg))); - log_printf (" separator. . . . . . . : %d", CONFIG_INTEGER(ptr_bar->separator)); - log_printf (" items. . . . . . . . . : '%s'", CONFIG_STRING(ptr_bar->items)); - log_printf (" items_count. . . . . . : %d", ptr_bar->items_count); - log_printf (" items_array. . . . . . : 0x%x", ptr_bar->items_array); - log_printf (" bar_window . . . . . . : 0x%x", ptr_bar->bar_window); - log_printf (" prev_bar . . . . . . . : 0x%x", ptr_bar->prev_bar); - log_printf (" next_bar . . . . . . . : 0x%x", ptr_bar->next_bar); + log_printf (" separator. . . . . . . : %d", CONFIG_INTEGER(ptr_bar->separator)); + log_printf (" items. . . . . . . . . : '%s'", CONFIG_STRING(ptr_bar->items)); + log_printf (" items_count. . . . . . : %d", ptr_bar->items_count); + log_printf (" items_array. . . . . . : 0x%lx", ptr_bar->items_array); + log_printf (" bar_window . . . . . . : 0x%lx", ptr_bar->bar_window); + log_printf (" prev_bar . . . . . . . : 0x%lx", ptr_bar->prev_bar); + log_printf (" next_bar . . . . . . . : 0x%lx", ptr_bar->next_bar); if (ptr_bar->bar_window) gui_bar_window_print_log (ptr_bar->bar_window); diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c index 152ad0d5d..9a3db33bb 100644 --- a/src/gui/gui-buffer.c +++ b/src/gui/gui-buffer.c @@ -1600,7 +1600,7 @@ gui_buffer_dump_hexa (struct t_gui_buffer *buffer) char hexa[(16 * 3) + 1], ascii[(16 * 2) + 1]; int hexa_pos, ascii_pos; - log_printf ("[buffer dump hexa (addr:0x%x)]", buffer); + log_printf ("[buffer dump hexa (addr:0x%lx)]", buffer); num_line = 1; for (ptr_line = buffer->lines; ptr_line; ptr_line = ptr_line->next_line) { @@ -1671,65 +1671,65 @@ gui_buffer_print_log () ptr_buffer = ptr_buffer->next_buffer) { log_printf (""); - log_printf ("[buffer (addr:0x%x)]", ptr_buffer); - log_printf (" plugin . . . . . . . . : 0x%x ('%s')", + log_printf ("[buffer (addr:0x%lx)]", ptr_buffer); + log_printf (" plugin . . . . . . . . : 0x%lx ('%s')", ptr_buffer->plugin, plugin_get_name (ptr_buffer->plugin)); - log_printf (" plugin_name_for_upgrade: '%s'", ptr_buffer->plugin_name_for_upgrade); - log_printf (" number . . . . . . . . : %d", ptr_buffer->number); - log_printf (" layout_number. . . . . : %d", ptr_buffer->layout_number); - log_printf (" name . . . . . . . . . : '%s'", ptr_buffer->name); - log_printf (" short_name . . . . . . : '%s'", ptr_buffer->short_name); - log_printf (" type . . . . . . . . . : %d", ptr_buffer->type); - log_printf (" notify . . . . . . . . : %d", ptr_buffer->notify); - log_printf (" num_displayed. . . . . : %d", ptr_buffer->num_displayed); - log_printf (" close_callback . . . . : 0x%x", ptr_buffer->close_callback); - log_printf (" close_callback_data. . : 0x%x", ptr_buffer->close_callback_data); - log_printf (" title. . . . . . . . . : '%s'", ptr_buffer->title); - log_printf (" lines. . . . . . . . . : 0x%x", ptr_buffer->lines); - log_printf (" last_line. . . . . . . : 0x%x", ptr_buffer->last_line); - log_printf (" last_read_line . . . . : 0x%x", ptr_buffer->last_read_line); - log_printf (" lines_count. . . . . . : %d", ptr_buffer->lines_count); - log_printf (" lines_hidden . . . . . : %d", ptr_buffer->lines_hidden); - log_printf (" prefix_max_length. . . : %d", ptr_buffer->prefix_max_length); - log_printf (" chat_refresh_needed. . : %d", ptr_buffer->chat_refresh_needed); - log_printf (" nicklist . . . . . . . : %d", ptr_buffer->nicklist); - log_printf (" nicklist_case_sensitive: %d", ptr_buffer->nicklist_case_sensitive); - log_printf (" nicklist_root. . . . . : 0x%x", ptr_buffer->nicklist_root); - log_printf (" nicklist_max_length. . : %d", ptr_buffer->nicklist_max_length); - log_printf (" nicklist_display_groups: %d", ptr_buffer->nicklist_display_groups); - log_printf (" nicklist_visible_count.: %d", ptr_buffer->nicklist_visible_count); - log_printf (" input. . . . . . . . . : %d", ptr_buffer->input); - log_printf (" input_callback . . . . : 0x%x", ptr_buffer->input_callback); - log_printf (" input_callback_data. . : 0x%x", ptr_buffer->input_callback_data); - log_printf (" input_buffer . . . . . : '%s'", ptr_buffer->input_buffer); - log_printf (" input_buffer_alloc . . : %d", ptr_buffer->input_buffer_alloc); - log_printf (" input_buffer_size. . . : %d", ptr_buffer->input_buffer_size); - log_printf (" input_buffer_length. . : %d", ptr_buffer->input_buffer_length); - log_printf (" input_buffer_pos . . . : %d", ptr_buffer->input_buffer_pos); - log_printf (" input_buffer_1st_disp. : %d", ptr_buffer->input_buffer_1st_display); - log_printf (" input_refresh_needed . : %d", ptr_buffer->input_refresh_needed); - log_printf (" completion . . . . . . : 0x%x", ptr_buffer->completion); - log_printf (" history. . . . . . . . : 0x%x", ptr_buffer->history); - log_printf (" last_history . . . . . : 0x%x", ptr_buffer->last_history); - log_printf (" ptr_history. . . . . . : 0x%x", ptr_buffer->ptr_history); - log_printf (" num_history. . . . . . : %d", ptr_buffer->num_history); - log_printf (" text_search. . . . . . : %d", ptr_buffer->text_search); - log_printf (" text_search_exact. . . : %d", ptr_buffer->text_search_exact); - log_printf (" text_search_found. . . : %d", ptr_buffer->text_search_found); - log_printf (" text_search_input. . . : '%s'", ptr_buffer->text_search_input); - log_printf (" highlight_words. . . . : '%s'", ptr_buffer->highlight_words); - log_printf (" highlight_tags . . . . : '%s'", ptr_buffer->highlight_tags); - log_printf (" highlight_tags_count . : %d", ptr_buffer->highlight_tags_count); - log_printf (" highlight_tags_array . : 0x%x", ptr_buffer->highlight_tags_array); - log_printf (" keys . . . . . . . . . : 0x%x", ptr_buffer->keys); - log_printf (" last_key . . . . . . . : 0x%x", ptr_buffer->last_key); - log_printf (" prev_buffer. . . . . . : 0x%x", ptr_buffer->prev_buffer); - log_printf (" next_buffer. . . . . . : 0x%x", ptr_buffer->next_buffer); + log_printf (" plugin_name_for_upgrade: '%s'", ptr_buffer->plugin_name_for_upgrade); + log_printf (" number . . . . . . . . : %d", ptr_buffer->number); + log_printf (" layout_number. . . . . : %d", ptr_buffer->layout_number); + log_printf (" name . . . . . . . . . : '%s'", ptr_buffer->name); + log_printf (" short_name . . . . . . : '%s'", ptr_buffer->short_name); + log_printf (" type . . . . . . . . . : %d", ptr_buffer->type); + log_printf (" notify . . . . . . . . : %d", ptr_buffer->notify); + log_printf (" num_displayed. . . . . : %d", ptr_buffer->num_displayed); + log_printf (" close_callback . . . . : 0x%lx", ptr_buffer->close_callback); + log_printf (" close_callback_data. . : 0x%lx", ptr_buffer->close_callback_data); + log_printf (" title. . . . . . . . . : '%s'", ptr_buffer->title); + log_printf (" lines. . . . . . . . . : 0x%lx", ptr_buffer->lines); + log_printf (" last_line. . . . . . . : 0x%lx", ptr_buffer->last_line); + log_printf (" last_read_line . . . . : 0x%lx", ptr_buffer->last_read_line); + log_printf (" lines_count. . . . . . : %d", ptr_buffer->lines_count); + log_printf (" lines_hidden . . . . . : %d", ptr_buffer->lines_hidden); + log_printf (" prefix_max_length. . . : %d", ptr_buffer->prefix_max_length); + log_printf (" chat_refresh_needed. . : %d", ptr_buffer->chat_refresh_needed); + log_printf (" nicklist . . . . . . . : %d", ptr_buffer->nicklist); + log_printf (" nicklist_case_sensitive: %d", ptr_buffer->nicklist_case_sensitive); + log_printf (" nicklist_root. . . . . : 0x%lx", ptr_buffer->nicklist_root); + log_printf (" nicklist_max_length. . : %d", ptr_buffer->nicklist_max_length); + log_printf (" nicklist_display_groups: %d", ptr_buffer->nicklist_display_groups); + log_printf (" nicklist_visible_count.: %d", ptr_buffer->nicklist_visible_count); + log_printf (" input. . . . . . . . . : %d", ptr_buffer->input); + log_printf (" input_callback . . . . : 0x%lx", ptr_buffer->input_callback); + log_printf (" input_callback_data. . : 0x%lx", ptr_buffer->input_callback_data); + log_printf (" input_buffer . . . . . : '%s'", ptr_buffer->input_buffer); + log_printf (" input_buffer_alloc . . : %d", ptr_buffer->input_buffer_alloc); + log_printf (" input_buffer_size. . . : %d", ptr_buffer->input_buffer_size); + log_printf (" input_buffer_length. . : %d", ptr_buffer->input_buffer_length); + log_printf (" input_buffer_pos . . . : %d", ptr_buffer->input_buffer_pos); + log_printf (" input_buffer_1st_disp. : %d", ptr_buffer->input_buffer_1st_display); + log_printf (" input_refresh_needed . : %d", ptr_buffer->input_refresh_needed); + log_printf (" completion . . . . . . : 0x%lx", ptr_buffer->completion); + log_printf (" history. . . . . . . . : 0x%lx", ptr_buffer->history); + log_printf (" last_history . . . . . : 0x%lx", ptr_buffer->last_history); + log_printf (" ptr_history. . . . . . : 0x%lx", ptr_buffer->ptr_history); + log_printf (" num_history. . . . . . : %d", ptr_buffer->num_history); + log_printf (" text_search. . . . . . : %d", ptr_buffer->text_search); + log_printf (" text_search_exact. . . : %d", ptr_buffer->text_search_exact); + log_printf (" text_search_found. . . : %d", ptr_buffer->text_search_found); + log_printf (" text_search_input. . . : '%s'", ptr_buffer->text_search_input); + log_printf (" highlight_words. . . . : '%s'", ptr_buffer->highlight_words); + log_printf (" highlight_tags . . . . : '%s'", ptr_buffer->highlight_tags); + log_printf (" highlight_tags_count . : %d", ptr_buffer->highlight_tags_count); + log_printf (" highlight_tags_array . : 0x%lx", ptr_buffer->highlight_tags_array); + log_printf (" keys . . . . . . . . . : 0x%lx", ptr_buffer->keys); + log_printf (" last_key . . . . . . . : 0x%lx", ptr_buffer->last_key); + log_printf (" prev_buffer. . . . . . : 0x%lx", ptr_buffer->prev_buffer); + log_printf (" next_buffer. . . . . . : 0x%lx", ptr_buffer->next_buffer); if (ptr_buffer->keys) { log_printf (""); - log_printf (" => keys = 0x%x, last_key = 0x%x:", + log_printf (" => keys = 0x%lx, last_key = 0x%lx:", ptr_buffer->keys, ptr_buffer->last_key); gui_keyboard_print_log (ptr_buffer); } @@ -1737,13 +1737,13 @@ gui_buffer_print_log () if (ptr_buffer->local_variables) { log_printf (""); - log_printf (" => local_variables = 0x%x, last_local_var = 0x%x:", + log_printf (" => local_variables = 0x%lx, last_local_var = 0x%lx:", ptr_buffer->local_variables, ptr_buffer->last_local_var); for (ptr_local_var = ptr_buffer->local_variables; ptr_local_var; ptr_local_var = ptr_local_var->next_var) { log_printf (""); - log_printf (" [local variable (addr:0x%x)]", + log_printf (" [local variable (addr:0x%lx)]", ptr_local_var); log_printf (" name . . . . . . . : '%s'", ptr_local_var->name); log_printf (" value. . . . . . . : '%s'", ptr_local_var->value); @@ -1751,7 +1751,7 @@ gui_buffer_print_log () } log_printf (""); - log_printf (" => nicklist_root (addr:0x%x):", ptr_buffer->nicklist_root); + log_printf (" => nicklist_root (addr:0x%lx):", ptr_buffer->nicklist_root); gui_nicklist_print_log (ptr_buffer->nicklist_root, 0); log_printf (""); diff --git a/src/gui/gui-completion.c b/src/gui/gui-completion.c index f5dcf2bf5..c150b8b8c 100644 --- a/src/gui/gui-completion.c +++ b/src/gui/gui-completion.c @@ -1628,24 +1628,24 @@ gui_completion_search (struct t_gui_completion *completion, int direction, void gui_completion_print_log (struct t_gui_completion *completion) { - log_printf ("[completion (addr:0x%x)]", completion); - log_printf (" buffer. . . . . . . . . : 0x%x", completion->buffer); - log_printf (" context . . . . . . . . : %d", completion->context); - log_printf (" base_command. . . . . . : '%s'", completion->base_command); - log_printf (" base_command_arg. . . . : %d", completion->base_command_arg); - log_printf (" arg_is_nick . . . . . . : %d", completion->arg_is_nick); - log_printf (" base_word . . . . . . . : '%s'", completion->base_word); - log_printf (" base_word_pos . . . . . : %d", completion->base_word_pos); - log_printf (" position. . . . . . . . : %d", completion->position); - log_printf (" args. . . . . . . . . . : '%s'", completion->args); - log_printf (" direction . . . . . . . : %d", completion->direction); - log_printf (" add_space . . . . . . . : %d", completion->add_space); - log_printf (" force_partial_completion: %d", completion->force_partial_completion); - log_printf (" completion_list . . . . : 0x%x", completion->completion_list); - log_printf (" word_found. . . . . . . : '%s'", completion->word_found); - log_printf (" position_replace. . . . : %d", completion->position_replace); - log_printf (" diff_size . . . . . . . : %d", completion->diff_size); - log_printf (" diff_length . . . . . . : %d", completion->diff_length); + log_printf ("[completion (addr:0x%lx)]", completion); + log_printf (" buffer. . . . . . . . . : 0x%lx", completion->buffer); + log_printf (" context . . . . . . . . : %d", completion->context); + log_printf (" base_command. . . . . . : '%s'", completion->base_command); + log_printf (" base_command_arg. . . . : %d", completion->base_command_arg); + log_printf (" arg_is_nick . . . . . . : %d", completion->arg_is_nick); + log_printf (" base_word . . . . . . . : '%s'", completion->base_word); + log_printf (" base_word_pos . . . . . : %d", completion->base_word_pos); + log_printf (" position. . . . . . . . : %d", completion->position); + log_printf (" args. . . . . . . . . . : '%s'", completion->args); + log_printf (" direction . . . . . . . : %d", completion->direction); + log_printf (" add_space . . . . . . . : %d", completion->add_space); + log_printf (" force_partial_completion: %d", completion->force_partial_completion); + log_printf (" completion_list . . . . : 0x%lx", completion->completion_list); + log_printf (" word_found. . . . . . . : '%s'", completion->word_found); + log_printf (" position_replace. . . . : %d", completion->position_replace); + log_printf (" diff_size . . . . . . . : %d", completion->diff_size); + log_printf (" diff_length . . . . . . : %d", completion->diff_length); if (completion->completion_list) { log_printf (""); diff --git a/src/gui/gui-filter.c b/src/gui/gui-filter.c index a2e841ea6..c79e84f7d 100644 --- a/src/gui/gui-filter.c +++ b/src/gui/gui-filter.c @@ -521,15 +521,15 @@ gui_filter_print_log () ptr_filter = ptr_filter->next_filter) { log_printf (""); - log_printf ("[filter (addr:0x%x)]", ptr_filter); - log_printf (" enabled. . . . . . . . : %d", ptr_filter->enabled); - log_printf (" name . . . . . . . . . : '%s'", ptr_filter->name); - log_printf (" buffer . . . . . . . . : '%s'", ptr_filter->buffer); - log_printf (" tags . . . . . . . . . : '%s'", ptr_filter->tags); - log_printf (" regex. . . . . . . . . : '%s'", ptr_filter->regex); - log_printf (" regex_prefix . . . . . : 0x%x", ptr_filter->regex_prefix); - log_printf (" regex_message. . . . . : 0x%x", ptr_filter->regex_message); - log_printf (" prev_filter. . . . . . : 0x%x", ptr_filter->prev_filter); - log_printf (" next_filter. . . . . . : 0x%x", ptr_filter->next_filter); + log_printf ("[filter (addr:0x%lx)]", ptr_filter); + log_printf (" enabled. . . . . . . . : %d", ptr_filter->enabled); + log_printf (" name . . . . . . . . . : '%s'", ptr_filter->name); + log_printf (" buffer . . . . . . . . : '%s'", ptr_filter->buffer); + log_printf (" tags . . . . . . . . . : '%s'", ptr_filter->tags); + log_printf (" regex. . . . . . . . . : '%s'", ptr_filter->regex); + log_printf (" regex_prefix . . . . . : 0x%lx", ptr_filter->regex_prefix); + log_printf (" regex_message. . . . . : 0x%lx", ptr_filter->regex_message); + log_printf (" prev_filter. . . . . . : 0x%lx", ptr_filter->prev_filter); + log_printf (" next_filter. . . . . . : 0x%lx", ptr_filter->next_filter); } } diff --git a/src/gui/gui-hotlist.c b/src/gui/gui-hotlist.c index ebc3f6544..ffd3c7896 100644 --- a/src/gui/gui-hotlist.c +++ b/src/gui/gui-hotlist.c @@ -467,13 +467,13 @@ gui_hotlist_print_log () for (ptr_hotlist = gui_hotlist; ptr_hotlist; ptr_hotlist = ptr_hotlist->next_hotlist) { - log_printf ("[hotlist (addr:0x%x)]", ptr_hotlist); - log_printf (" priority . . . . . . . : %d", ptr_hotlist->priority); + log_printf ("[hotlist (addr:0x%lx)]", ptr_hotlist); + log_printf (" priority . . . . . . . : %d", ptr_hotlist->priority); log_printf (" creation_time. . . . . : tv_sec:%d, tv_usec:%d", ptr_hotlist->creation_time.tv_sec, ptr_hotlist->creation_time.tv_usec); - log_printf (" buffer . . . . . . . . : 0x%x", ptr_hotlist->buffer); - log_printf (" prev_hotlist . . . . . : 0x%x", ptr_hotlist->prev_hotlist); - log_printf (" next_hotlist . . . . . : 0x%x", ptr_hotlist->next_hotlist); + log_printf (" buffer . . . . . . . . : 0x%lx", ptr_hotlist->buffer); + log_printf (" prev_hotlist . . . . . : 0x%lx", ptr_hotlist->prev_hotlist); + log_printf (" next_hotlist . . . . . : 0x%lx", ptr_hotlist->next_hotlist); } } diff --git a/src/gui/gui-keyboard.c b/src/gui/gui-keyboard.c index 50803952a..0779fdac4 100644 --- a/src/gui/gui-keyboard.c +++ b/src/gui/gui-keyboard.c @@ -681,10 +681,10 @@ gui_keyboard_print_log (struct t_gui_buffer *buffer) ptr_key = ptr_key->next_key) { log_printf (""); - log_printf ("%s[key (addr:0x%x)]", prefix, ptr_key); - log_printf ("%skey. . . . . . . . . : '%s'", prefix, ptr_key->key); - log_printf ("%scommand. . . . . . . : '%s'", prefix, ptr_key->command); - log_printf ("%sprev_key . . . . . . : 0x%x", prefix, ptr_key->prev_key); - log_printf ("%snext_key . . . . . . : 0x%x", prefix, ptr_key->next_key); + log_printf ("%s[key (addr:0x%lx)]", prefix, ptr_key); + log_printf ("%skey. . . . . . . . . : '%s'", prefix, ptr_key->key); + log_printf ("%scommand. . . . . . . : '%s'", prefix, ptr_key->command); + log_printf ("%sprev_key . . . . . . : 0x%lx", prefix, ptr_key->prev_key); + log_printf ("%snext_key . . . . . . : 0x%lx", prefix, ptr_key->next_key); } } diff --git a/src/gui/gui-layout.c b/src/gui/gui-layout.c index 762d19f2f..658e89d71 100644 --- a/src/gui/gui-layout.c +++ b/src/gui/gui-layout.c @@ -562,19 +562,19 @@ gui_layout_print_log_window (struct t_gui_layout_window *layout_window, int level) { log_printf (""); - log_printf ("[layout window (addr:0x%x) (%s) (level %d)]", + log_printf ("[layout window (addr:0x%lx) (%s) (level %d)]", layout_window, (layout_window->plugin_name) ? "leaf" : "node", level); - log_printf (" internal_id. . . . . . : %d", layout_window->internal_id); - log_printf (" parent_node. . . . . . : 0x%x", layout_window->parent_node); - log_printf (" split_pct. . . . . . . : %d", layout_window->split_pct); - log_printf (" split_horiz. . . . . . : %d", layout_window->split_horiz); - log_printf (" child1 . . . . . . . . : 0x%x", layout_window->child1); - log_printf (" child2 . . . . . . . . : 0x%x", layout_window->child2); - log_printf (" plugin_name. . . . . . : '%s'", layout_window->plugin_name); - log_printf (" buffer_name. . . . . . : '%s'", layout_window->buffer_name); + log_printf (" internal_id. . . . . . : %d", layout_window->internal_id); + log_printf (" parent_node. . . . . . : 0x%lx", layout_window->parent_node); + log_printf (" split_pct. . . . . . . : %d", layout_window->split_pct); + log_printf (" split_horiz. . . . . . : %d", layout_window->split_horiz); + log_printf (" child1 . . . . . . . . : 0x%lx", layout_window->child1); + log_printf (" child2 . . . . . . . . : 0x%lx", layout_window->child2); + log_printf (" plugin_name. . . . . . : '%s'", layout_window->plugin_name); + log_printf (" buffer_name. . . . . . : '%s'", layout_window->buffer_name); if (layout_window->child1) gui_layout_print_log_window (layout_window->child1, level + 1); @@ -598,12 +598,12 @@ gui_layout_print_log () ptr_layout_buffer = ptr_layout_buffer->next_layout) { log_printf (""); - log_printf ("[layout buffer (addr:0x%x)]", ptr_layout_buffer); - log_printf (" plugin_name. . . . . . : '%s'", ptr_layout_buffer->plugin_name); - log_printf (" buffer_name. . . . . . : '%s'", ptr_layout_buffer->buffer_name); - log_printf (" number . . . . . . . . : %d", ptr_layout_buffer->number); - log_printf (" prev_layout. . . . . . : 0x%x", ptr_layout_buffer->prev_layout); - log_printf (" next_layout. . . . . . : 0x%x", ptr_layout_buffer->next_layout); + log_printf ("[layout buffer (addr:0x%lx)]", ptr_layout_buffer); + log_printf (" plugin_name. . . . . . : '%s'", ptr_layout_buffer->plugin_name); + log_printf (" buffer_name. . . . . . : '%s'", ptr_layout_buffer->buffer_name); + log_printf (" number . . . . . . . . : %d", ptr_layout_buffer->number); + log_printf (" prev_layout. . . . . . : 0x%lx", ptr_layout_buffer->prev_layout); + log_printf (" next_layout. . . . . . : 0x%lx", ptr_layout_buffer->next_layout); } if (gui_layout_windows) diff --git a/src/gui/gui-nicklist.c b/src/gui/gui-nicklist.c index b77fc96d6..1d7459397 100644 --- a/src/gui/gui-nicklist.c +++ b/src/gui/gui-nicklist.c @@ -691,7 +691,7 @@ gui_nicklist_print_log (struct t_gui_nick_group *group, int indent) struct t_gui_nick *ptr_nick; snprintf (format, sizeof (format), - "%%-%ds=> group (addr:0x%%X)", + "%%-%ds=> group (addr:0x%%lx)", (indent * 2) + 4); log_printf (format, " ", group); snprintf (format, sizeof (format), @@ -707,31 +707,31 @@ gui_nicklist_print_log (struct t_gui_nick_group *group, int indent) (indent * 2) + 6); log_printf (format, " ", group->visible); snprintf (format, sizeof (format), - "%%-%dsparent. . . : 0x%%X", + "%%-%dsparent. . . : 0x%%lx", (indent * 2) + 6); log_printf (format, " ", group->parent); snprintf (format, sizeof (format), - "%%-%dschilds. . . : 0x%%X", + "%%-%dschilds. . . : 0x%%lx", (indent * 2) + 6); log_printf (format, " ", group->childs); snprintf (format, sizeof (format), - "%%-%dslast_child. : 0x%%X", + "%%-%dslast_child. : 0x%%lx", (indent * 2) + 6); log_printf (format, " ", group->last_child); snprintf (format, sizeof (format), - "%%-%dsnicks . . . : 0x%%X", + "%%-%dsnicks . . . : 0x%%lx", (indent * 2) + 6); log_printf (format, " ", group->nicks); snprintf (format, sizeof (format), - "%%-%dslast_nick . : 0x%%X", + "%%-%dslast_nick . : 0x%%lx", (indent * 2) + 6); log_printf (format, " ", group->last_nick); snprintf (format, sizeof (format), - "%%-%dsprev_group. : 0x%%X", + "%%-%dsprev_group. : 0x%%lx", (indent * 2) + 6); log_printf (format, " ", group->prev_group); snprintf (format, sizeof (format), - "%%-%dsnext_group. : 0x%%X", + "%%-%dsnext_group. : 0x%%lx", (indent * 2) + 6); log_printf (format, " ", group->next_group); @@ -750,11 +750,11 @@ gui_nicklist_print_log (struct t_gui_nick_group *group, int indent) ptr_nick = ptr_nick->next_nick) { snprintf (format, sizeof (format), - "%%-%ds=> nick (addr:0x%%X)", + "%%-%ds=> nick (addr:0x%%lx)", (indent * 2) + 4); log_printf (format, " ", ptr_nick); snprintf (format, sizeof (format), - "%%-%dsgroup . . . . . : 0x%%X", + "%%-%dsgroup . . . . . : 0x%%lx", (indent * 2) + 6); log_printf (format, " ", ptr_nick->group); snprintf (format, sizeof (format), @@ -778,11 +778,11 @@ gui_nicklist_print_log (struct t_gui_nick_group *group, int indent) (indent * 2) + 6); log_printf (format, " ", ptr_nick->visible); snprintf (format, sizeof (format), - "%%-%dsprev_nick . . . : 0x%%X", + "%%-%dsprev_nick . . . : 0x%%lx", (indent * 2) + 6); log_printf (format, " ", ptr_nick->prev_nick); snprintf (format, sizeof (format), - "%%-%dsnext_nick . . . : 0x%%X", + "%%-%dsnext_nick . . . : 0x%%lx", (indent * 2) + 6); log_printf (format, " ", ptr_nick->next_nick); } diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c index 8611c61e6..8c9071998 100644 --- a/src/gui/gui-window.c +++ b/src/gui/gui-window.c @@ -949,38 +949,38 @@ gui_window_print_log () struct t_gui_window *ptr_window; log_printf (""); - log_printf ("current window = 0x%x", gui_current_window); + log_printf ("current window = 0x%lx", gui_current_window); for (ptr_window = gui_windows; ptr_window; ptr_window = ptr_window->next_window) { log_printf (""); - log_printf ("[window (addr:0x%x)]", ptr_window); - log_printf (" win_x . . . . . . . : %d", ptr_window->win_x); - log_printf (" win_y . . . . . . . : %d", ptr_window->win_y); - log_printf (" win_width . . . . . : %d", ptr_window->win_width); - log_printf (" win_height. . . . . : %d", ptr_window->win_height); - log_printf (" win_width_pct . . . : %d", ptr_window->win_width_pct); - log_printf (" win_height_pct. . . : %d", ptr_window->win_height_pct); - log_printf (" win_chat_x. . . . . : %d", ptr_window->win_chat_x); - log_printf (" win_chat_y. . . . . : %d", ptr_window->win_chat_y); - log_printf (" win_chat_width. . . : %d", ptr_window->win_chat_width); - log_printf (" win_chat_height . . : %d", ptr_window->win_chat_height); - log_printf (" win_chat_cursor_x . : %d", ptr_window->win_chat_cursor_x); - log_printf (" win_chat_cursor_y . : %d", ptr_window->win_chat_cursor_y); - log_printf (" refresh_needed. . . : %d", ptr_window->refresh_needed); - log_printf (" gui_objects . . . . : 0x%x", ptr_window->gui_objects); - log_printf (" buffer. . . . . . . : 0x%x", ptr_window->buffer); - log_printf (" layout_plugin_name. : '%s'", ptr_window->layout_plugin_name); - log_printf (" layout_buffer_name. : '%s'", ptr_window->layout_buffer_name); - log_printf (" first_line_displayed: %d", ptr_window->first_line_displayed); - log_printf (" start_line. . . . . : 0x%x", ptr_window->start_line); - log_printf (" start_line_pos. . . : %d", ptr_window->start_line_pos); - log_printf (" scroll. . . . . . . : %d", ptr_window->scroll); - log_printf (" scroll_lines_after. : %d", ptr_window->scroll_lines_after); - log_printf (" scroll_reset_allowed: %d", ptr_window->scroll_reset_allowed); - log_printf (" ptr_tree. . . . . . : 0x%x", ptr_window->ptr_tree); - log_printf (" prev_window . . . . : 0x%x", ptr_window->prev_window); - log_printf (" next_window . . . . : 0x%x", ptr_window->next_window); + log_printf ("[window (addr:0x%lx)]", ptr_window); + log_printf (" win_x . . . . . . . : %d", ptr_window->win_x); + log_printf (" win_y . . . . . . . : %d", ptr_window->win_y); + log_printf (" win_width . . . . . : %d", ptr_window->win_width); + log_printf (" win_height. . . . . : %d", ptr_window->win_height); + log_printf (" win_width_pct . . . : %d", ptr_window->win_width_pct); + log_printf (" win_height_pct. . . : %d", ptr_window->win_height_pct); + log_printf (" win_chat_x. . . . . : %d", ptr_window->win_chat_x); + log_printf (" win_chat_y. . . . . : %d", ptr_window->win_chat_y); + log_printf (" win_chat_width. . . : %d", ptr_window->win_chat_width); + log_printf (" win_chat_height . . : %d", ptr_window->win_chat_height); + log_printf (" win_chat_cursor_x . : %d", ptr_window->win_chat_cursor_x); + log_printf (" win_chat_cursor_y . : %d", ptr_window->win_chat_cursor_y); + log_printf (" refresh_needed. . . : %d", ptr_window->refresh_needed); + log_printf (" gui_objects . . . . : 0x%lx", ptr_window->gui_objects); + log_printf (" buffer. . . . . . . : 0x%lx", ptr_window->buffer); + log_printf (" layout_plugin_name. : '%s'", ptr_window->layout_plugin_name); + log_printf (" layout_buffer_name. : '%s'", ptr_window->layout_buffer_name); + log_printf (" first_line_displayed: %d", ptr_window->first_line_displayed); + log_printf (" start_line. . . . . : 0x%lx", ptr_window->start_line); + log_printf (" start_line_pos. . . : %d", ptr_window->start_line_pos); + log_printf (" scroll. . . . . . . : %d", ptr_window->scroll); + log_printf (" scroll_lines_after. : %d", ptr_window->scroll_lines_after); + log_printf (" scroll_reset_allowed: %d", ptr_window->scroll_reset_allowed); + log_printf (" ptr_tree. . . . . . : 0x%lx", ptr_window->ptr_tree); + log_printf (" prev_window . . . . : 0x%lx", ptr_window->prev_window); + log_printf (" next_window . . . . : 0x%lx", ptr_window->next_window); gui_window_objects_print_log (ptr_window); } } diff --git a/src/plugins/aspell/weechat-aspell.c b/src/plugins/aspell/weechat-aspell.c index 3c8f35bc6..6ad345ab1 100644 --- a/src/plugins/aspell/weechat-aspell.c +++ b/src/plugins/aspell/weechat-aspell.c @@ -713,7 +713,6 @@ weechat_aspell_modifier_cb (void *data, const char *modifier, const char *modifier_data, const char *string) { struct t_gui_buffer *buffer; - unsigned int value; char *result, *ptr_string, *pos_space, *color_normal, *color_error; int length, index_result, length_word, word_ok; int length_color_normal, length_color_error; @@ -725,8 +724,7 @@ weechat_aspell_modifier_cb (void *data, const char *modifier, if (!string || !string[0]) return NULL; - sscanf (modifier_data, "%x", &value); - buffer = (struct t_gui_buffer *)value; + sscanf (modifier_data, "%lx", (long unsigned int *)&buffer); if (!weechat_aspell_spellers) return NULL; diff --git a/src/plugins/demo/demo.c b/src/plugins/demo/demo.c index 282f60ee0..663fcd463 100644 --- a/src/plugins/demo/demo.c +++ b/src/plugins/demo/demo.c @@ -91,9 +91,9 @@ demo_buffer_input_data_cb (void *data, struct t_gui_buffer *buffer, (void) data; weechat_printf (buffer, - "buffer_input_data_cb: buffer = %x (%s), " + "buffer_input_data_cb: buffer = %lx (%s), " "input_data = \"%s\"", - buffer, + (long unsigned int)buffer, weechat_buffer_get_string (buffer, "name"), input_data); @@ -113,8 +113,8 @@ demo_buffer_close_cb (void *data, struct t_gui_buffer *buffer) if (weechat_demo_plugin->debug) { weechat_printf (NULL, - "buffer_close_cb: buffer = %x (%s)", - buffer, + "buffer_close_cb: buffer = %lx (%s)", + (long unsigned int)buffer, weechat_buffer_get_string (buffer, "name")); } @@ -213,18 +213,18 @@ demo_infolist_print (struct t_infolist *infolist, const char *item_name) argv[j] + 2)); break; case 'p': - weechat_printf (NULL, " %s: %X", + weechat_printf (NULL, " %s: %lx", argv[j] + 2, - weechat_infolist_pointer (infolist, - argv[j] + 2)); + (long unsigned int)weechat_infolist_pointer (infolist, + argv[j] + 2)); break; case 'b': pointer = weechat_infolist_buffer (infolist, argv[j] + 2, &size); - weechat_printf (NULL, " %s: %X (size: %d)", + weechat_printf (NULL, " %s: %lx (size: %d)", argv[j] + 2, - pointer, + (long unsigned int)pointer, size); break; case 't': @@ -359,15 +359,15 @@ demo_signal_cb (void *data, const char *signal, const char *type_data, { weechat_printf (NULL, _("demo_signal: signal: %s, type_data: %s, " - "signal_data: 0x%x"), - signal, type_data, signal_data); + "signal_data: 0x%lx"), + signal, type_data, (long unsigned int)signal_data); } else { weechat_printf (NULL, _("demo_signal: signal: %s, type_data: %s, " - "signal_data: 0x%x (unknown type)"), - signal, type_data, signal_data); + "signal_data: 0x%lx (unknown type)"), + signal, type_data, (long unsigned int)signal_data); } } diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c index 01fc2d08d..79dbe1ace 100644 --- a/src/plugins/irc/irc-channel.c +++ b/src/plugins/irc/irc-channel.c @@ -684,24 +684,24 @@ irc_channel_print_log (struct t_irc_channel *channel) struct t_irc_nick *ptr_nick; weechat_log_printf (""); - weechat_log_printf (" => channel %s (addr:0x%x)]", channel->name, channel); - weechat_log_printf (" type . . . . . . . . . . : %d", channel->type); - weechat_log_printf (" topic. . . . . . . . . . : '%s'", channel->topic); - weechat_log_printf (" modes. . . . . . . . . . : '%s'", channel->modes); - weechat_log_printf (" limit. . . . . . . . . . : %d", channel->limit); - weechat_log_printf (" key. . . . . . . . . . . : '%s'", channel->key); - weechat_log_printf (" checking_away. . . . . . : %d", channel->checking_away); - weechat_log_printf (" away_message . . . . . . : '%s'", channel->away_message); - weechat_log_printf (" cycle. . . . . . . . . . : %d", channel->cycle); - weechat_log_printf (" display_creation_date. . : %d", channel->display_creation_date); - weechat_log_printf (" nicks. . . . . . . . . . : 0x%x", channel->nicks); - weechat_log_printf (" last_nick. . . . . . . . : 0x%x", channel->last_nick); - weechat_log_printf (" buffer . . . . . . . . . : 0x%x", channel->buffer); - weechat_log_printf (" nicks_speaking . . . . . : 0x%x", channel->nicks_speaking); - weechat_log_printf (" nicks_speaking_time. . . : 0x%x", channel->nicks_speaking_time); - weechat_log_printf (" last_nick_speaking_time. : 0x%x", channel->last_nick_speaking_time); - weechat_log_printf (" prev_channel . . . . . . : 0x%x", channel->prev_channel); - weechat_log_printf (" next_channel . . . . . . : 0x%x", channel->next_channel); + weechat_log_printf (" => channel %s (addr:0x%lx)]", channel->name, channel); + weechat_log_printf (" type . . . . . . . . . . : %d", channel->type); + weechat_log_printf (" topic. . . . . . . . . . : '%s'", channel->topic); + weechat_log_printf (" modes. . . . . . . . . . : '%s'", channel->modes); + weechat_log_printf (" limit. . . . . . . . . . : %d", channel->limit); + weechat_log_printf (" key. . . . . . . . . . . : '%s'", channel->key); + weechat_log_printf (" checking_away. . . . . . : %d", channel->checking_away); + weechat_log_printf (" away_message . . . . . . : '%s'", channel->away_message); + weechat_log_printf (" cycle. . . . . . . . . . : %d", channel->cycle); + weechat_log_printf (" display_creation_date. . : %d", channel->display_creation_date); + weechat_log_printf (" nicks. . . . . . . . . . : 0x%lx", channel->nicks); + weechat_log_printf (" last_nick. . . . . . . . : 0x%lx", channel->last_nick); + weechat_log_printf (" buffer . . . . . . . . . : 0x%lx", channel->buffer); + weechat_log_printf (" nicks_speaking . . . . . : 0x%lx", channel->nicks_speaking); + weechat_log_printf (" nicks_speaking_time. . . : 0x%lx", channel->nicks_speaking_time); + weechat_log_printf (" last_nick_speaking_time. : 0x%lx", channel->last_nick_speaking_time); + weechat_log_printf (" prev_channel . . . . . . : 0x%lx", channel->prev_channel); + weechat_log_printf (" next_channel . . . . . . : 0x%lx", channel->next_channel); if (channel->nicks_speaking) { weechat_log_printf (""); diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 2955d199a..12b6bbc54 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -931,7 +931,7 @@ irc_command_dcc (void *data, struct t_gui_buffer *buffer, int argc, { weechat_infolist_new_var_string (item, "plugin_name", weechat_plugin->name); snprintf (plugin_id, sizeof (plugin_id), - "%x", (unsigned int)ptr_server); + "%lx", (long unsigned int)ptr_server); weechat_infolist_new_var_string (item, "plugin_id", plugin_id); weechat_infolist_new_var_string (item, "type", "file_send"); weechat_infolist_new_var_string (item, "protocol", "dcc"); @@ -963,7 +963,7 @@ irc_command_dcc (void *data, struct t_gui_buffer *buffer, int argc, { weechat_infolist_new_var_string (item, "plugin_name", weechat_plugin->name); snprintf (plugin_id, sizeof (plugin_id), - "%x", (unsigned int)ptr_server); + "%lx", (long unsigned int)ptr_server); weechat_infolist_new_var_string (item, "plugin_id", plugin_id); weechat_infolist_new_var_string (item, "type", "chat_send"); weechat_infolist_new_var_string (item, "remote_nick", argv[2]); diff --git a/src/plugins/irc/irc-info.c b/src/plugins/irc/irc-info.c index 594d74e9e..2148e7515 100644 --- a/src/plugins/irc/irc-info.c +++ b/src/plugins/irc/irc-info.c @@ -50,7 +50,7 @@ irc_info_create_string_with_pointer (char **string, void *pointer) *string = malloc (64); if (*string) { - snprintf (*string, 64 - 1, "0x%x", (unsigned int)pointer); + snprintf (*string, 64 - 1, "0x%lx", (long unsigned int)pointer); } } } diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c index cde22bb8d..7968776be 100644 --- a/src/plugins/irc/irc-nick.c +++ b/src/plugins/irc/irc-nick.c @@ -609,10 +609,10 @@ void irc_nick_print_log (struct t_irc_nick *nick) { weechat_log_printf (""); - weechat_log_printf (" => nick %s (addr:0x%x):", nick->name, nick); - weechat_log_printf (" host . . . . . : %s", nick->host); - weechat_log_printf (" flags. . . . . : %d", nick->flags); - weechat_log_printf (" color. . . . . : '%s'", nick->color); - weechat_log_printf (" prev_nick. . . : 0x%x", nick->prev_nick); - weechat_log_printf (" next_nick. . . : 0x%x", nick->next_nick); + weechat_log_printf (" => nick %s (addr:0x%lx):", nick->name, nick); + weechat_log_printf (" host . . . . . : %s", nick->host); + weechat_log_printf (" flags. . . . . : %d", nick->flags); + weechat_log_printf (" color. . . . . : '%s'", nick->color); + weechat_log_printf (" prev_nick. . . : 0x%lx", nick->prev_nick); + weechat_log_printf (" next_nick. . . : 0x%lx", nick->next_nick); } diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index a02db89a4..edd4dae7f 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -1562,7 +1562,7 @@ irc_protocol_cmd_privmsg (struct t_irc_server *server, const char *command, { weechat_infolist_new_var_string (item, "plugin_name", weechat_plugin->name); snprintf (plugin_id, sizeof (plugin_id), - "%x", (unsigned int)server); + "%lx", (long unsigned int)server); weechat_infolist_new_var_string (item, "plugin_id", plugin_id); weechat_infolist_new_var_string (item, "type", "file_recv"); weechat_infolist_new_var_string (item, "protocol", "dcc"); @@ -1672,7 +1672,7 @@ irc_protocol_cmd_privmsg (struct t_irc_server *server, const char *command, { weechat_infolist_new_var_string (item, "plugin_name", weechat_plugin->name); snprintf (plugin_id, sizeof (plugin_id), - "%x", (unsigned int)server); + "%lx", (long unsigned int)server); weechat_infolist_new_var_string (item, "plugin_id", plugin_id); weechat_infolist_new_var_string (item, "type", "file_recv"); weechat_infolist_new_var_string (item, "filename", pos_file); @@ -1778,7 +1778,7 @@ irc_protocol_cmd_privmsg (struct t_irc_server *server, const char *command, { weechat_infolist_new_var_string (item, "plugin_name", weechat_plugin->name); snprintf (plugin_id, sizeof (plugin_id), - "%x", (unsigned int)server); + "%lx", (long unsigned int)server); weechat_infolist_new_var_string (item, "plugin_id", plugin_id); weechat_infolist_new_var_string (item, "type", "file_recv"); weechat_infolist_new_var_string (item, "filename", pos_file); @@ -1897,7 +1897,7 @@ irc_protocol_cmd_privmsg (struct t_irc_server *server, const char *command, { weechat_infolist_new_var_string (item, "plugin_name", weechat_plugin->name); snprintf (plugin_id, sizeof (plugin_id), - "%x", (unsigned int)server); + "%lx", (long unsigned int)server); weechat_infolist_new_var_string (item, "plugin_id", plugin_id); weechat_infolist_new_var_string (item, "type", "chat_recv"); weechat_infolist_new_var_string (item, "remote_nick", nick); diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index b6be624a3..a801dac3d 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -2688,7 +2688,7 @@ irc_server_xfer_send_ready_cb (void *data, const char *signal, plugin_id = weechat_infolist_string (infolist, "plugin_id"); if (plugin_name && (strcmp (plugin_name, IRC_PLUGIN_NAME) == 0) && plugin_id) { - sscanf (plugin_id, "%x", (unsigned int *)&server); + sscanf (plugin_id, "%lx", (long unsigned int *)&server); for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server) { @@ -2761,7 +2761,7 @@ irc_server_xfer_resume_ready_cb (void *data, const char *signal, plugin_id = weechat_infolist_string (infolist, "plugin_id"); if (plugin_name && (strcmp (plugin_name, IRC_PLUGIN_NAME) == 0) && plugin_id) { - sscanf (plugin_id, "%x", (unsigned int *)&server); + sscanf (plugin_id, "%lx", (long unsigned int *)&server); for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server) { @@ -2818,7 +2818,7 @@ irc_server_xfer_send_accept_resume_cb (void *data, const char *signal, plugin_id = weechat_infolist_string (infolist, "plugin_id"); if (plugin_name && (strcmp (plugin_name, IRC_PLUGIN_NAME) == 0) && plugin_id) { - sscanf (plugin_id, "%x", (unsigned int *)&server); + sscanf (plugin_id, "%lx", (long unsigned int *)&server); for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server) { @@ -2968,60 +2968,60 @@ irc_server_print_log () ptr_server = ptr_server->next_server) { weechat_log_printf (""); - weechat_log_printf ("[server %s (addr:0x%x)]", ptr_server->name, ptr_server); - weechat_log_printf (" autoconnect . . . . : %d", ptr_server->autoconnect); - weechat_log_printf (" autoreconnect . . . : %d", ptr_server->autoreconnect); - weechat_log_printf (" autoreconnect_delay : %d", ptr_server->autoreconnect_delay); - weechat_log_printf (" addresses . . . . . : '%s'", ptr_server->addresses); - weechat_log_printf (" ipv6. . . . . . . . : %d", ptr_server->ipv6); - weechat_log_printf (" ssl . . . . . . . . : %d", ptr_server->ssl); + weechat_log_printf ("[server %s (addr:0x%lx)]", ptr_server->name, ptr_server); + weechat_log_printf (" autoconnect . . . . : %d", ptr_server->autoconnect); + weechat_log_printf (" autoreconnect . . . : %d", ptr_server->autoreconnect); + weechat_log_printf (" autoreconnect_delay : %d", ptr_server->autoreconnect_delay); + weechat_log_printf (" addresses . . . . . : '%s'", ptr_server->addresses); + weechat_log_printf (" ipv6. . . . . . . . : %d", ptr_server->ipv6); + weechat_log_printf (" ssl . . . . . . . . : %d", ptr_server->ssl); weechat_log_printf (" password. . . . . . : '%s'", (ptr_server->password && ptr_server->password[0]) ? "(hidden)" : ptr_server->password); - weechat_log_printf (" nicks . . . . . . . : '%s'", ptr_server->nicks); - weechat_log_printf (" username. . . . . . : '%s'", ptr_server->username); - weechat_log_printf (" realname. . . . . . : '%s'", ptr_server->realname); + weechat_log_printf (" nicks . . . . . . . : '%s'", ptr_server->nicks); + weechat_log_printf (" username. . . . . . : '%s'", ptr_server->username); + weechat_log_printf (" realname. . . . . . : '%s'", ptr_server->realname); weechat_log_printf (" command . . . . . . : '%s'", (ptr_server->command && ptr_server->command[0]) ? "(hidden)" : ptr_server->command); - weechat_log_printf (" command_delay . . . : %d", ptr_server->command_delay); - weechat_log_printf (" autojoin. . . . . . : '%s'", ptr_server->autojoin); - weechat_log_printf (" autorejoin. . . . . : %d", ptr_server->autorejoin); - weechat_log_printf (" reloaded_from_config: %d", ptr_server->reloaded_from_config); - weechat_log_printf (" addresses_count . . : %d", ptr_server->addresses_count); - weechat_log_printf (" addresses_array . . : 0x%x", ptr_server->addresses_array); - weechat_log_printf (" ports_array . . . . : 0x%x", ptr_server->ports_array); - weechat_log_printf (" sock. . . . . . . . : %d", ptr_server->sock); - weechat_log_printf (" hook_connect. . . . : 0x%x", ptr_server->hook_connect); - weechat_log_printf (" hook_fd . . . . . . : 0x%x", ptr_server->hook_fd); - weechat_log_printf (" is_connected. . . . : %d", ptr_server->is_connected); - weechat_log_printf (" ssl_connected . . . : %d", ptr_server->ssl_connected); - weechat_log_printf (" unterminated_message: '%s'", ptr_server->unterminated_message); - weechat_log_printf (" nicks_count . . . . : %d", ptr_server->nicks_count); - weechat_log_printf (" nicks_array . . . . : 0x%x", ptr_server->nicks_array); - weechat_log_printf (" nick. . . . . . . . : '%s'", ptr_server->nick); - weechat_log_printf (" nick_modes. . . . . : '%s'", ptr_server->nick_modes); - weechat_log_printf (" prefix. . . . . . . : '%s'", ptr_server->prefix); - weechat_log_printf (" reconnect_start . . : %ld", ptr_server->reconnect_start); - weechat_log_printf (" command_time. . . . : %ld", ptr_server->command_time); - weechat_log_printf (" reconnect_join. . . : %d", ptr_server->reconnect_join); - weechat_log_printf (" disable_autojoin. . : %d", ptr_server->disable_autojoin); - weechat_log_printf (" is_away . . . . . . : %d", ptr_server->is_away); - weechat_log_printf (" away_message. . . . : '%s'", ptr_server->away_message); - weechat_log_printf (" away_time . . . . . : %ld", ptr_server->away_time); - weechat_log_printf (" lag . . . . . . . . : %d", ptr_server->lag); + weechat_log_printf (" command_delay . . . : %d", ptr_server->command_delay); + weechat_log_printf (" autojoin. . . . . . : '%s'", ptr_server->autojoin); + weechat_log_printf (" autorejoin. . . . . : %d", ptr_server->autorejoin); + weechat_log_printf (" reloaded_from_config: %d", ptr_server->reloaded_from_config); + weechat_log_printf (" addresses_count . . : %d", ptr_server->addresses_count); + weechat_log_printf (" addresses_array . . : 0x%lx", ptr_server->addresses_array); + weechat_log_printf (" ports_array . . . . : 0x%lx", ptr_server->ports_array); + weechat_log_printf (" sock. . . . . . . . : %d", ptr_server->sock); + weechat_log_printf (" hook_connect. . . . : 0x%lx", ptr_server->hook_connect); + weechat_log_printf (" hook_fd . . . . . . : 0x%lx", ptr_server->hook_fd); + weechat_log_printf (" is_connected. . . . : %d", ptr_server->is_connected); + weechat_log_printf (" ssl_connected . . . : %d", ptr_server->ssl_connected); + weechat_log_printf (" unterminated_message: '%s'", ptr_server->unterminated_message); + weechat_log_printf (" nicks_count . . . . : %d", ptr_server->nicks_count); + weechat_log_printf (" nicks_array . . . . : 0x%lx", ptr_server->nicks_array); + weechat_log_printf (" nick. . . . . . . . : '%s'", ptr_server->nick); + weechat_log_printf (" nick_modes. . . . . : '%s'", ptr_server->nick_modes); + weechat_log_printf (" prefix. . . . . . . : '%s'", ptr_server->prefix); + weechat_log_printf (" reconnect_start . . : %ld", ptr_server->reconnect_start); + weechat_log_printf (" command_time. . . . : %ld", ptr_server->command_time); + weechat_log_printf (" reconnect_join. . . : %d", ptr_server->reconnect_join); + weechat_log_printf (" disable_autojoin. . : %d", ptr_server->disable_autojoin); + weechat_log_printf (" is_away . . . . . . : %d", ptr_server->is_away); + weechat_log_printf (" away_message. . . . : '%s'", ptr_server->away_message); + weechat_log_printf (" away_time . . . . . : %ld", ptr_server->away_time); + weechat_log_printf (" lag . . . . . . . . : %d", ptr_server->lag); weechat_log_printf (" lag_check_time. . . : tv_sec:%d, tv_usec:%d", ptr_server->lag_check_time.tv_sec, ptr_server->lag_check_time.tv_usec); - weechat_log_printf (" lag_next_check. . . : %ld", ptr_server->lag_next_check); - weechat_log_printf (" last_user_message . : %ld", ptr_server->last_user_message); - weechat_log_printf (" outqueue. . . . . . : 0x%x", ptr_server->outqueue); - weechat_log_printf (" last_outqueue . . . : 0x%x", ptr_server->last_outqueue); - weechat_log_printf (" buffer. . . . . . . : 0x%x", ptr_server->buffer); - weechat_log_printf (" channels. . . . . . : 0x%x", ptr_server->channels); - weechat_log_printf (" last_channel. . . . : 0x%x", ptr_server->last_channel); - weechat_log_printf (" prev_server . . . . : 0x%x", ptr_server->prev_server); - weechat_log_printf (" next_server . . . . : 0x%x", ptr_server->next_server); + weechat_log_printf (" lag_next_check. . . : %ld", ptr_server->lag_next_check); + weechat_log_printf (" last_user_message . : %ld", ptr_server->last_user_message); + weechat_log_printf (" outqueue. . . . . . : 0x%lx", ptr_server->outqueue); + weechat_log_printf (" last_outqueue . . . : 0x%lx", ptr_server->last_outqueue); + weechat_log_printf (" buffer. . . . . . . : 0x%lx", ptr_server->buffer); + weechat_log_printf (" channels. . . . . . : 0x%lx", ptr_server->channels); + weechat_log_printf (" last_channel. . . . : 0x%lx", ptr_server->last_channel); + weechat_log_printf (" prev_server . . . . : 0x%lx", ptr_server->prev_server); + weechat_log_printf (" next_server . . . . : 0x%lx", ptr_server->next_server); for (ptr_channel = ptr_server->channels; ptr_channel; ptr_channel = ptr_channel->next_channel) diff --git a/src/plugins/plugin.c b/src/plugins/plugin.c index 6ec8c3c20..782232492 100644 --- a/src/plugins/plugin.c +++ b/src/plugins/plugin.c @@ -945,15 +945,15 @@ plugin_print_log () ptr_plugin = ptr_plugin->next_plugin) { log_printf (""); - log_printf ("[plugin (addr:0x%x)]", ptr_plugin); - log_printf (" filename . . . . . . . : '%s'", ptr_plugin->filename); - log_printf (" handle . . . . . . . . : 0x%x", ptr_plugin->handle); - log_printf (" name . . . . . . . . . : '%s'", ptr_plugin->name); - log_printf (" description. . . . . . : '%s'", ptr_plugin->description); - log_printf (" version. . . . . . . . : '%s'", ptr_plugin->version); - log_printf (" charset. . . . . . . . : '%s'", ptr_plugin->charset); - log_printf (" debug. . . . . . . . . : %d", ptr_plugin->debug); - log_printf (" prev_plugin. . . . . . : 0x%x", ptr_plugin->prev_plugin); - log_printf (" next_plugin. . . . . . : 0x%x", ptr_plugin->next_plugin); + log_printf ("[plugin (addr:0x%lx)]", ptr_plugin); + log_printf (" filename . . . . . . . : '%s'", ptr_plugin->filename); + log_printf (" handle . . . . . . . . : 0x%lx", ptr_plugin->handle); + log_printf (" name . . . . . . . . . : '%s'", ptr_plugin->name); + log_printf (" description. . . . . . : '%s'", ptr_plugin->description); + log_printf (" version. . . . . . . . : '%s'", ptr_plugin->version); + log_printf (" charset. . . . . . . . : '%s'", ptr_plugin->charset); + log_printf (" debug. . . . . . . . . : %d", ptr_plugin->debug); + log_printf (" prev_plugin. . . . . . : 0x%lx", ptr_plugin->prev_plugin); + log_printf (" next_plugin. . . . . . : 0x%lx", ptr_plugin->next_plugin); } } diff --git a/src/plugins/scripts/script-callback.c b/src/plugins/scripts/script-callback.c index a7f89e22e..e7021230e 100644 --- a/src/plugins/scripts/script-callback.c +++ b/src/plugins/scripts/script-callback.c @@ -124,15 +124,15 @@ script_callback_print_log (struct t_weechat_plugin *weechat_plugin, struct t_script_callback *script_callback) { weechat_log_printf (""); - weechat_log_printf (" [callback (addr:0x%x)]", script_callback); - weechat_log_printf (" script. . . . . . . : 0x%x", script_callback->script); - weechat_log_printf (" function. . . . . . : '%s'", script_callback->function); - weechat_log_printf (" config_file . . . . : 0x%x", script_callback->config_file); - weechat_log_printf (" config_section. . . : 0x%x", script_callback->config_section); - weechat_log_printf (" config_option . . . : 0x%x", script_callback->config_option); - weechat_log_printf (" hook. . . . . . . . : 0x%x", script_callback->hook); - weechat_log_printf (" buffer. . . . . . . : 0x%x", script_callback->buffer); - weechat_log_printf (" bar_item. . . . . . : 0x%x", script_callback->bar_item); - weechat_log_printf (" prev_callback . . . : 0x%x", script_callback->prev_callback); - weechat_log_printf (" next_callback . . . : 0x%x", script_callback->next_callback); + weechat_log_printf (" [callback (addr:0x%lx)]", script_callback); + weechat_log_printf (" script. . . . . . . : 0x%lx", script_callback->script); + weechat_log_printf (" function. . . . . . : '%s'", script_callback->function); + weechat_log_printf (" config_file . . . . : 0x%lx", script_callback->config_file); + weechat_log_printf (" config_section. . . : 0x%lx", script_callback->config_section); + weechat_log_printf (" config_option . . . : 0x%lx", script_callback->config_option); + weechat_log_printf (" hook. . . . . . . . : 0x%lx", script_callback->hook); + weechat_log_printf (" buffer. . . . . . . : 0x%lx", script_callback->buffer); + weechat_log_printf (" bar_item. . . . . . : 0x%lx", script_callback->bar_item); + weechat_log_printf (" prev_callback . . . : 0x%lx", script_callback->prev_callback); + weechat_log_printf (" next_callback . . . : 0x%lx", script_callback->next_callback); } diff --git a/src/plugins/scripts/script.c b/src/plugins/scripts/script.c index 7a880d97a..4497d9591 100644 --- a/src/plugins/scripts/script.c +++ b/src/plugins/scripts/script.c @@ -180,7 +180,7 @@ script_ptr2str (void *pointer) return strdup (""); snprintf (pointer_str, sizeof (pointer_str), - "0x%x", (unsigned int)pointer); + "0x%lx", (long unsigned int)pointer); return strdup (pointer_str); } @@ -192,12 +192,12 @@ script_ptr2str (void *pointer) void * script_str2ptr (const char *pointer_str) { - unsigned int value; + long unsigned int value; if (!pointer_str || (pointer_str[0] != '0') || (pointer_str[1] != 'x')) return NULL; - sscanf (pointer_str + 2, "%x", &value); + sscanf (pointer_str + 2, "%lx", &value); return (void *)value; } @@ -604,19 +604,19 @@ script_print_log (struct t_weechat_plugin *weechat_plugin, ptr_script = ptr_script->next_script) { weechat_log_printf (""); - weechat_log_printf ("[script %s (addr:0x%x)]", ptr_script->name, ptr_script); - weechat_log_printf (" filename. . . . . . : '%s'", ptr_script->filename); - weechat_log_printf (" interpreter . . . . : 0x%x", ptr_script->interpreter); - weechat_log_printf (" name. . . . . . . . : '%s'", ptr_script->name); - weechat_log_printf (" author. . . . . . . : '%s'", ptr_script->author); - weechat_log_printf (" version . . . . . . : '%s'", ptr_script->version); - weechat_log_printf (" license . . . . . . : '%s'", ptr_script->license); - weechat_log_printf (" description . . . . : '%s'", ptr_script->description); - weechat_log_printf (" shutdown_func . . . : '%s'", ptr_script->shutdown_func); - weechat_log_printf (" charset . . . . . . : '%s'", ptr_script->charset); - weechat_log_printf (" callbacks . . . . . : 0x%x", ptr_script->callbacks); - weechat_log_printf (" prev_script . . . . : 0x%x", ptr_script->prev_script); - weechat_log_printf (" next_script . . . . : 0x%x", ptr_script->next_script); + weechat_log_printf ("[script %s (addr:0x%lx)]", ptr_script->name, ptr_script); + weechat_log_printf (" filename. . . . . . : '%s'", ptr_script->filename); + weechat_log_printf (" interpreter . . . . : 0x%lx", ptr_script->interpreter); + weechat_log_printf (" name. . . . . . . . : '%s'", ptr_script->name); + weechat_log_printf (" author. . . . . . . : '%s'", ptr_script->author); + weechat_log_printf (" version . . . . . . : '%s'", ptr_script->version); + weechat_log_printf (" license . . . . . . : '%s'", ptr_script->license); + weechat_log_printf (" description . . . . : '%s'", ptr_script->description); + weechat_log_printf (" shutdown_func . . . : '%s'", ptr_script->shutdown_func); + weechat_log_printf (" charset . . . . . . : '%s'", ptr_script->charset); + weechat_log_printf (" callbacks . . . . . : 0x%lx", ptr_script->callbacks); + weechat_log_printf (" prev_script . . . . : 0x%lx", ptr_script->prev_script); + weechat_log_printf (" next_script . . . . : 0x%lx", ptr_script->next_script); for (ptr_script_callback = ptr_script->callbacks; ptr_script_callback; ptr_script_callback = ptr_script_callback->next_callback) diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c index 872b08982..acc02ddc3 100644 --- a/src/plugins/xfer/xfer.c +++ b/src/plugins/xfer/xfer.c @@ -1283,45 +1283,45 @@ xfer_print_log () for (ptr_xfer = xfer_list; ptr_xfer; ptr_xfer = ptr_xfer->next_xfer) { weechat_log_printf (""); - weechat_log_printf ("[xfer (addr:0x%x)]", ptr_xfer); - weechat_log_printf (" plugin_name . . . . : '%s'", ptr_xfer->plugin_name); - weechat_log_printf (" plugin_id . . . . . : '%s'", ptr_xfer->plugin_id); + weechat_log_printf ("[xfer (addr:0x%lx)]", ptr_xfer); + weechat_log_printf (" plugin_name . . . . : '%s'", ptr_xfer->plugin_name); + weechat_log_printf (" plugin_id . . . . . : '%s'", ptr_xfer->plugin_id); weechat_log_printf (" type. . . . . . . . : %d (%s)", ptr_xfer->type, xfer_type_string[ptr_xfer->type]); - weechat_log_printf (" remote_nick . . . . : '%s'", ptr_xfer->remote_nick); - weechat_log_printf (" local_nick. . . . . : '%s'", ptr_xfer->local_nick); - weechat_log_printf (" filename. . . . . . : '%s'", ptr_xfer->filename); - weechat_log_printf (" size. . . . . . . . : %lu", ptr_xfer->size); - weechat_log_printf (" address . . . . . . : %lu", ptr_xfer->address); - weechat_log_printf (" port. . . . . . . . : %d", ptr_xfer->port); + weechat_log_printf (" remote_nick . . . . : '%s'", ptr_xfer->remote_nick); + weechat_log_printf (" local_nick. . . . . : '%s'", ptr_xfer->local_nick); + weechat_log_printf (" filename. . . . . . : '%s'", ptr_xfer->filename); + weechat_log_printf (" size. . . . . . . . : %lu", ptr_xfer->size); + weechat_log_printf (" address . . . . . . : %lu", ptr_xfer->address); + weechat_log_printf (" port. . . . . . . . : %d", ptr_xfer->port); weechat_log_printf (" status. . . . . . . : %d (%s)", ptr_xfer->status, xfer_status_string[ptr_xfer->status]); - weechat_log_printf (" buffer. . . . . . . : 0x%x", ptr_xfer->buffer); - weechat_log_printf (" fast_send . . . . . : %d", ptr_xfer->fast_send); - weechat_log_printf (" blocksize . . . . . : %d", ptr_xfer->blocksize); - weechat_log_printf (" start_time. . . . . : %ld", ptr_xfer->start_time); - weechat_log_printf (" start_transfer. . . : %ld", ptr_xfer->start_transfer); - weechat_log_printf (" sock. . . . . . . . : %d", ptr_xfer->sock); - weechat_log_printf (" child_pid . . . . . : %d", ptr_xfer->child_pid); - weechat_log_printf (" child_read. . . . . : %d", ptr_xfer->child_read); - weechat_log_printf (" child_write . . . . : %d", ptr_xfer->child_write); - weechat_log_printf (" unterminated_message: '%s'", ptr_xfer->unterminated_message); - weechat_log_printf (" file. . . . . . . . : %d", ptr_xfer->file); - weechat_log_printf (" local_filename. . . : '%s'", ptr_xfer->local_filename); - weechat_log_printf (" filename_suffix . . : %d", ptr_xfer->filename_suffix); - weechat_log_printf (" pos . . . . . . . . : %lu", ptr_xfer->pos); - weechat_log_printf (" ack . . . . . . . . : %lu", ptr_xfer->ack); - weechat_log_printf (" start_resume. . . . : %lu", ptr_xfer->start_resume); - weechat_log_printf (" last_check_time . . : %ld", ptr_xfer->last_check_time); - weechat_log_printf (" last_check_pos. . . : %lu", ptr_xfer->last_check_pos); - weechat_log_printf (" last_activity . . . : %ld", ptr_xfer->last_activity); - weechat_log_printf (" bytes_per_sec . . . : %lu", ptr_xfer->bytes_per_sec); - weechat_log_printf (" eta . . . . . . . . : %lu", ptr_xfer->eta); - weechat_log_printf (" prev_xfer . . . . . : 0x%x", ptr_xfer->prev_xfer); - weechat_log_printf (" next_xfer . . . . . : 0x%x", ptr_xfer->next_xfer); + weechat_log_printf (" buffer. . . . . . . : 0x%lx", ptr_xfer->buffer); + weechat_log_printf (" fast_send . . . . . : %d", ptr_xfer->fast_send); + weechat_log_printf (" blocksize . . . . . : %d", ptr_xfer->blocksize); + weechat_log_printf (" start_time. . . . . : %ld", ptr_xfer->start_time); + weechat_log_printf (" start_transfer. . . : %ld", ptr_xfer->start_transfer); + weechat_log_printf (" sock. . . . . . . . : %d", ptr_xfer->sock); + weechat_log_printf (" child_pid . . . . . : %d", ptr_xfer->child_pid); + weechat_log_printf (" child_read. . . . . : %d", ptr_xfer->child_read); + weechat_log_printf (" child_write . . . . : %d", ptr_xfer->child_write); + weechat_log_printf (" unterminated_message: '%s'", ptr_xfer->unterminated_message); + weechat_log_printf (" file. . . . . . . . : %d", ptr_xfer->file); + weechat_log_printf (" local_filename. . . : '%s'", ptr_xfer->local_filename); + weechat_log_printf (" filename_suffix . . : %d", ptr_xfer->filename_suffix); + weechat_log_printf (" pos . . . . . . . . : %lu", ptr_xfer->pos); + weechat_log_printf (" ack . . . . . . . . : %lu", ptr_xfer->ack); + weechat_log_printf (" start_resume. . . . : %lu", ptr_xfer->start_resume); + weechat_log_printf (" last_check_time . . : %ld", ptr_xfer->last_check_time); + weechat_log_printf (" last_check_pos. . . : %lu", ptr_xfer->last_check_pos); + weechat_log_printf (" last_activity . . . : %ld", ptr_xfer->last_activity); + weechat_log_printf (" bytes_per_sec . . . : %lu", ptr_xfer->bytes_per_sec); + weechat_log_printf (" eta . . . . . . . . : %lu", ptr_xfer->eta); + weechat_log_printf (" prev_xfer . . . . . : 0x%lx", ptr_xfer->prev_xfer); + weechat_log_printf (" next_xfer . . . . . : 0x%lx", ptr_xfer->next_xfer); } } |