[PATCH] Fix 2 clang warnings

Volker Lendecke Volker.Lendecke at SerNet.DE
Mon Nov 24 07:55:57 MST 2014


Hi!

I'd appreciate review&push!

Thanks,

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 06161d210a6540f836f2e793ce2d352b8cad55bd Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Mon, 24 Nov 2014 14:34:24 +0100
Subject: [PATCH 1/2] dsdb: Remove a self-assignment

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source4/dsdb/samdb/ldb_modules/dirsync.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source4/dsdb/samdb/ldb_modules/dirsync.c b/source4/dsdb/samdb/ldb_modules/dirsync.c
index c93189e..b5510ec 100644
--- a/source4/dsdb/samdb/ldb_modules/dirsync.c
+++ b/source4/dsdb/samdb/ldb_modules/dirsync.c
@@ -571,7 +571,6 @@ skip:
 							if (tmpel->values == NULL) {
 								return ldb_oom(ldb);
 							}
-							tmpel = tmpel;
 						}
 						tmpel->values[tmpel->num_values -1].data =talloc_steal(tmpel->values, el->values[k].data);
 						tmpel->values[tmpel->num_values -1].length = el->values[k].length;
-- 
1.9.1


From 1b7f8f73e41ba5216423ef6587edb494b1bcf640 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Mon, 24 Nov 2014 14:52:42 +0100
Subject: [PATCH 2/2] dbwrap: Fix a enum conversion

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 lib/dbwrap/dbwrap_ntdb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dbwrap/dbwrap_ntdb.c b/lib/dbwrap/dbwrap_ntdb.c
index 5be5414..5a8ce4b 100644
--- a/lib/dbwrap/dbwrap_ntdb.c
+++ b/lib/dbwrap/dbwrap_ntdb.c
@@ -313,7 +313,7 @@ static enum NTDB_ERROR db_ntdb_parser(NTDB_DATA key, NTDB_DATA data,
 				      struct db_ntdb_parse_state *state)
 {
 	state->parser(key, data, state->private_data);
-	return TDB_SUCCESS;
+	return NTDB_SUCCESS;
 }
 
 static NTSTATUS db_ntdb_parse(struct db_context *db, TDB_DATA key,
-- 
1.9.1



More information about the samba-technical mailing list