[SCM] Samba Shared Repository - branch master updated -
d205766e60be96449930f270b0a77002dffab278
Jeremy Allison
jra at samba.org
Sat Nov 22 06:51:32 GMT 2008
The branch, master has been updated
via d205766e60be96449930f270b0a77002dffab278 (commit)
from 338303eb379320411829ee3dd1621e490f8d7fe1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d205766e60be96449930f270b0a77002dffab278
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 22:51:20 2008 -0800
Fix a C90 error.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_streams_depot.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c
index e7eceda..0d6e0e0 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -116,6 +116,7 @@ static char *stream_dir(vfs_handle_struct *handle, const char *base_path,
char *id_hex;
struct file_id id;
uint8 id_buf[16];
+ const char *rootdir;
tmp = talloc_asprintf(talloc_tos(), "%s/.streams", handle->conn->connectpath);
@@ -124,7 +125,7 @@ static char *stream_dir(vfs_handle_struct *handle, const char *base_path,
goto fail;
}
- const char *rootdir = lp_parm_const_string(
+ rootdir = lp_parm_const_string(
SNUM(handle->conn), "streams_depot", "directory",
tmp);
TALLOC_FREE(tmp);
@@ -149,7 +150,7 @@ static char *stream_dir(vfs_handle_struct *handle, const char *base_path,
first = hash & 0xff;
second = (hash >> 8) & 0xff;
- id_hex = hex_encode(talloc_tos(), id_buf, sizeof(id_buf));
+ id_hex = hex_encode_talloc(talloc_tos(), id_buf, sizeof(id_buf));
if (id_hex == NULL) {
errno = ENOMEM;
--
Samba Shared Repository
More information about the samba-cvs
mailing list