summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2006-04-24 02:36:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:04:15 -0500
commitcdae64b18c46926f32ecee71896e60b66228e8b0 (patch)
tree2661214539222d732d9f88d9e5b802ebf29857c5 /source4
parent7baa8a13aa751e2a1de287d43de0884ea638f04e (diff)
downloadsamba-cdae64b18c46926f32ecee71896e60b66228e8b0.tar.gz
samba-cdae64b18c46926f32ecee71896e60b66228e8b0.tar.bz2
samba-cdae64b18c46926f32ecee71896e60b66228e8b0.zip
r15189: Add parentheses to force ISDOt and ISDOTDOT evaluation order. Fix typo
that made the BASE-DIR2 test fail. (This used to be commit dcebc59a987b3c0d8379912d0451dedb9e895451)
Diffstat (limited to 'source4')
-rw-r--r--source4/include/system/dir.h10
-rw-r--r--source4/ntvfs/posix/pvfs_dirlist.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/include/system/dir.h b/source4/include/system/dir.h
index ce6aae0264..14b36c0da0 100644
--- a/source4/include/system/dir.h
+++ b/source4/include/system/dir.h
@@ -46,16 +46,16 @@
*/
#ifndef ISDOT
#define ISDOT(path) ( \
- *((const char *)path) == '.' && \
- *(((const char *)path) + 1) == '\0' \
+ *((const char *)(path)) == '.' && \
+ *(((const char *)(path)) + 1) == '\0' \
)
#endif
#ifndef ISDOTDOT
#define ISDOTDOT(path) ( \
- *((const char *)path) == '.' && \
- *(((const char *)path) + 1) == '.' && \
- *(((const char *)path) + 2) == '\0' \
+ *((const char *)(path)) == '.' && \
+ *(((const char *)(path)) + 1) == '.' && \
+ *(((const char *)(path)) + 2) == '\0' \
)
#endif
diff --git a/source4/ntvfs/posix/pvfs_dirlist.c b/source4/ntvfs/posix/pvfs_dirlist.c
index a3eaca3cbb..517f5b68d0 100644
--- a/source4/ntvfs/posix/pvfs_dirlist.c
+++ b/source4/ntvfs/posix/pvfs_dirlist.c
@@ -218,7 +218,7 @@ const char *pvfs_list_next(struct pvfs_dir *dir, uint_t *ofs)
while ((de = readdir(dir->dir))) {
const char *dname = de->d_name;
- if (ISDOT(dname) || ISDOT(dname)) {
+ if (ISDOT(dname) || ISDOTDOT(dname)) {
continue;
}