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/smbd/oplock_irix.c | |
| 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/smbd/oplock_irix.c')
| -rw-r--r-- | source3/smbd/oplock_irix.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c index 75f807f86b..dde32fa288 100644 --- a/source3/smbd/oplock_irix.c +++ b/source3/smbd/oplock_irix.c @@ -154,7 +154,7 @@ static files_struct *irix_oplock_receive_message(fd_set *fds) DEBUG(5,("irix_oplock_receive_message: kernel oplock break request " "received for file_id %s gen_id = %ul", - file_id_static_string(&fsp->file_id), + file_id_string_tos(&fsp->file_id), fsp->fh->gen_id )); return fsp; @@ -171,7 +171,7 @@ static BOOL irix_set_kernel_oplock(files_struct *fsp, int oplock_type) DEBUG(0,("irix_set_kernel_oplock: Unable to get " "kernel oplock on file %s, file_id %s " "gen_id = %ul. Error was %s\n", - fsp->fsp_name, file_id_static_string(&fsp->file_id), + fsp->fsp_name, file_id_string_tos(&fsp->file_id), fsp->fh->gen_id, strerror(errno) )); } else { @@ -180,7 +180,7 @@ static BOOL irix_set_kernel_oplock(files_struct *fsp, int oplock_type) "gen_id = %ul. Another process had the file " "open.\n", fsp->fsp_name, fsp->fh->fd, - file_id_static_string(&fsp->file_id), + file_id_string_tos(&fsp->file_id), fsp->fh->gen_id )); } return False; @@ -188,7 +188,7 @@ static BOOL irix_set_kernel_oplock(files_struct *fsp, int oplock_type) DEBUG(10,("irix_set_kernel_oplock: got kernel oplock on file %s, file_id = %s " "gen_id = %ul\n", - fsp->fsp_name, file_id_static_string(&fsp->file_id), + fsp->fsp_name, file_id_string_tos(&fsp->file_id), fsp->fh->gen_id)); return True; @@ -208,7 +208,7 @@ static void irix_release_kernel_oplock(files_struct *fsp) int state = sys_fcntl_long(fsp->fh->fd, F_OPLKACK, -1); dbgtext("irix_release_kernel_oplock: file %s, file_id = %s" "gen_id = %ul, has kernel oplock state " - "of %x.\n", fsp->fsp_name, file_id_static_string(&fsp->file_id), + "of %x.\n", fsp->fsp_name, file_id_string_tos(&fsp->file_id), fsp->fh->gen_id, state ); } @@ -221,7 +221,7 @@ static void irix_release_kernel_oplock(files_struct *fsp) "removing kernel oplock on file " ); dbgtext("%s, file_id = %s gen_id = %ul. " "Error was %s\n", - fsp->fsp_name, file_id_static_string(&fsp->file_id), + fsp->fsp_name, file_id_string_tos(&fsp->file_id), fsp->fh->gen_id, strerror(errno) ); } |