core: fix print of pointer values

5 files changed, 9 insertions, 14 deletions

diff --git a/tests/unit/core/test-core-eval.cpp b/tests/unit/core/test-core-eval.cpp
index f01b5c41a..1b9616d1e 100644
--- a/tests/unit/core/test-core-eval.cpp
+++ b/tests/unit/core/test-core-eval.cpp
@@ -1014,8 +1014,7 @@ TEST(CoreEval, EvalExpression)
     WEE_CHECK_EVAL("", "${buffer[unknown_list].full_name}");
     WEE_CHECK_EVAL("", "${unknown_pointer}");
     WEE_CHECK_EVAL("", "${my_null_pointer}");
-    snprintf (str_value, sizeof (str_value),
-              "0x%lx", (long unsigned int)gui_buffers);
+    snprintf (str_value, sizeof (str_value), "%p", gui_buffers);
     WEE_CHECK_EVAL(str_value, "${my_buffer_pointer}");
     WEE_CHECK_EVAL("0x1234abcd", "${my_other_pointer}");
     WEE_CHECK_EVAL("", "${buffer[unknown_pointer].full_name}");
@@ -1024,7 +1023,7 @@ TEST(CoreEval, EvalExpression)
     WEE_CHECK_EVAL("", "${buffer[my_other_pointer].full_name}");
     WEE_CHECK_EVAL("core.weechat", "${buffer[gui_buffers].full_name}");
     snprintf (str_value, sizeof (str_value),
-              "${buffer[0x%lx].full_name}", (long unsigned int)gui_buffers);
+              "${buffer[%p].full_name}", gui_buffers);
     WEE_CHECK_EVAL("core.weechat", str_value);
     snprintf (str_value, sizeof (str_value), "%c", 1);
     WEE_CHECK_EVAL(str_value,
@@ -1036,7 +1035,7 @@ TEST(CoreEval, EvalExpression)
     WEE_CHECK_EVAL(str_value,
                    "${window.buffer.own_lines.first_line.data.date}");
     snprintf (str_value, sizeof (str_value),
-              "0x%lx", (long unsigned int)(gui_buffers->local_variables));
+              "%p", gui_buffers->local_variables);
     WEE_CHECK_EVAL(str_value, "${window.buffer.local_variables}");
     WEE_CHECK_EVAL("core", "${window.buffer.local_variables.plugin}");
     WEE_CHECK_EVAL("weechat", "${window.buffer.local_variables.name}");
diff --git a/tests/unit/core/test-core-hashtable.cpp b/tests/unit/core/test-core-hashtable.cpp
index 26c41a237..2e8e92a1c 100644
--- a/tests/unit/core/test-core-hashtable.cpp
+++ b/tests/unit/core/test-core-hashtable.cpp
@@ -540,8 +540,8 @@ TEST(CoreHashtable, MapString)
                              value_buffer, sizeof (value_buffer));
     hashtable_map_string (hashtable, &test_hashtable_map_string_cb, NULL);
     snprintf (result, sizeof (result),
-              "1624693124:0x%lx",
-              (unsigned long)(hashtable->newest_item->value));
+              "1624693124:%p",
+              hashtable->newest_item->value);
     STRCMP_EQUAL(result, test_map_string);
 
     free (test_map_string);
diff --git a/tests/unit/core/test-core-hook.cpp b/tests/unit/core/test-core-hook.cpp
index b7535658d..2416591cd 100644
--- a/tests/unit/core/test-core-hook.cpp
+++ b/tests/unit/core/test-core-hook.cpp
@@ -176,7 +176,6 @@ test_modifier_cb (const void *pointer, void *data,
     char **items, *new_string;
     const char *ptr_plugin, *ptr_tags, *ptr_msg;
     int num_items, length, rc;
-    unsigned long value;
     struct t_gui_buffer *ptr_buffer;
 
     /* make C++ compiler happy */
@@ -197,10 +196,9 @@ test_modifier_cb (const void *pointer, void *data,
 
     ptr_tags = (num_items >= 2) ? items[1] : NULL;
 
-    rc = sscanf (items[0], "0x%lx", &value);
+    rc = sscanf (items[0], "%p", &ptr_buffer);
     if ((rc == EOF) || (rc == 0))
         goto error;
-    ptr_buffer = (struct t_gui_buffer *)value;
 
     ptr_plugin = gui_buffer_get_plugin_name (ptr_buffer);
     if (!ptr_plugin)
diff --git a/tests/unit/plugins/irc/test-irc-info.cpp b/tests/unit/plugins/irc/test-irc-info.cpp
index 235a5b953..70b3b30bd 100644
--- a/tests/unit/plugins/irc/test-irc-info.cpp
+++ b/tests/unit/plugins/irc/test-irc-info.cpp
@@ -234,12 +234,10 @@ TEST(IrcInfo, InfoIrcBufferCb)
 
     WEE_TEST_STR(NULL, hook_info_get (NULL, "irc_buffer", "local"));
 
-    snprintf (str_pointer, sizeof (str_pointer),
-              "0x%lx", (unsigned long)channel->buffer);
+    snprintf (str_pointer, sizeof (str_pointer), "%p", channel->buffer);
     WEE_TEST_STR(str_pointer, hook_info_get (NULL, "irc_buffer", "local,#test"));
 
-    snprintf (str_pointer, sizeof (str_pointer),
-              "0x%lx", (unsigned long)channel->buffer);
+    snprintf (str_pointer, sizeof (str_pointer), "%p", channel->buffer);
     WEE_TEST_STR(str_pointer, hook_info_get (NULL, "irc_buffer", "local,#test,bob"));
 
     irc_nick_free (server, channel, nick);
diff --git a/tests/unit/plugins/test-plugin-api-info.cpp b/tests/unit/plugins/test-plugin-api-info.cpp
index 6324d260f..914d5c1c7 100644
--- a/tests/unit/plugins/test-plugin-api-info.cpp
+++ b/tests/unit/plugins/test-plugin-api-info.cpp
@@ -337,7 +337,7 @@ TEST(PluginApiInfo, BufferCb)
 
     POINTERS_EQUAL(NULL, hook_info_get (NULL, "buffer", "zzz"));
 
-    snprintf (str_buffer, sizeof (str_buffer), "0x%lx", (unsigned long)gui_buffers);
+    snprintf (str_buffer, sizeof (str_buffer), "%p", gui_buffers);
     WEE_TEST_STR(str_buffer, hook_info_get (NULL, "buffer", "core.weechat"));
 }