Remove extra 0x prefix for the "%p" format specifiers, avoiding 0x0x0 strings in...

Signed-off-by: Timur I. Bakeyev <timur@iXsystems.com>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/lib/dbwrap/dbwrap_tdb.c b/lib/dbwrap/dbwrap_tdb.c
index c30bedee77548c54f00433f402da235b578551b9..28e09d31963a933ea544048a7d75ecc28a897409 100644 (file)
--- a/lib/dbwrap/dbwrap_tdb.c
+++ b/lib/dbwrap/dbwrap_tdb.c
@@ -142,7 +142,7 @@ static struct db_record *db_tdb_fetch_locked_internal(
        state.result->storev = db_tdb_storev;
        state.result->delete_rec = db_tdb_delete;
 
        state.result->storev = db_tdb_storev;
        state.result->delete_rec = db_tdb_delete;
 

-       DEBUG(10, ("Allocated locked data 0x%p\n", state.result));
+       DEBUG(10, ("Allocated locked data %p\n", state.result));

 
        return state.result;
 }
 
        return state.result;
 }

diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 3532fdf529149ed636b6de351b210f0734f46d92..95dbb297a4606f144f5eacb84fe0911e98cfe5c1 100644 (file)
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -86,7 +86,7 @@ static PyObject *pytalloc_default_repr(PyObject *obj)
        pytalloc_Object *talloc_obj = (pytalloc_Object *)obj;
        PyTypeObject *type = (PyTypeObject*)PyObject_Type(obj);
 
        pytalloc_Object *talloc_obj = (pytalloc_Object *)obj;
        PyTypeObject *type = (PyTypeObject*)PyObject_Type(obj);
 

-       return PyStr_FromFormat("<%s talloc object at 0x%p>",
+       return PyStr_FromFormat("<%s talloc object at %p>",

                                type->tp_name, talloc_obj->ptr);
 }
 
                                type->tp_name, talloc_obj->ptr);
 }
 

diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index b8c61e26ab8c1014c7d87269b071e3f22282e3cc..ed22fa833b302e265cd1df70cdd9663a628fedd6 100644 (file)
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -251,9 +251,9 @@ static void catia_debug_cc(int lvl,
                           files_struct *fsp,
                           const char *location)
 {
                           files_struct *fsp,
                           const char *location)
 {

-       DEBUG(lvl, ("%s: cc [0x%p] cc->busy [0x%p] "
+       DEBUG(lvl, ("%s: cc [%p] cc->busy [%p] "

                    "is_fsp_ext [%s] "
                    "is_fsp_ext [%s] "

-                   "fsp [0x%p] fsp name [%s] "
+                   "fsp [%p] fsp name [%s] "

                    "orig_fname [%s] "
                    "fname [%s] "
                    "orig_base_fname [%s] "
                    "orig_fname [%s] "
                    "fname [%s] "
                    "orig_base_fname [%s] "

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index d385b54147f32d227656aa11080619d52d4c9e84..3adea77902f4fab613c9c480ed5fbdfab9bf4ac2 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -5051,7 +5051,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
                  "file_attributes = 0x%x, share_access = 0x%x, "
                  "create_disposition = 0x%x create_options = 0x%x "
                  "oplock_request = 0x%x private_flags = 0x%x "
                  "file_attributes = 0x%x, share_access = 0x%x, "
                  "create_disposition = 0x%x create_options = 0x%x "
                  "oplock_request = 0x%x private_flags = 0x%x "

-                 "ea_list = 0x%p, sd = 0x%p, "
+                 "ea_list = %p, sd = %p, "

                  "fname = %s\n",
                  (unsigned int)access_mask,
                  (unsigned int)file_attributes,
                  "fname = %s\n",
                  (unsigned int)access_mask,
                  (unsigned int)file_attributes,


@@ -5594,7 +5594,7 @@ NTSTATUS create_file_default(connection_struct *conn,
                  "create_disposition = 0x%x create_options = 0x%x "
                  "oplock_request = 0x%x "
                  "private_flags = 0x%x "
                  "create_disposition = 0x%x create_options = 0x%x "
                  "oplock_request = 0x%x "
                  "private_flags = 0x%x "

-                 "root_dir_fid = 0x%x, ea_list = 0x%p, sd = 0x%p, "
+                 "root_dir_fid = 0x%x, ea_list = %p, sd = %p, "

                  "fname = %s\n",
                  (unsigned int)access_mask,
                  (unsigned int)file_attributes,
                  "fname = %s\n",
                  (unsigned int)access_mask,
                  (unsigned int)file_attributes,