From: Ralph Boehme <slow@samba.org>
Date: Wed, 7 Aug 2019 09:55:44 +0000 (+0200)
Subject: s3:mdssvc: README.Coding fixes, long lines, modernize debug macros
X-Git-Tag: tdb-1.4.2~234
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17f29fa86772a3fe9c03ecee6813c377d85dde6c;p=thirdparty%2Fsamba.git

s3:mdssvc: README.Coding fixes, long lines, modernize debug macros

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/rpc_server/mdssvc/mdssvc.c b/source3/rpc_server/mdssvc/mdssvc.c
index 58a219bedb0..41aa089bf20 100644
--- a/source3/rpc_server/mdssvc/mdssvc.c
+++ b/source3/rpc_server/mdssvc/mdssvc.c
@@ -820,12 +820,13 @@ static void tracker_cursor_cb(GObject *object,
 	 * not as the user.
 	 */
 	if (!become_authenticated_pipe_user(slq->mds_ctx->pipe_session_info)) {
-		DBG_ERR("can't become authenticated user: %d\n", slq->mds_ctx->uid);
+		DBG_ERR("can't become authenticated user: %d\n",
+			slq->mds_ctx->uid);
 		smb_panic("can't become authenticated user");
 	}
 
 	if (geteuid() != slq->mds_ctx->uid) {
-		DEBUG(0, ("uid mismatch: %d/%d\n", geteuid(), slq->mds_ctx->uid));
+		DBG_ERR("uid mismatch: %d/%d\n", geteuid(), slq->mds_ctx->uid);
 		smb_panic("uid mismatch");
 	}
 
@@ -854,8 +855,11 @@ static void tracker_cursor_cb(GObject *object,
 		 * set of IDs. Note that we're faking CNIDs by using
 		 * filesystem inode numbers here
 		 */
-		ok = bsearch(&ino64, slq->cnids, slq->cnids_num,
-			     sizeof(uint64_t), cnid_comp_fn);
+		ok = bsearch(&ino64,
+			     slq->cnids,
+			     slq->cnids_num,
+			     sizeof(uint64_t),
+			     cnid_comp_fn);
 		if (!ok) {
 			goto done;
 		}
@@ -866,16 +870,19 @@ static void tracker_cursor_cb(GObject *object,
 	 * we return as part of the result set of a query
 	 */
 	result = dalloc_add_copy(slq->query_results->cnids->ca_cnids,
-				 &ino64, uint64_t);
+				 &ino64,
+				 uint64_t);
 	if (result != 0) {
-		DEBUG(1, ("dalloc error\n"));
+		DBG_ERR("dalloc error\n");
 		slq->state = SLQ_STATE_ERROR;
 		return;
 	}
-	ok = add_filemeta(slq->reqinfo, slq->query_results->fm_array,
-			  path, &sb);
+	ok = add_filemeta(slq->reqinfo,
+			  slq->query_results->fm_array,
+			  path,
+			  &sb);
 	if (!ok) {
-		DEBUG(1, ("add_filemeta error\n"));
+		DBG_ERR("add_filemeta error\n");
 		slq->state = SLQ_STATE_ERROR;
 		return;
 	}
@@ -1251,7 +1258,6 @@ static bool slrpc_open_query(struct mds_ctx *mds_ctx,
 		goto error;
 	}
 
-
 	reqinfo = dalloc_value_for_key(query, "DALLOC_CTX", 0,
 				       "DALLOC_CTX", 1, "kMDAttributeArray");
 	if (reqinfo == NULL) {