From 470287fe5cf332697f06e567cdbddf1036c738df Mon Sep 17 00:00:00 2001
From: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
Date: Thu, 30 Jun 2022 14:33:04 -0300
Subject: [PATCH] libs: Remove "0x" prefix preceding "%p" specifier on format
 string

The "p" format specifier already prepends the pointer address with
"0x" when printing.

Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
---
 libs/libc/pthread/pthread_attr_destroy.c          |  2 +-
 libs/libc/pthread/pthread_attr_getaffinity.c      |  2 +-
 libs/libc/pthread/pthread_attr_getinheritsched.c  |  2 +-
 libs/libc/pthread/pthread_attr_getschedparam.c    |  2 +-
 libs/libc/pthread/pthread_attr_getschedpolicy.c   |  2 +-
 libs/libc/pthread/pthread_attr_getstack.c         |  2 +-
 libs/libc/pthread/pthread_attr_getstacksize.c     |  2 +-
 libs/libc/pthread/pthread_attr_init.c             |  2 +-
 libs/libc/pthread/pthread_attr_setaffinity.c      |  2 +-
 libs/libc/pthread/pthread_attr_setschedparam.c    |  2 +-
 libs/libc/pthread/pthread_attr_setschedpolicy.c   |  2 +-
 libs/libc/pthread/pthread_attr_setstack.c         |  2 +-
 libs/libc/pthread/pthread_attr_setstacksize.c     |  2 +-
 libs/libc/pthread/pthread_condattr_destroy.c      |  2 +-
 libs/libc/pthread/pthread_condattr_init.c         |  2 +-
 libs/libc/pthread/pthread_conddestroy.c           |  2 +-
 libs/libc/pthread/pthread_condinit.c              |  2 +-
 libs/libc/pthread/pthread_mutexattr_destroy.c     |  2 +-
 libs/libc/pthread/pthread_mutexattr_getpshared.c  |  2 +-
 libs/libc/pthread/pthread_mutexattr_init.c        |  2 +-
 libs/libc/pthread/pthread_mutexattr_setprotocol.c |  2 +-
 libs/libc/pthread/pthread_mutexattr_setpshared.c  |  2 +-
 libs/libc/stdio/lib_libvscanf.c                   | 10 +++++-----
 23 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/libs/libc/pthread/pthread_attr_destroy.c b/libs/libc/pthread/pthread_attr_destroy.c
index 2ff6c40c54..8dae7f0263 100644
--- a/libs/libc/pthread/pthread_attr_destroy.c
+++ b/libs/libc/pthread/pthread_attr_destroy.c
@@ -53,7 +53,7 @@ int pthread_attr_destroy(FAR pthread_attr_t *attr)
 {
   int ret;
 
-  linfo("attr=0x%p\n", attr);
+  linfo("attr=%p\n", attr);
 
   if (!attr)
     {
diff --git a/libs/libc/pthread/pthread_attr_getaffinity.c b/libs/libc/pthread/pthread_attr_getaffinity.c
index f0a1e5567c..aaa4c2200d 100644
--- a/libs/libc/pthread/pthread_attr_getaffinity.c
+++ b/libs/libc/pthread/pthread_attr_getaffinity.c
@@ -51,7 +51,7 @@
 int pthread_attr_getaffinity_np(FAR const pthread_attr_t *attr,
                                 size_t cpusetsize, cpu_set_t *cpuset)
 {
-  linfo("attr=0x%p cpusetsize=%d cpuset=0x%p\n",
+  linfo("attr=%p cpusetsize=%d cpuset=%p\n",
          attr, (int)cpusetsize, cpuset);
 
   DEBUGASSERT(attr != NULL && cpusetsize == sizeof(cpu_set_t) &&
diff --git a/libs/libc/pthread/pthread_attr_getinheritsched.c b/libs/libc/pthread/pthread_attr_getinheritsched.c
index 0d5cbee874..40a5cf3019 100644
--- a/libs/libc/pthread/pthread_attr_getinheritsched.c
+++ b/libs/libc/pthread/pthread_attr_getinheritsched.c
@@ -57,7 +57,7 @@ int pthread_attr_getinheritsched(FAR const pthread_attr_t *attr,
 {
   int ret;
 
-  linfo("attr=0x%p inheritsched=0x%p\n", attr, inheritsched);
+  linfo("attr=%p inheritsched=%p\n", attr, inheritsched);
 
   if (!attr || !inheritsched)
     {
diff --git a/libs/libc/pthread/pthread_attr_getschedparam.c b/libs/libc/pthread/pthread_attr_getschedparam.c
index 11ffcf24df..382c333b4c 100644
--- a/libs/libc/pthread/pthread_attr_getschedparam.c
+++ b/libs/libc/pthread/pthread_attr_getschedparam.c
@@ -55,7 +55,7 @@ int pthread_attr_getschedparam(FAR const pthread_attr_t *attr,
 {
   int ret;
 
-  linfo("attr=0x%p param=0x%p\n", attr, param);
+  linfo("attr=%p param=%p\n", attr, param);
 
   if (!attr || !param)
     {
diff --git a/libs/libc/pthread/pthread_attr_getschedpolicy.c b/libs/libc/pthread/pthread_attr_getschedpolicy.c
index 80863774e4..dfb0c49635 100644
--- a/libs/libc/pthread/pthread_attr_getschedpolicy.c
+++ b/libs/libc/pthread/pthread_attr_getschedpolicy.c
@@ -54,7 +54,7 @@ int pthread_attr_getschedpolicy(FAR const pthread_attr_t *attr,
 {
   int ret;
 
-  linfo("attr=0x%p policy=0x%p\n", attr, policy);
+  linfo("attr=%p policy=%p\n", attr, policy);
 
   if (!attr || !policy)
     {
diff --git a/libs/libc/pthread/pthread_attr_getstack.c b/libs/libc/pthread/pthread_attr_getstack.c
index c9f0dbcaf2..42515e5dac 100644
--- a/libs/libc/pthread/pthread_attr_getstack.c
+++ b/libs/libc/pthread/pthread_attr_getstack.c
@@ -53,7 +53,7 @@ int pthread_attr_getstack(FAR pthread_attr_t *attr,
 {
   int ret;
 
-  linfo("attr=0x%p stackaddr=0x%p stacksize=0x%p\n",
+  linfo("attr=%p stackaddr=%p stacksize=%p\n",
         attr, stackaddr, stacksize);
 
   if (!attr || !stackaddr || !stacksize)
diff --git a/libs/libc/pthread/pthread_attr_getstacksize.c b/libs/libc/pthread/pthread_attr_getstacksize.c
index 35073048ac..11e9348b45 100644
--- a/libs/libc/pthread/pthread_attr_getstacksize.c
+++ b/libs/libc/pthread/pthread_attr_getstacksize.c
@@ -53,7 +53,7 @@ int pthread_attr_getstacksize(FAR const pthread_attr_t *attr,
 {
   int ret;
 
-  linfo("attr=0x%p stacksize=0x%p\n", attr, stacksize);
+  linfo("attr=%p stacksize=%p\n", attr, stacksize);
 
   if (!stacksize)
     {
diff --git a/libs/libc/pthread/pthread_attr_init.c b/libs/libc/pthread/pthread_attr_init.c
index e9ed898b8f..7831d5f7ad 100644
--- a/libs/libc/pthread/pthread_attr_init.c
+++ b/libs/libc/pthread/pthread_attr_init.c
@@ -71,7 +71,7 @@ int pthread_attr_init(FAR pthread_attr_t *attr)
 {
   int ret = OK;
 
-  linfo("attr=0x%p\n", attr);
+  linfo("attr=%p\n", attr);
   if (!attr)
     {
       ret = ENOMEM;
diff --git a/libs/libc/pthread/pthread_attr_setaffinity.c b/libs/libc/pthread/pthread_attr_setaffinity.c
index 019eba3363..c7b020662f 100644
--- a/libs/libc/pthread/pthread_attr_setaffinity.c
+++ b/libs/libc/pthread/pthread_attr_setaffinity.c
@@ -53,7 +53,7 @@ int pthread_attr_setaffinity_np(FAR pthread_attr_t *attr,
                                 size_t cpusetsize,
                                 FAR const cpu_set_t *cpuset)
 {
-  linfo("attr=0x%p cpusetsize=%d cpuset=0x%p\n",
+  linfo("attr=%p cpusetsize=%d cpuset=%p\n",
          attr, (int)cpusetsize, cpuset);
 
   DEBUGASSERT(attr != NULL && cpusetsize == sizeof(cpu_set_t) &&
diff --git a/libs/libc/pthread/pthread_attr_setschedparam.c b/libs/libc/pthread/pthread_attr_setschedparam.c
index da600f16cb..c4a338a8e2 100644
--- a/libs/libc/pthread/pthread_attr_setschedparam.c
+++ b/libs/libc/pthread/pthread_attr_setschedparam.c
@@ -55,7 +55,7 @@ int pthread_attr_setschedparam(FAR pthread_attr_t *attr,
 {
   int ret;
 
-  linfo("attr=0x%p param=0x%p\n", attr, param);
+  linfo("attr=%p param=%p\n", attr, param);
 
   if (!attr || !param)
     {
diff --git a/libs/libc/pthread/pthread_attr_setschedpolicy.c b/libs/libc/pthread/pthread_attr_setschedpolicy.c
index fd864d9dcb..87d52ce892 100644
--- a/libs/libc/pthread/pthread_attr_setschedpolicy.c
+++ b/libs/libc/pthread/pthread_attr_setschedpolicy.c
@@ -55,7 +55,7 @@ int pthread_attr_setschedpolicy(FAR pthread_attr_t *attr, int policy)
 {
   int ret;
 
-  linfo("attr=0x%p policy=%d\n", attr, policy);
+  linfo("attr=%p policy=%d\n", attr, policy);
 
   if (!attr ||
       (policy != SCHED_FIFO
diff --git a/libs/libc/pthread/pthread_attr_setstack.c b/libs/libc/pthread/pthread_attr_setstack.c
index 402ccf666d..9320107fca 100644
--- a/libs/libc/pthread/pthread_attr_setstack.c
+++ b/libs/libc/pthread/pthread_attr_setstack.c
@@ -55,7 +55,7 @@ int pthread_attr_setstack(FAR pthread_attr_t *attr,
 {
   int ret;
 
-  linfo("attr=0x%p stackaddr=0x%p stacksize=%ld\n",
+  linfo("attr=%p stackaddr=%p stacksize=%ld\n",
         attr, stackaddr, stacksize);
 
   if (!attr || !stackaddr || stacksize < PTHREAD_STACK_MIN)
diff --git a/libs/libc/pthread/pthread_attr_setstacksize.c b/libs/libc/pthread/pthread_attr_setstacksize.c
index 37691b5960..aaab30b2e8 100644
--- a/libs/libc/pthread/pthread_attr_setstacksize.c
+++ b/libs/libc/pthread/pthread_attr_setstacksize.c
@@ -53,7 +53,7 @@ int pthread_attr_setstacksize(FAR pthread_attr_t *attr, size_t stacksize)
 {
   int ret;
 
-  linfo("attr=0x%p stacksize=%zu\n", attr, stacksize);
+  linfo("attr=%p stacksize=%zu\n", attr, stacksize);
 
   if (!attr || stacksize < PTHREAD_STACK_MIN)
     {
diff --git a/libs/libc/pthread/pthread_condattr_destroy.c b/libs/libc/pthread/pthread_condattr_destroy.c
index 5a8ad5952b..827996b5aa 100644
--- a/libs/libc/pthread/pthread_condattr_destroy.c
+++ b/libs/libc/pthread/pthread_condattr_destroy.c
@@ -52,7 +52,7 @@ int pthread_condattr_destroy(FAR pthread_condattr_t *attr)
 {
   int ret = OK;
 
-  linfo("attr=0x%p\n", attr);
+  linfo("attr=%p\n", attr);
 
   if (!attr)
     {
diff --git a/libs/libc/pthread/pthread_condattr_init.c b/libs/libc/pthread/pthread_condattr_init.c
index edfab0f7bc..d217ceeaf8 100644
--- a/libs/libc/pthread/pthread_condattr_init.c
+++ b/libs/libc/pthread/pthread_condattr_init.c
@@ -52,7 +52,7 @@ int pthread_condattr_init(FAR pthread_condattr_t *attr)
 {
   int ret = OK;
 
-  linfo("attr=0x%p\n", attr);
+  linfo("attr=%p\n", attr);
 
   if (!attr)
     {
diff --git a/libs/libc/pthread/pthread_conddestroy.c b/libs/libc/pthread/pthread_conddestroy.c
index 1ae90a14f7..806a8bc461 100644
--- a/libs/libc/pthread/pthread_conddestroy.c
+++ b/libs/libc/pthread/pthread_conddestroy.c
@@ -56,7 +56,7 @@ int pthread_cond_destroy(FAR pthread_cond_t *cond)
   int ret = OK;
   int sval = 0;
 
-  sinfo("cond=0x%p\n", cond);
+  sinfo("cond=%p\n", cond);
 
   if (!cond)
     {
diff --git a/libs/libc/pthread/pthread_condinit.c b/libs/libc/pthread/pthread_condinit.c
index 37d1223ed2..83ba8002e2 100644
--- a/libs/libc/pthread/pthread_condinit.c
+++ b/libs/libc/pthread/pthread_condinit.c
@@ -54,7 +54,7 @@ int pthread_cond_init(FAR pthread_cond_t *cond,
 {
   int ret = OK;
 
-  sinfo("cond=0x%p attr=0x%p\n", cond, attr);
+  sinfo("cond=%p attr=%p\n", cond, attr);
 
   if (cond == NULL)
     {
diff --git a/libs/libc/pthread/pthread_mutexattr_destroy.c b/libs/libc/pthread/pthread_mutexattr_destroy.c
index 3bd3655a0d..01cefa6b9a 100644
--- a/libs/libc/pthread/pthread_mutexattr_destroy.c
+++ b/libs/libc/pthread/pthread_mutexattr_destroy.c
@@ -52,7 +52,7 @@ int pthread_mutexattr_destroy(FAR pthread_mutexattr_t *attr)
 {
   int ret = OK;
 
-  linfo("attr=0x%p\n", attr);
+  linfo("attr=%p\n", attr);
 
   if (!attr)
     {
diff --git a/libs/libc/pthread/pthread_mutexattr_getpshared.c b/libs/libc/pthread/pthread_mutexattr_getpshared.c
index d8a4309b30..2d42135e66 100644
--- a/libs/libc/pthread/pthread_mutexattr_getpshared.c
+++ b/libs/libc/pthread/pthread_mutexattr_getpshared.c
@@ -54,7 +54,7 @@ int pthread_mutexattr_getpshared(FAR const pthread_mutexattr_t *attr,
 {
   int ret = OK;
 
-  linfo("attr=0x%p pshared=0x%p\n", attr, pshared);
+  linfo("attr=%p pshared=%p\n", attr, pshared);
 
   if (!attr || !pshared)
     {
diff --git a/libs/libc/pthread/pthread_mutexattr_init.c b/libs/libc/pthread/pthread_mutexattr_init.c
index 5ce3c7e1a5..d04d5c52e4 100644
--- a/libs/libc/pthread/pthread_mutexattr_init.c
+++ b/libs/libc/pthread/pthread_mutexattr_init.c
@@ -52,7 +52,7 @@ int pthread_mutexattr_init(FAR pthread_mutexattr_t *attr)
 {
   int ret = OK;
 
-  linfo("attr=0x%p\n", attr);
+  linfo("attr=%p\n", attr);
 
   if (!attr)
     {
diff --git a/libs/libc/pthread/pthread_mutexattr_setprotocol.c b/libs/libc/pthread/pthread_mutexattr_setprotocol.c
index 6c3a347b01..d9acfd9fb5 100644
--- a/libs/libc/pthread/pthread_mutexattr_setprotocol.c
+++ b/libs/libc/pthread/pthread_mutexattr_setprotocol.c
@@ -51,7 +51,7 @@
 int pthread_mutexattr_setprotocol(FAR pthread_mutexattr_t *attr,
                                   int protocol)
 {
-  linfo("attr=0x%p protocol=%d\n", attr, protocol);
+  linfo("attr=%p protocol=%d\n", attr, protocol);
   DEBUGASSERT(attr != NULL);
 
   if (protocol >= PTHREAD_PRIO_NONE && protocol <= PTHREAD_PRIO_PROTECT)
diff --git a/libs/libc/pthread/pthread_mutexattr_setpshared.c b/libs/libc/pthread/pthread_mutexattr_setpshared.c
index 30ef1c58ae..ab8019718f 100644
--- a/libs/libc/pthread/pthread_mutexattr_setpshared.c
+++ b/libs/libc/pthread/pthread_mutexattr_setpshared.c
@@ -53,7 +53,7 @@ int pthread_mutexattr_setpshared(FAR pthread_mutexattr_t *attr, int pshared)
 {
   int ret = OK;
 
-  linfo("attr=0x%p pshared=%d\n", attr, pshared);
+  linfo("attr=%p pshared=%d\n", attr, pshared);
 
   if (!attr || (pshared != 0 && pshared != 1))
     {
diff --git a/libs/libc/stdio/lib_libvscanf.c b/libs/libc/stdio/lib_libvscanf.c
index 7f6652fd3c..56c3b444e1 100644
--- a/libs/libc/stdio/lib_libvscanf.c
+++ b/libs/libc/stdio/lib_libvscanf.c
@@ -864,17 +864,17 @@ int lib_vscanf(FAR struct lib_instream_s *obj, FAR int *lastc,
                       switch (modifier)
                         {
                         case HH_MOD:
-                          linfo("Return %ld to 0x%p\n", tmplong, pchar);
+                          linfo("Return %ld to %p\n", tmplong, pchar);
                           *pchar = (unsigned char)tmplong;
                           break;
 
                         case H_MOD:
-                          linfo("Return %ld to 0x%p\n", tmplong, pshort);
+                          linfo("Return %ld to %p\n", tmplong, pshort);
                           *pshort = (unsigned short)tmplong;
                           break;
 
                         case NO_MOD:
-                          linfo("Return %ld to 0x%p\n", tmplong, pint);
+                          linfo("Return %ld to %p\n", tmplong, pint);
                           *pint = (unsigned int)tmplong;
                           break;
 
@@ -882,13 +882,13 @@ int lib_vscanf(FAR struct lib_instream_s *obj, FAR int *lastc,
                         case L_MOD:
 #endif
                         default:
-                          linfo("Return %ld to 0x%p\n", tmplong, plong);
+                          linfo("Return %ld to %p\n", tmplong, plong);
                           *plong = tmplong;
                           break;
 
 #ifdef CONFIG_LIBC_LONG_LONG
                         case LL_MOD:
-                          linfo("Return %lld to 0x%p\n", tmplonglong,
+                          linfo("Return %lld to %p\n", tmplonglong,
                                 plonglong);
                           *plonglong = tmplonglong;
                           break;