The branch, master has been updated
via 4dfded0 s3: Use file_id_string in file_id_string_tos
via e44b231 s3: Fix some nonempty line endings
from 88332df lib/param: fix line length of DEBUG statments touched in
previous commit in set_variable()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4dfded000c8d8d62b1160fdf41357ccd8a77254b
Author: Volker Lendecke <v...@samba.org>
Date: Mon Oct 29 16:41:15 2012 +0100
s3: Use file_id_string in file_id_string_tos
Reviewed by Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Tue Oct 30 00:05:34 CET 2012 on sn-devel-104
commit e44b231f5823bd7a08a65391094db1b7b1eb94e8
Author: Volker Lendecke <v...@samba.org>
Date: Mon Oct 29 16:35:49 2012 +0100
s3: Fix some nonempty line endings
Reviewed by Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/file_id.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/file_id.c b/source3/lib/file_id.c
index 1640708..ba4b3a3 100644
--- a/source3/lib/file_id.c
+++ b/source3/lib/file_id.c
@@ -1,20 +1,20 @@
-/*
+/*
Unix SMB/CIFS implementation.
file_id structure handling
Copyright (C) Andrew Tridgell 2007
-
+
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/>.
*/
@@ -36,12 +36,7 @@ bool file_id_equal(const struct file_id *id1, const struct
file_id *id2)
*/
const char *file_id_string_tos(const struct file_id *id)
{
- char *result = talloc_asprintf(talloc_tos(), "%llx:%llx:%llx",
- (unsigned long long)id->devid,
- (unsigned long long)id->inode,
- (unsigned long long)id->extid);
- SMB_ASSERT(result != NULL);
- return result;
+ return file_id_string(talloc_tos(), id);
}
/*
--
Samba Shared Repository
