From 9c723e7a514ee4f809348ec79e2124cf3a38d895 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Mon, 17 Oct 2011 09:10:17 -0400 Subject: [PATCH] Windows: re-indent afsredir log message params convert tabs to spaces for consistent indentation make use of braces be consistent Change-Id: I76e2c6427c02cb50f1eb4e6ab57e484a4bfa3c65 Reviewed-on: http://gerrit.openafs.org/5621 Reviewed-by: Jeffrey Altman Reviewed-by: Rod Widdowson Tested-by: Jeffrey Altman --- src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp | 22 ++++---- .../afsrdr/kernel/lib/AFSCommSupport.cpp | 54 +++++++++---------- src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp | 8 +-- src/WINNT/afsrdr/kernel/lib/AFSEa.cpp | 4 +- .../afsrdr/kernel/lib/AFSExtentsSupport.cpp | 26 ++++----- src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp | 5 +- src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp | 9 ++-- .../afsrdr/kernel/lib/AFSNameSupport.cpp | 4 +- src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp | 16 +++--- 9 files changed, 74 insertions(+), 74 deletions(-) diff --git a/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp b/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp index bd01b5656..3a50e5ca1 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp @@ -1373,9 +1373,9 @@ AFSShutdownRedirector() AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Shutting down redirector Extent count %08lX Request count %08lX\n", - __FUNCTION__, - pControlDevExt->Specific.Control.ExtentCount, - pControlDevExt->Specific.Control.OutstandingServiceRequestCount); + __FUNCTION__, + pControlDevExt->Specific.Control.ExtentCount, + pControlDevExt->Specific.Control.OutstandingServiceRequestCount); // // Set the shutdown flag so the worker is more agressive in tearing down extents @@ -1400,8 +1400,8 @@ AFSShutdownRedirector() AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSShutdownRedirector Failed to complete all service requests Remaining count %08lX\n", - pControlDevExt->Specific.Control.OutstandingServiceRequestCount); + "AFSShutdownRedirector Failed to complete all service requests Remaining count %08lX\n", + pControlDevExt->Specific.Control.OutstandingServiceRequestCount); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -1425,8 +1425,8 @@ AFSShutdownRedirector() AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSShutdownRedirector Failed to purge all extents Remaining count %08lX\n", - pControlDevExt->Specific.Control.ExtentCount); + "AFSShutdownRedirector Failed to purge all extents Remaining count %08lX\n", + pControlDevExt->Specific.Control.ExtentCount); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -1444,10 +1444,10 @@ try_exit: AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Completed shut down of redirector Extent count %08lX Request count %08lX Status %08lX\n", - __FUNCTION__, - pControlDevExt->Specific.Control.ExtentCount, - pControlDevExt->Specific.Control.OutstandingServiceRequestCount, - ntStatus); + __FUNCTION__, + pControlDevExt->Specific.Control.ExtentCount, + pControlDevExt->Specific.Control.OutstandingServiceRequestCount, + ntStatus); } return ntStatus; diff --git a/src/WINNT/afsrdr/kernel/lib/AFSCommSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSCommSupport.cpp index 90e500e70..ae95300c4 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSCommSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSCommSupport.cpp @@ -323,12 +323,12 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Adding entry %wZ Inc Count %d to parent FID %08lX-%08lX-%08lX-%08lX\n", - &pDirNode->NameInformation.FileName, - ObjectInfoCB->Specific.Directory.DirectoryNodeCount, - ObjectInfoCB->FileId.Cell, - ObjectInfoCB->FileId.Volume, - ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique); + &pDirNode->NameInformation.FileName, + ObjectInfoCB->Specific.Directory.DirectoryNodeCount, + ObjectInfoCB->FileId.Cell, + ObjectInfoCB->FileId.Volume, + ObjectInfoCB->FileId.Vnode, + ObjectInfoCB->FileId.Unique); if( pDirNode->Type.Data.ShortNameTreeEntry.HashIndex != 0) { @@ -414,11 +414,11 @@ try_exit: AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSEnumerateDirectory Resetting content for FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", - ObjectInfoCB->FileId.Cell, - ObjectInfoCB->FileId.Volume, - ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique, - ntStatus); + ObjectInfoCB->FileId.Cell, + ObjectInfoCB->FileId.Volume, + ObjectInfoCB->FileId.Vnode, + ObjectInfoCB->FileId.Unique, + ntStatus); AFSResetDirectoryContent( ObjectInfoCB); } @@ -677,11 +677,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Verified entry %wZ for parent FID %08lX-%08lX-%08lX-%08lX\n", - &uniDirName, - ObjectInfoCB->FileId.Cell, - ObjectInfoCB->FileId.Volume, - ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique); + &uniDirName, + ObjectInfoCB->FileId.Cell, + ObjectInfoCB->FileId.Volume, + ObjectInfoCB->FileId.Vnode, + ObjectInfoCB->FileId.Unique); // @@ -701,11 +701,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Setting VERIFY on entry %wZ for FID %08lX-%08lX-%08lX-%08lX\n", - &uniDirName, - ObjectInfoCB->FileId.Cell, - ObjectInfoCB->FileId.Volume, - ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique); + &uniDirName, + ObjectInfoCB->FileId.Cell, + ObjectInfoCB->FileId.Volume, + ObjectInfoCB->FileId.Vnode, + ObjectInfoCB->FileId.Unique); SetFlag( pObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY); pObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1; @@ -874,12 +874,12 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Adding entry %wZ Inc Count %d to parent FID %08lX-%08lX-%08lX-%08lX\n", - &pDirNode->NameInformation.FileName, - ObjectInfoCB->Specific.Directory.DirectoryNodeCount, - ObjectInfoCB->FileId.Cell, - ObjectInfoCB->FileId.Volume, - ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique); + &pDirNode->NameInformation.FileName, + ObjectInfoCB->Specific.Directory.DirectoryNodeCount, + ObjectInfoCB->FileId.Cell, + ObjectInfoCB->FileId.Volume, + ObjectInfoCB->FileId.Vnode, + ObjectInfoCB->FileId.Unique); if( pDirNode->Type.Data.ShortNameTreeEntry.HashIndex != 0) { diff --git a/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp b/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp index ce90ce5e2..6340ebbf2 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp @@ -1938,16 +1938,16 @@ AFSProcessCreate( IN PIRP Irp, AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate Increment count on Fcb %08lX Cnt %d\n", - *Fcb, - (*Fcb)->OpenReferenceCount); + *Fcb, + (*Fcb)->OpenReferenceCount); InterlockedIncrement( &(*Fcb)->OpenHandleCount); AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate Increment handle count on Fcb %08lX Cnt %d\n", - (*Fcb), - (*Fcb)->OpenHandleCount); + (*Fcb), + (*Fcb)->OpenHandleCount); // // Increment the open reference and handle on the parent node diff --git a/src/WINNT/afsrdr/kernel/lib/AFSEa.cpp b/src/WINNT/afsrdr/kernel/lib/AFSEa.cpp index 63100bd25..94fa398c2 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSEa.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSEa.cpp @@ -68,7 +68,7 @@ AFSQueryEA( IN PDEVICE_OBJECT LibDeviceObject, "AFSQueryEa Entry for FO %08lX\n", pIrpSp->FileObject); AFSCompleteRequest( Irp, - ntStatus); + ntStatus); } __except( AFSExceptionFilter( GetExceptionCode(), GetExceptionInformation()) ) @@ -112,7 +112,7 @@ AFSSetEA( IN PDEVICE_OBJECT LibDeviceObject, "AFSSetEa Entry for FO %08lX\n", pIrpSp->FileObject); AFSCompleteRequest( Irp, - ntStatus); + ntStatus); } __except( AFSExceptionFilter( GetExceptionCode(), GetExceptionInformation()) ) diff --git a/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp index 7df75034a..bed25ad80 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp @@ -347,7 +347,9 @@ try_exit: AFSReleaseResource( &Fcb->NPFcb->Specific.File.ExtentsResource ); } - if (pRelease) { + if (pRelease) + { + AFSExFreePool( pRelease); } } @@ -2064,8 +2066,8 @@ AFSFindFcbToClean(ULONG IgnoreTime, AFSFcb *LastFcb, BOOLEAN Block) AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSFindFcbToClean Increment count on Fcb %08lX Cnt %d\n", - pCurrentObject, - pCurrentObject->ObjectReferenceCount); + pCurrentObject, + pCurrentObject->ObjectReferenceCount); bLocatedEntry = TRUE; @@ -2201,8 +2203,8 @@ AFSProcessExtentFailure( PIRP Irp) AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessExtentFailure Increment count on object %08lX Cnt %d\n", - pObjectInfo, - pObjectInfo->ObjectReferenceCount); + pObjectInfo, + pObjectInfo->ObjectReferenceCount); } AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock); @@ -2433,8 +2435,8 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessReleaseFileExtents Increment count on object %08lX Cnt %d\n", - pObjectInfo, - pObjectInfo->ObjectReferenceCount); + pObjectInfo, + pObjectInfo->ObjectReferenceCount); } AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock); @@ -2580,8 +2582,8 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSProcessReleaseFileExtents Failed to release extents Status %08lX\n", - ntStatus); + "AFSProcessReleaseFileExtents Failed to release extents Status %08lX\n", + ntStatus); try_return( ntStatus ); } @@ -2591,7 +2593,7 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSProcessReleaseFileExtents Failed to release ANY extents\n"); + "AFSProcessReleaseFileExtents Failed to release ANY extents\n"); } ulSz = sizeof(AFSReleaseFileExtentsResultCB); @@ -2645,8 +2647,8 @@ try_exit: AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessReleaseFileExtents Decrement count on object %08lX Cnt %d\n", - pObjectInfo, - pObjectInfo->ObjectReferenceCount); + pObjectInfo, + pObjectInfo->ObjectReferenceCount); } } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp index cc610184a..134077a26 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp @@ -287,9 +287,8 @@ AFSInitFcb( IN AFSDirectoryCB *DirEntry, AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitFcb Initialized Fcb %08lX Name %wZ\n", - pFcb, - &DirEntry->NameInformation.FileName); - + pFcb, + &DirEntry->NameInformation.FileName); try_exit: diff --git a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp index d40b824b1..f51e31e0b 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp @@ -4024,7 +4024,7 @@ AFSInitializeSpecialShareNameList() AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeSpecialShareNameList (srvsvc) Initializing count (1) on object %08lX\n", - pObjectInfoCB); + pObjectInfoCB); pObjectInfoCB->ObjectReferenceCount = 1; @@ -4109,7 +4109,7 @@ AFSInitializeSpecialShareNameList() AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeSpecialShareNameList (wkssvc) Initializing count (1) on object %08lX\n", - pObjectInfoCB); + pObjectInfoCB); pObjectInfoCB->ObjectReferenceCount = 1; @@ -4196,7 +4196,7 @@ AFSInitializeSpecialShareNameList() AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeSpecialShareNameList (ipc$) Initializing count (1) on object %08lX\n", - pObjectInfoCB); + pObjectInfoCB); pObjectInfoCB->ObjectReferenceCount = 1; @@ -5427,8 +5427,7 @@ AFSInitPIOCtlDirectoryCB( IN AFSObjectInfoCB *ObjectInfo) pObjectInfoCB->FileAttributes = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; - ulEntryLength = sizeof( AFSDirectoryCB) + - AFSPIOCtlName.Length; + ulEntryLength = sizeof( AFSDirectoryCB) + AFSPIOCtlName.Length; pDirNode = (AFSDirectoryCB *)AFSExAllocatePoolWithTag( PagedPool, ulEntryLength, diff --git a/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp index 3c93f8d2c..805be3c9f 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp @@ -2206,8 +2206,8 @@ AFSDeleteDirEntry( IN AFSObjectInfoCB *ParentObjectInfo, AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSDeleteDirEntry Decrement count on object %08lX Cnt %d\n", - DirEntry->ObjectInformation, - DirEntry->ObjectInformation->ObjectReferenceCount); + DirEntry->ObjectInformation, + DirEntry->ObjectInformation->ObjectReferenceCount); ExDeleteResourceLite( &DirEntry->NonPaged->Lock); diff --git a/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp b/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp index 721c26e64..a2b4022de 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp @@ -1120,7 +1120,7 @@ AFSPrimaryVolumeWorkerThread( IN PVOID Context) AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPrimaryWorker Deleting deleted object %08lX\n", - pCurrentObject); + pCurrentObject); AFSDeleteObjectInfo( pCurrentObject); @@ -1275,8 +1275,8 @@ AFSPrimaryVolumeWorkerThread( IN PVOID Context) AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPrimaryWorker Deleting DE %wZ Object %08lX\n", - &pCurrentDirEntry->NameInformation.FileName, - pCurrentChildObject); + &pCurrentDirEntry->NameInformation.FileName, + pCurrentChildObject); AFSDeleteDirEntry( pCurrentObject, pCurrentDirEntry); @@ -1319,7 +1319,7 @@ AFSPrimaryVolumeWorkerThread( IN PVOID Context) AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPrimaryWorker Deleting object %08lX\n", - pCurrentChildObject); + pCurrentChildObject); AFSDeleteObjectInfo( pCurrentChildObject); } @@ -1342,10 +1342,10 @@ AFSPrimaryVolumeWorkerThread( IN PVOID Context) AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT, AFS_TRACE_LEVEL_VERBOSE, "AFSPrimaryWorker Reset count to 0 on parent FID %08lX-%08lX-%08lX-%08lX\n", - pCurrentObject->FileId.Cell, - pCurrentObject->FileId.Volume, - pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Cell, + pCurrentObject->FileId.Volume, + pCurrentObject->FileId.Vnode, + pCurrentObject->FileId.Unique); // -- 2.39.5