[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  a47780a s3: Fix some nonblank line endings
       via  259cb94 s3: Remove unused dbwrap_record_get_private_data
      from  20654d6 s3-winbind: Remove unused keys from list.

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


- Log -----------------------------------------------------------------
commit a47780af229d433c75d810a4f345f996811caa65
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Dec 2 17:40:33 2011 +0100

    s3: Fix some nonblank line endings
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Fri Dec  2 20:39:33 CET 2011 on sn-devel-104

commit 259cb94c1107bf30bebbb2a084208c1b4a3e9a77
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Dec 2 17:39:13 2011 +0100

    s3: Remove unused dbwrap_record_get_private_data
    
    db_record->private_data is for backends which can include dbwrap_private.h
    anyway.

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

Summary of changes:
 source3/lib/dbwrap/dbwrap.c |   13 ++++---------
 source3/lib/dbwrap/dbwrap.h |    1 -
 2 files changed, 4 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/dbwrap/dbwrap.c b/source3/lib/dbwrap/dbwrap.c
index cdc46c3..7d96926 100644
--- a/source3/lib/dbwrap/dbwrap.c
+++ b/source3/lib/dbwrap/dbwrap.c
@@ -1,20 +1,20 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Database interface wrapper
    Copyright (C) Jim McDonough <jmcd at us.ibm.com> 2006
 
    Major code contributions from Aleksey Fedoseev (fedoseev at ru.ibm.com)
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -110,11 +110,6 @@ TDB_DATA dbwrap_record_get_value(const struct db_record *rec)
 	return rec->value;
 }
 
-void *dbwrap_record_get_private_data(const struct db_record *rec)
-{
-	return rec->private_data;
-}
-
 NTSTATUS dbwrap_record_store(struct db_record *rec, TDB_DATA data, int flags)
 {
 	return rec->store(rec, data, flags);
diff --git a/source3/lib/dbwrap/dbwrap.h b/source3/lib/dbwrap/dbwrap.h
index f0646d3..41e6833 100644
--- a/source3/lib/dbwrap/dbwrap.h
+++ b/source3/lib/dbwrap/dbwrap.h
@@ -29,7 +29,6 @@ struct db_context;
 
 TDB_DATA dbwrap_record_get_key(const struct db_record *rec);
 TDB_DATA dbwrap_record_get_value(const struct db_record *rec);
-void *dbwrap_record_get_private_data(const struct db_record *rec);
 NTSTATUS dbwrap_record_store(struct db_record *rec, TDB_DATA data, int flags);
 NTSTATUS dbwrap_record_delete(struct db_record *rec);
 struct db_record *dbwrap_fetch_locked(struct db_context *db,


-- 
Samba Shared Repository