[REACTOS] RtlAssert(): use "%lu" as LineNumber format.
authorSerge Gautherie <reactos-git_serge_171003@gautherie.fr>
Thu, 21 Jun 2018 03:05:50 +0000 (05:05 +0200)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Wed, 8 Aug 2018 19:24:07 +0000 (21:24 +0200)
boot/freeldr/freeldr/lib/debug.c
sdk/lib/rtl/assert.c
sdk/tools/mkhive/rtl.c

index d2143ad..1f01f86 100644 (file)
@@ -488,7 +488,7 @@ RtlAssert(IN PVOID FailedAssertion,
 {
     if (Message)
     {
-        DbgPrint("Assertion \'%s\' failed at %s line %u: %s\n",
+        DbgPrint("Assertion \'%s\' failed at %s line %lu: %s\n",
                  (PCHAR)FailedAssertion,
                  (PCHAR)FileName,
                  LineNumber,
@@ -496,7 +496,7 @@ RtlAssert(IN PVOID FailedAssertion,
     }
     else
     {
-        DbgPrint("Assertion \'%s\' failed at %s line %u\n",
+        DbgPrint("Assertion \'%s\' failed at %s line %lu\n",
                  (PCHAR)FailedAssertion,
                  (PCHAR)FileName,
                  LineNumber);
index c25516e..0c6fcae 100644 (file)
@@ -36,7 +36,7 @@ RtlAssert(IN PVOID FailedAssertion,
     {
         /* Print the assertion */
         DbgPrint("\n*** Assertion failed: %s%s\n"
-                 "***   Source File: %s, line %ld\n\n",
+                 "***   Source File: %s, line %lu\n\n",
                  Message != NULL ? Message : "",
                  (PSTR)FailedAssertion,
                  (PSTR)FileName,
index 3bef91d..d8649d2 100644 (file)
@@ -131,28 +131,28 @@ DbgPrint(
 
 VOID
 NTAPI
-RtlAssert(PVOID FailedAssertion,
-          PVOID FileName,
-          ULONG LineNumber,
-          PCHAR Message)
+RtlAssert(IN PVOID FailedAssertion,
+          IN PVOID FileName,
+          IN ULONG LineNumber,
+          IN PCHAR Message OPTIONAL)
 {
-   if (NULL != Message)
-   {
-      DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n",
-               (PCHAR)FailedAssertion,
-               (PCHAR)FileName,
-               LineNumber,
-               Message);
-   }
-   else
-   {
-      DbgPrint("Assertion \'%s\' failed at %s line %d\n",
-               (PCHAR)FailedAssertion,
-               (PCHAR)FileName,
-               LineNumber);
-   }
-
-   //DbgBreakPoint();
+    if (Message != NULL)
+    {
+        DbgPrint("Assertion \'%s\' failed at %s line %u: %s\n",
+                 (PCHAR)FailedAssertion,
+                 (PCHAR)FileName,
+                 LineNumber,
+                 Message);
+    }
+    else
+    {
+        DbgPrint("Assertion \'%s\' failed at %s line %u\n",
+                 (PCHAR)FailedAssertion,
+                 (PCHAR)FileName,
+                 LineNumber);
+    }
+
+    //DbgBreakPoint();
 }
 
 // DECLSPEC_NORETURN