[TOOLS/IBAL] fix prints format

git-svn-id: svn://openib.tc.cornell.edu/gen1@612 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/core/al/al_mgr_shared.c b/trunk/core/al/al_mgr_shared.c
index 39faefd77c362824a5d2792f02c0e14b32372d7e..bfdb3c5b048756ad46a938aad2dae06c46c25525 100644 (file)
--- a/trunk/core/al/al_mgr_shared.c
+++ b/trunk/core/al/al_mgr_shared.c
@@ -61,7 +61,7 @@ print_al_obj(
        UNUSED_PARAM( p_obj );\r
 \r
        AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
-               ("AL object %016I64x(%s), parent: %016I64x ref_cnt: %d\n",\r
+               ("AL object %016Ix(%s), parent: %016Ix ref_cnt: %d\n",\r
                (LONG_PTR)p_obj, ib_get_obj_type( p_obj ),\r
                (LONG_PTR)p_obj->p_parent_obj, p_obj->ref_cnt) );\r
 }\r

diff --git a/trunk/tools/coinstaller/user/IbInstaller.cpp b/trunk/tools/coinstaller/user/IbInstaller.cpp
index d3a7e7b2a2333fceea8e83b9482cc5186e1ca108..5ee73e3a5fe07a35f8f97d19c53a922593d301ef 100644 (file)
--- a/trunk/tools/coinstaller/user/IbInstaller.cpp
+++ b/trunk/tools/coinstaller/user/IbInstaller.cpp
@@ -75,7 +75,7 @@ DWORD NeedInstall()
        devInfo.cbSize = sizeof(SP_DEVINFO_DATA);\r
 \r
        OutputDebugString(\r
-               TEXT("Checking for existance of IB Fabric Root device.\n") );\r
+               TEXT("[IbInstaller]Checking for existance of IB Fabric Root device.\n") );\r
 \r
        // Get all devices of the system class.\r
        hDevList = SetupDiGetClassDevs( &GUID_CLASS_SYSTEM, 0, NULL, 0 );\r
@@ -95,7 +95,7 @@ DWORD NeedInstall()
                bSuccess = SetupDiEnumDeviceInfo( hDevList, i++, &devInfo );\r
                if( !bSuccess )\r
                {\r
-                       OutputDebugString( TEXT("SetupDiEnumDeviceInfo failed.\n") );\r
+                       OutputDebugString( TEXT("[IbInstaller]SetupDiEnumDeviceInfo failed.\n") );\r
                        break;\r
                }\r
 \r
@@ -106,7 +106,7 @@ DWORD NeedInstall()
                {\r
                        // Device has no HW ID.\r
                        OutputDebugString(\r
-                               TEXT("SetupDiGetDeviceRegistryProperty failed.\n") );\r
+                               TEXT("[IbInstaller]SetupDiGetDeviceRegistryProperty failed.\n") );\r
                        // Skip to the next.\r
                        bSuccess = TRUE;\r
                        continue;\r
@@ -118,7 +118,7 @@ DWORD NeedInstall()
 \r
                // The device is already installed.\r
                SetupDiDestroyDeviceInfoList( hDevList );\r
-               OutputDebugString( TEXT("IB Fabric Root device already exists.\n") );\r
+               OutputDebugString( TEXT("[IbInstaller]IB Fabric Root device already exists.\n") );\r
                return ERROR_ALREADY_EXISTS;\r
 \r
        } while( bSuccess );\r
@@ -171,7 +171,7 @@ DWORD SelectDriver(
                        continue;\r
 \r
                // Found it!\r
-               OutputDebugString( TEXT("Found our driver!\n") );\r
+               OutputDebugString( TEXT("[IbInstaller]Found our driver!\n") );\r
                return ERROR_SUCCESS;\r
 \r
        } while( bSuccess );\r
@@ -195,13 +195,13 @@ CreateIbBusRoot(
        memset( &devInfo, 0, sizeof(SP_DEVINFO_DATA) );\r
        devInfo.cbSize = sizeof(SP_DEVINFO_DATA);\r
 \r
-       OutputDebugString( TEXT("Creating IB Fabric Root device.\n") );\r
+       OutputDebugString( TEXT("[IbInstaller]Creating IB Fabric Root device.\n") );\r
 \r
        // Create a list for devices of the system class.\r
        hDevList = SetupDiCreateDeviceInfoList( &GUID_CLASS_SYSTEM, NULL );\r
        if( hDevList == INVALID_HANDLE_VALUE )\r
        {\r
-               OutputDebugString( TEXT("Failed to create dev info list.\n") );\r
+               OutputDebugString( TEXT("[IbInstaller]Failed to create dev info list.\n") );\r
                return GetLastError();\r
        }\r
 \r
@@ -211,7 +211,7 @@ CreateIbBusRoot(
                NULL, DICD_GENERATE_ID, &devInfo );\r
        if( !bSuccess )\r
        {\r
-               OutputDebugString( TEXT("SetupDiCreateDeviceInfo failed.\n") );\r
+               OutputDebugString( TEXT("[IbInstaller]SetupDiCreateDeviceInfo failed.\n") );\r
                SetupDiDestroyDeviceInfoList( hDevList );\r
                return GetLastError();\r
        }\r
@@ -222,7 +222,7 @@ CreateIbBusRoot(
        if( !bSuccess )\r
        {\r
                OutputDebugString(\r
-                       TEXT("SetupDiSetDeviceRegistryProperty failed.\n") );\r
+                       TEXT("[IbInstaller]SetupDiSetDeviceRegistryProperty failed.\n") );\r
                SetupDiDestroyDeviceInfoList( hDevList );\r
                return GetLastError();\r
        }\r
@@ -236,7 +236,7 @@ CreateIbBusRoot(
                SetupDiSetDeviceInstallParams( hDevList, &devInfo, &installParams );\r
        if( !bSuccess )\r
        {\r
-               OutputDebugString( TEXT("SetupDiSetDeviceInstallParams failed.\n") );\r
+               OutputDebugString( TEXT("[IbInstaller]SetupDiSetDeviceInstallParams failed.\n") );\r
                SetupDiDestroyDeviceInfoList( hDevList );\r
                return GetLastError();\r
        }\r
@@ -244,7 +244,7 @@ CreateIbBusRoot(
        status = SelectDriver( hDevList, &devInfo, &drvInfo );\r
        if( status != ERROR_SUCCESS )\r
        {\r
-               OutputDebugString( TEXT("Could not find driver.\n") );\r
+               OutputDebugString( TEXT("[IbInstaller]Could not find driver.\n") );\r
                SetupDiDestroyDriverInfoList( hDevList, &devInfo, SPDIT_CLASSDRIVER );\r
                SetupDiDestroyDeviceInfoList( hDevList );\r
                return status;\r
@@ -254,7 +254,7 @@ CreateIbBusRoot(
        bSuccess = SetupDiSetSelectedDevice( hDevList, &devInfo );\r
        if( !bSuccess )\r
        {\r
-               OutputDebugString( TEXT("SetupDiSetSelectedDevice failed.\n") );\r
+               OutputDebugString( TEXT("[IbInstaller]SetupDiSetSelectedDevice failed.\n") );\r
                SetupDiDestroyDriverInfoList( hDevList, &devInfo, SPDIT_CLASSDRIVER );\r
                SetupDiDestroyDeviceInfoList( hDevList );\r
                return GetLastError();\r
@@ -264,7 +264,7 @@ CreateIbBusRoot(
        bSuccess = SetupDiSetSelectedDriver( hDevList, &devInfo, &drvInfo );\r
        if( !bSuccess )\r
        {\r
-               OutputDebugString( TEXT("SetupDiSetSelectedDriver failed.\n") );\r
+               OutputDebugString( TEXT("[IbInstaller]SetupDiSetSelectedDriver failed.\n") );\r
                SetupDiDestroyDriverInfoList( hDevList, &devInfo, SPDIT_CLASSDRIVER );\r
                SetupDiDestroyDeviceInfoList( hDevList );\r
                return GetLastError();\r
@@ -275,7 +275,7 @@ CreateIbBusRoot(
                NULL, NULL, NULL );\r
        if( !bSuccess )\r
        {\r
-               OutputDebugString( TEXT("SetupDiRegisterDeviceInfo failed.\n") );\r
+               OutputDebugString( TEXT("[IbInstaller]SetupDiRegisterDeviceInfo failed.\n") );\r
                SetupDiDestroyDriverInfoList( hDevList, &devInfo, SPDIT_CLASSDRIVER );\r
                SetupDiDestroyDeviceInfoList( hDevList );\r
                return GetLastError();\r
@@ -285,7 +285,7 @@ CreateIbBusRoot(
        bSuccess = SetupDiInstallDevice( hDevList, &devInfo );\r
        if( !bSuccess )\r
        {\r
-               OutputDebugString( TEXT("SetupDiInstallDevice failed.\n") );\r
+               OutputDebugString( TEXT("[IbInstaller]SetupDiInstallDevice failed.\n") );\r
                SetupDiDestroyDriverInfoList( hDevList, &devInfo, SPDIT_CLASSDRIVER );\r
                SetupDiDestroyDeviceInfoList( hDevList );\r
                return GetLastError();\r