diff options
| author | Volker Lendecke <vl@samba.org> | 2015-02-24 13:46:09 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-02-26 18:51:10 +0100 |
| commit | f2f9acc113e7c1dd9bca0c4cba8e503d18286d13 (patch) | |
| tree | 67d2afd4f6f171ce40bbabb2d467df719a8f44a8 /source3/smbd/dir.c | |
| parent | 4cdbf81243c03834fc534ce264c18d743c22f727 (diff) | |
| download | samba-f2f9acc113e7c1dd9bca0c4cba8e503d18286d13.tar.gz | |
smbd: Simplify ReadDirName
In the if-branches we return, so no "else" necessary
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/smbd/dir.c')
| -rw-r--r-- | source3/smbd/dir.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index aa81a38b362..073ac2fc2ad 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -1652,14 +1652,16 @@ const char *ReadDirName(struct smb_Dir *dirp, long *poffset, dirp->file_number++; *ptalloced = NULL; return n; - } else if (*poffset == END_OF_DIRECTORY_OFFSET) { + } + + if (*poffset == END_OF_DIRECTORY_OFFSET) { *poffset = dirp->offset = END_OF_DIRECTORY_OFFSET; return NULL; - } else { - /* A real offset, seek to it. */ - SeekDir(dirp, *poffset); } + /* A real offset, seek to it. */ + SeekDir(dirp, *poffset); + while ((n = vfs_readdirname(conn, dirp->dir, sbuf, &talloced))) { /* Ignore . and .. - we've already returned them. */ if (*n == '.') { |