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 /src/plugins/scripts | |
parent | e2a19660959d17b2ff615f90259dd543388c362a (diff) | |
download | weechat-d32b22f76f9d677780780ec3ab1a497f0ad7a9d5.zip |
Fix bug with pointer conversions on 64 bits architecture
Diffstat (limited to 'src/plugins/scripts')
-rw-r--r-- | src/plugins/scripts/script-callback.c | 22 | ||||
-rw-r--r-- | src/plugins/scripts/script.c | 32 |
2 files changed, 27 insertions, 27 deletions
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) |