svn commit: samba r15189 - in branches/SAMBA_4_0/source: include/system ntvfs/posix

[jpeach at samba.org]

Author: jpeach
Date: 2006-04-24 02:36:55 +0000 (Mon, 24 Apr 2006)
New Revision: 15189

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15189

Log:
Add parentheses to force ISDOt and ISDOTDOT evaluation order. Fix typo
that made the BASE-DIR2 test fail.

Modified:
   branches/SAMBA_4_0/source/include/system/dir.h
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_dirlist.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/system/dir.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/dir.h	2006-04-24 01:26:31 UTC (rev 15188)
+++ branches/SAMBA_4_0/source/include/system/dir.h	2006-04-24 02:36:55 UTC (rev 15189)
@@ -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
 

Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_dirlist.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_dirlist.c	2006-04-24 01:26:31 UTC (rev 15188)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_dirlist.c	2006-04-24 02:36:55 UTC (rev 15189)
@@ -218,7 +218,7 @@
 	while ((de = readdir(dir->dir))) {
 		const char *dname = de->d_name;
 
-		if (ISDOT(dname) || ISDOT(dname)) {
+		if (ISDOT(dname) || ISDOTDOT(dname)) {
 			continue;
 		}