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

core, plugins: return "0x0" instead of "(nil)" for pointers formatted in strings

Browse Source 
This is a partial revert of the commit
965beb37de.
This commit is contained in:
Sébastien Helleu
2024-06-22 08:54:08 +02:00
parent a75a947f5f
commit bdfa1bd51c
21 changed files with 65 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/buflist/buflist-mouse.c
+1 -1
View File
@@ -155,7 +155,7 @@ end:
}
/* add pointer and plugin name */
snprintf (str_value, sizeof (str_value), "%p", ptr_buffer);
snprintf (str_value, sizeof (str_value), "0x%lx", (unsigned long)ptr_buffer);
weechat_hashtable_set (info, "pointer", str_value);
weechat_hashtable_set (info, "plugin",
weechat_buffer_get_string (ptr_buffer, "plugin"));
src/plugins/fset/fset-mouse.c
+2 -1
View File
@@ -79,7 +79,8 @@ fset_mouse_focus_cb (const void *pointer, void *data, struct t_hashtable *info)
if (!ptr_fset_option)
return info;
snprintf (str_value, sizeof (str_value), "%p", ptr_fset_option);
snprintf (str_value, sizeof (str_value),
"0x%lx", (unsigned long)ptr_fset_option);
weechat_hashtable_set (info, "fset_option", str_value);
snprintf (str_value, sizeof (str_value), "%ld", option_index);
weechat_hashtable_set (info, "fset_option_index", str_value);
src/plugins/irc/irc-bar-item.c
+2 -1
View File
@@ -658,7 +658,8 @@ irc_bar_item_focus_buffer_nicklist (const void *pointer, void *data,
ptr_nick = irc_nick_search (ptr_server, ptr_channel, nick);
if (ptr_nick)
{
snprintf (str_value, sizeof (str_value), "%p", ptr_nick);
snprintf (str_value, sizeof (str_value),
"0x%lx", (unsigned long)ptr_nick);
weechat_hashtable_set (info, "irc_nick", str_value);
if (ptr_nick->host)
src/plugins/irc/irc-info.c
+1 -1
View File
@@ -57,7 +57,7 @@ irc_info_create_string_with_pointer (char **string, void *pointer)
*string = malloc (64);
if (*string)
{
snprintf (*string, 64, "%p", pointer);
snprintf (*string, 64, "0x%lx", (unsigned long)pointer);
}
}
}
src/plugins/irc/irc-typing.c
+2 -2
View File
@@ -143,8 +143,8 @@ irc_typing_channel_set_nick (struct t_irc_channel *channel, const char *nick,
char signal_data[1024];
snprintf (signal_data, sizeof (signal_data),
"%p;%s;%s",
channel->buffer,
"0x%lx;%s;%s",
(unsigned long)channel->buffer,
(state == IRC_CHANNEL_TYPING_STATE_ACTIVE) ? "typing" :
((state == IRC_CHANNEL_TYPING_STATE_PAUSED) ? "paused" : "off"),
nick);
src/plugins/plugin-api-info.c
+1 -1
View File
@@ -512,7 +512,7 @@ plugin_api_info_buffer_cb (const void *pointer, void *data,
if (!ptr_buffer)
return NULL;
snprintf (value, sizeof (value), "%p", ptr_buffer);
snprintf (value, sizeof (value), "0x%lx", (unsigned long)ptr_buffer);
return strdup (value);
}
src/plugins/plugin-script.c
+1 -1
View File
@@ -379,7 +379,7 @@ plugin_script_ptr2str (void *pointer)
return str_pointer[index_pointer];
snprintf (str_pointer[index_pointer], sizeof (str_pointer[index_pointer]),
"%p", pointer);
"0x%lx", (unsigned long)pointer);
return str_pointer[index_pointer];
}
src/plugins/relay/irc/relay-irc.c
+4 -2
View File
@@ -215,7 +215,8 @@ relay_irc_sendf (struct t_relay_client *client, const char *format, ...)
hashtable_in = NULL;
hashtable_out = NULL;
snprintf (modifier_data, sizeof (modifier_data), "%p", client);
snprintf (modifier_data, sizeof (modifier_data),
"0x%lx", (unsigned long)client);
new_msg1 = weechat_hook_modifier_exec ("relay_client_irc_out1",
modifier_data, vbuffer);
@@ -1641,7 +1642,8 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
data);
}
snprintf (modifier_data, sizeof (modifier_data), "%p", client);
snprintf (modifier_data, sizeof (modifier_data),
"0x%lx", (unsigned long)client);
new_data = weechat_hook_modifier_exec ("relay_client_irc_in",
modifier_data, data);
src/plugins/relay/weechat/relay-weechat-protocol.c
+22 -12
View File
@@ -872,7 +872,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,short_name,"
"nicklist,title,local_variables,"
@@ -896,7 +897,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,type");
relay_weechat_msg_send (ptr_client, msg);
@@ -918,7 +920,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,"
"prev_buffer,next_buffer");
@@ -942,7 +945,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,"
"prev_buffer,next_buffer");
@@ -966,7 +970,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,"
"prev_buffer,next_buffer");
@@ -1010,7 +1015,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,short_name,"
"local_variables");
@@ -1033,7 +1039,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,title");
relay_weechat_msg_send (ptr_client, msg);
@@ -1055,7 +1062,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name,local_variables");
relay_weechat_msg_send (ptr_client, msg);
@@ -1076,7 +1084,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name");
relay_weechat_msg_send (ptr_client, msg);
@@ -1107,8 +1116,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata),
"line_data:%p",
ptr_line_data);
"line_data:0x%lx",
(unsigned long)ptr_line_data);
relay_weechat_msg_add_hdata (
msg, cmd_hdata,
"buffer,date,date_usec,date_printed,date_usec_printed,"
@@ -1133,7 +1142,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
msg = relay_weechat_msg_new (str_signal);
if (msg)
{
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
snprintf (cmd_hdata, sizeof (cmd_hdata),
"buffer:0x%lx", (unsigned long)ptr_buffer);
relay_weechat_msg_add_hdata (msg, cmd_hdata,
"id,number,full_name");
relay_weechat_msg_send (ptr_client, msg);
src/plugins/trigger/trigger-callback.c
+4 -1
View File
@@ -733,7 +733,10 @@ trigger_callback_signal_cb (const void *pointer, void *data,
{
str_data[0] = '\0';
if (signal_data)
snprintf (str_data, sizeof (str_data), "%p", signal_data);
{
snprintf (str_data, sizeof (str_data),
"0x%lx", (unsigned long)signal_data);
}
ptr_signal_data = str_data;
}
weechat_hashtable_set (ctx.extra_vars, "tg_signal_data", ptr_signal_data);