From fffce9aee4c7c93e140eb56e449f9a9ff6345659 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 24 May 2012 20:45:07 -0400 Subject: [PATCH] Windows: Make CCB_FLAGS_DIRECTORY_QUERY_MAPPED consistent Use CCB_FLAG_DIRECTORY_QUERY_MAPPED instead of CCB_FLAGS_DIRECTORY_QUERY_MAPPED. Change-Id: I504b8fda9867a82e5b45d5a1905970a1de11fc27 Reviewed-on: http://gerrit.openafs.org/7477 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp | 4 ++-- src/WINNT/afsrdr/kernel/lib/Include/AFSDefines.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp b/src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp index e7346f2940..d9e3e9668e 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp @@ -206,7 +206,7 @@ AFSQueryDirectory( IN PIRP Irp) bReturnSingleEntry = BooleanFlagOn( pIrpSp->Flags, SL_RETURN_SINGLE_ENTRY); bIndexSpecified = BooleanFlagOn( pIrpSp->Flags, SL_INDEX_SPECIFIED); - bInitialQuery = (BOOLEAN)( !BooleanFlagOn( pCcb->Flags, CCB_FLAGS_DIRECTORY_QUERY_MAPPED)); + bInitialQuery = (BOOLEAN)( !BooleanFlagOn( pCcb->Flags, CCB_FLAG_DIRECTORY_QUERY_MAPPED)); if( bInitialQuery) { @@ -358,7 +358,7 @@ AFSQueryDirectory( IN PIRP Irp) try_return( ntStatus); } - SetFlag( pCcb->Flags, CCB_FLAGS_DIRECTORY_QUERY_MAPPED); + SetFlag( pCcb->Flags, CCB_FLAG_DIRECTORY_QUERY_MAPPED); ClearFlag( pCcb->Flags, CCB_FLAG_DIR_OF_DIRS_ONLY); diff --git a/src/WINNT/afsrdr/kernel/lib/Include/AFSDefines.h b/src/WINNT/afsrdr/kernel/lib/Include/AFSDefines.h index ccecea9138..70a5b82d65 100644 --- a/src/WINNT/afsrdr/kernel/lib/Include/AFSDefines.h +++ b/src/WINNT/afsrdr/kernel/lib/Include/AFSDefines.h @@ -227,7 +227,7 @@ NTSTATUS #define CCB_FLAG_MASK_CONTAINS_WILD_CARDS 0x00000004 #define CCB_FLAG_FREE_FULL_PATHNAME 0x00000008 #define CCB_FLAG_RETURN_RELATIVE_ENTRIES 0x00000010 -#define CCB_FLAGS_DIRECTORY_QUERY_MAPPED 0x00000020 +#define CCB_FLAG_DIRECTORY_QUERY_MAPPED 0x00000020 #define CCB_FLAG_MASK_PIOCTL_QUERY 0x00000040 #define CCB_FLAG_MASK_OPENED_REPARSE_POINT 0x00000080 #define CCB_FLAG_INSERTED_CCB_LIST 0x00000100