[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-879-gf4e2f7b

[Steven Danneman]

The branch, v3-4-test has been updated
       via  f4e2f7bc23da5f73311bb7adeab2838af14bdeaf (commit)
      from  651ae5c705c15c84882f6c1c3d73292794c63aa9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit f4e2f7bc23da5f73311bb7adeab2838af14bdeaf
Author: Steven Danneman <steven.danne...@isilon.com>
Date:   Tue May 5 14:42:19 2009 -0700

    s3:onefs.so Change system function names
    
    Addendum to c49730e1.  Use newer cookie conversion names.

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

Summary of changes:
 source3/modules/onefs_dir.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/onefs_dir.c b/source3/modules/onefs_dir.c
index 8c056d9..47da33f 100644
--- a/source3/modules/onefs_dir.c
+++ b/source3/modules/onefs_dir.c
@@ -431,7 +431,7 @@ onefs_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR 
*dirp, long offset)
        }
 
        /* Convert offset to resume_cookie */
-       resume_cookie = rdp_offset2cookie(offset);
+       resume_cookie = rdp_offset31_to_cookie63(offset);
 
        DEBUG(9, ("Seek DIR %p, offset: %ld, resume_cookie: %#llx\n",
                 dsp->dirp, offset, resume_cookie));
@@ -487,11 +487,11 @@ onefs_telldir(vfs_handle_struct *handle,  SMB_STRUCT_DIR 
*dirp)
        }
 
        /* Convert resume_cookie to offset */
-       offset = rdp_cookie2offset(dsp->resume_cookie);
+       offset = rdp_cookie63_to_offset31(dsp->resume_cookie);
        if (offset < 0) {
                DEBUG(1, ("Unable to convert resume_cookie: %#llx to a "
-                        "suitable 32-bit offset value.\n",
-                        dsp->resume_cookie));
+                        "suitable 32-bit offset value. Error: %s\n",
+                        dsp->resume_cookie, strerror(errno)));
                return -1;
        }
 


-- 
Samba Shared Repository