Use an index i rather than re-using a state variable.
authorJeremy Allison <jra@samba.org>
Mon, 8 Apr 2013 23:38:03 +0000 (16:38 -0700)
committerKarolin Seeger <kseeger@samba.org>
Wed, 19 Jun 2013 08:55:34 +0000 (10:55 +0200)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
source3/modules/vfs_dirsort.c

index 7185e5b0a6ce0ef1cd3737b8f918a4d69cf49536..a3d106da22e4f87309217825fecdb6dff6a20975 100644 (file)
@@ -44,7 +44,7 @@ static bool open_and_sort_dir (vfs_handle_struct *handle)
 {
        SMB_STRUCT_DIRENT *dp;
        struct stat dir_stat;
-       long current_pos;
+       unsigned int i;
        struct dirsort_privates *data = NULL;
 
        SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates,
@@ -77,15 +77,13 @@ static bool open_and_sort_dir (vfs_handle_struct *handle)
        if (!data->directory_list) {
                return false;
        }
-       current_pos = data->pos;
-       data->pos = 0;
+       i = 0;
        while ((dp = SMB_VFS_NEXT_READDIR(handle, data->source_directory,
                                          NULL)) != NULL) {
-               data->directory_list[data->pos++] = *dp;
+               data->directory_list[i++] = *dp;
        }
 
        /* Sort the directory entries by name */
-       data->pos = current_pos;
        TYPESAFE_QSORT(data->directory_list, data->number_of_entries, compare_dirent);
        return true;
 }