[SCM] Samba Shared Repository - branch master updated

Ralph Böhme slow at samba.org
Wed May 16 19:30:02 UTC 2018


The branch, master has been updated
       via  010cdda Convert affected by previous commit lines from DEBUG(10,..) to DBG_DEBUG().
       via  d3cbcbd Remove extra 0x prefix for the "%p" format specifiers, avoiding 0x0x0 strings in the output.
      from  c0fd6cd script: Add 'random-seed' option to traffic_replay

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 010cddae6c46d6ece67b80d4f6697a793f9b5350
Author: Timur I. Bakeyev <timur at iXsystems.com>
Date:   Sun May 13 12:18:21 2018 +0800

    Convert affected by previous commit lines from DEBUG(10,..) to DBG_DEBUG().
    
    Signed-off-by: Timur I. Bakeyev <timur at iXsystems.com>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Wed May 16 21:29:24 CEST 2018 on sn-devel-144

commit d3cbcbd5c0b22ce8ef368f2278fa4421c91f7502
Author: Timur I. Bakeyev <timur at iXsystems.com>
Date:   Thu May 10 10:28:07 2018 +0800

    Remove extra 0x prefix for the "%p" format specifiers, avoiding 0x0x0 strings in the output.
    
    Signed-off-by: Timur I. Bakeyev <timur at iXsystems.com>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 lib/dbwrap/dbwrap_tdb.c     |  4 ++--
 lib/talloc/pytalloc.c       |  2 +-
 source3/modules/vfs_catia.c |  4 ++--
 source3/smbd/open.c         | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/dbwrap/dbwrap_tdb.c b/lib/dbwrap/dbwrap_tdb.c
index c30bede..f597645 100644
--- a/lib/dbwrap/dbwrap_tdb.c
+++ b/lib/dbwrap/dbwrap_tdb.c
@@ -58,7 +58,7 @@ static void db_tdb_log_key(const char *prefix, TDB_DATA key)
 	}
 	keystr = hex_encode_talloc(frame, (unsigned char *)(key.dptr),
 				   len);
-	DEBUG(10, ("%s key %s\n", prefix, keystr));
+	DBG_DEBUG("%s key %s\n", prefix, keystr);
 	TALLOC_FREE(frame);
 }
 
@@ -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;
 
-	DEBUG(10, ("Allocated locked data 0x%p\n", state.result));
+	DBG_DEBUG("Allocated locked data %p\n", state.result);
 
 	return state.result;
 }
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 3532fdf..95dbb29 100644
--- 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);
 
-	return PyStr_FromFormat("<%s talloc object at 0x%p>",
+	return PyStr_FromFormat("<%s talloc object at %p>",
 				type->tp_name, talloc_obj->ptr);
 }
 
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index b8c61e2..ed22fa8 100644
--- 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)
 {
-	DEBUG(lvl, ("%s: cc [0x%p] cc->busy [0x%p] "
+	DEBUG(lvl, ("%s: cc [%p] cc->busy [%p] "
 		    "is_fsp_ext [%s] "
-		    "fsp [0x%p] fsp name [%s] "
+		    "fsp [%p] fsp name [%s] "
 		    "orig_fname [%s] "
 		    "fname [%s] "
 		    "orig_base_fname [%s] "
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index d385b54..61a42e2 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -5047,11 +5047,11 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
 	files_struct *fsp = NULL;
 	NTSTATUS status;
 
-	DEBUG(10,("create_file_unixpath: access_mask = 0x%x "
+	DBG_DEBUG("create_file_unixpath: access_mask = 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,
@@ -5060,7 +5060,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
 		  (unsigned int)create_options,
 		  (unsigned int)oplock_request,
 		  (unsigned int)private_flags,
-		  ea_list, sd, smb_fname_str_dbg(smb_fname)));
+		  ea_list, sd, smb_fname_str_dbg(smb_fname));
 
 	if (create_options & FILE_OPEN_BY_FILE_ID) {
 		status = NT_STATUS_NOT_SUPPORTED;
@@ -5589,12 +5589,12 @@ NTSTATUS create_file_default(connection_struct *conn,
 	NTSTATUS status;
 	bool stream_name = false;
 
-	DEBUG(10,("create_file: access_mask = 0x%x "
+	DBG_DEBUG("create_file: access_mask = 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 "
-		  "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,
@@ -5604,7 +5604,7 @@ NTSTATUS create_file_default(connection_struct *conn,
 		  (unsigned int)oplock_request,
 		  (unsigned int)private_flags,
 		  (unsigned int)root_dir_fid,
-		  ea_list, sd, smb_fname_str_dbg(smb_fname)));
+		  ea_list, sd, smb_fname_str_dbg(smb_fname));
 
 	/*
 	 * Calculate the filename from the root_dir_if if necessary.


-- 
Samba Shared Repository



More information about the samba-cvs mailing list