From 3847ec9531b7bde9a2af9edded5b19d797789752 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 24 Jan 2013 19:28:44 -0500 Subject: [PATCH] Windows: Additional trace %p and %d changes Use %p when logging pointers. Use %d for counts. Change-Id: Ib3a3b1226945eccb15d912d7ff1c83f0257e7acd Reviewed-on: http://gerrit.openafs.org/8962 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp | 4 ++-- src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp | 8 ++++---- src/WINNT/afsrdr/kernel/lib/AFSRead.cpp | 2 +- src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp index faca71c..9bdd99d 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp @@ -3444,7 +3444,7 @@ AFSValidateDirectoryCache( IN AFSObjectInfoCB *ObjectInfo, AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSValidateDirectoryCache Clear VALID flag on DE %p Reference count %08lX\n", + "AFSValidateDirectoryCache Clear VALID flag on DE %p Reference count %d\n", pCurrentDirEntry, pCurrentDirEntry->DirOpenReferenceCount); @@ -3550,7 +3550,7 @@ AFSValidateDirectoryCache( IN AFSObjectInfoCB *ObjectInfo, AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSValidateDirectoryCache Processing INVALID DE %p Reference count %08lX\n", + "AFSValidateDirectoryCache Processing INVALID DE %p Reference count %d\n", pCurrentDirEntry, pCurrentDirEntry->DirOpenReferenceCount); diff --git a/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp index 39796bf..874634a 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp @@ -1506,7 +1506,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSLocateNameEntry (FO: %08lX) Returning path not found for %wZ FID %08lX-%08lX-%08lX-%08lX\n", + "AFSLocateNameEntry (FO: %p) Returning path not found for %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, &uniSearchName, pCurrentObject->FileId.Cell, @@ -1793,7 +1793,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSLocateNameEntry (FO: %08lX) Returning path not found(2) for %wZ FID %08lX-%08lX-%08lX-%08lX\n", + "AFSLocateNameEntry (FO: %p) Returning path not found(2) for %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, &uniComponentName, pCurrentObject->FileId.Cell, @@ -2520,7 +2520,7 @@ AFSDeleteDirEntry( IN AFSObjectInfoCB *ParentObjectInfo, AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, - "AFSDeleteDirEntry Deleting dir entry in parent %08lX Entry %p %wZ FID %08lX-%08lX-%08lX-%08lX RefCount %d\n", + "AFSDeleteDirEntry Deleting dir entry in parent %p Entry %p %wZ FID %08lX-%08lX-%08lX-%08lX RefCount %d\n", ParentObjectInfo, DirEntry, &DirEntry->NameInformation.FileName, @@ -3621,7 +3621,7 @@ AFSParseName( IN PIRP Irp, AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSParseName (%08lX) AFSCheckCellName %wZ returned path not found; ntStatus %08X\n", + "AFSParseName (%p) AFSCheckCellName %wZ returned path not found; ntStatus %08X\n", Irp, &uniComponentName, STATUS_OBJECT_NAME_NOT_FOUND); diff --git a/src/WINNT/afsrdr/kernel/lib/AFSRead.cpp b/src/WINNT/afsrdr/kernel/lib/AFSRead.cpp index 033ab26..c9258d3 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSRead.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSRead.cpp @@ -441,7 +441,7 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSNonCachedRead (%p) Successfully retrieved map extents count %08lX run count %08lX\n", + "AFSNonCachedRead (%p) Successfully retrieved map extents count %d run count %d\n", Irp, extentsCount, runCount); diff --git a/src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp b/src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp index 75bbe8e..b6ce79c 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp @@ -1099,7 +1099,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSNonCachedWrite (%p) Successfully retrieved map extents count %08lX run count %08lX\n", + "AFSNonCachedWrite (%p) Successfully retrieved map extents count %d run count %d\n", Irp, extentsCount, runCount); -- 1.9.4