diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-09-10 10:56:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:30:36 -0500 |
| commit | 4ee8b2937d48308c6089fb539fdbd8625dfde360 (patch) | |
| tree | 738ce5408f32af68a66d8545257e7d226c2a7586 /source3/locking | |
| parent | 3428c63aa74f46c3db65736bf1c56502fad2362c (diff) | |
| download | samba-4ee8b2937d48308c6089fb539fdbd8625dfde360.tar.gz samba-4ee8b2937d48308c6089fb539fdbd8625dfde360.tar.bz2 samba-4ee8b2937d48308c6089fb539fdbd8625dfde360.zip | |
r25055: Add file_id_string_tos
This removes file_id_string_static and file_id_string_static2
(This used to be commit 638c848c9afe374feb30e34c494f89b2a6c64f7b)
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/brlock.c | 2 | ||||
| -rw-r--r-- | source3/locking/locking.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 4e15670b04..c148fa33f3 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -1682,7 +1682,7 @@ static struct byte_range_lock *brl_get_locks_internal(TALLOC_CTX *mem_ctx, struct lock_struct *locks = br_lck->lock_data; DEBUG(10,("brl_get_locks_internal: %u current locks on file_id %s\n", br_lck->num_locks, - file_id_static_string(&fsp->file_id))); + file_id_string_tos(&fsp->file_id))); for( i = 0; i < br_lck->num_locks; i++) { print_lock_struct(i, &locks[i]); } diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 7f1f8f41e1..4d6265cc7c 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -458,7 +458,7 @@ char *share_mode_str(int num, struct share_mode_entry *e) e->share_access, e->private_options, e->access_mask, e->op_mid, e->op_type, e->share_file_id, (unsigned int)e->uid, (unsigned int)e->flags, - file_id_static_string(&e->id)); + file_id_string_tos(&e->id)); return share_str; } @@ -906,7 +906,7 @@ BOOL rename_share_filename(struct messaging_context *msg_ctx, DEBUG(10,("rename_share_filename: sending rename message to pid %s " "file_id %s sharepath %s newname %s\n", procid_str_static(&se->pid), - file_id_static_string(&lck->id), + file_id_string_tos(&lck->id), lck->servicepath, lck->filename )); messaging_send_buf(msg_ctx, se->pid, MSG_SMB_FILE_RENAME, |