[RTL]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 17 Dec 2012 13:27:33 +0000 (13:27 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 17 Dec 2012 13:27:33 +0000 (13:27 +0000)
Revert silencing a warning and apply a real fix. Spotted by Thomas.

svn path=/trunk/; revision=57938

reactos/lib/rtl/registry.c

index 79230a1..1262499 100644 (file)
@@ -10,8 +10,6 @@
 /* INCLUDES *****************************************************************/
 
 #include <rtl.h>
-#include <suppress.h>
-
 #define NDEBUG
 #include <debug.h>
 
@@ -244,8 +242,7 @@ RtlpCallQueryRegistryRoutine(IN PRTL_QUERY_REGISTRY_TABLE QueryTable,
         {
             /* Prepare defaults */
             Status = STATUS_SUCCESS;
-            _PRAGMA_WARNING_SUPPRESS(__WARNING_SIZEOF_COUNTOF_MISMATCH)
-            ValueEnd = (PWSTR)((ULONG_PTR)Data + Length) - sizeof(UNICODE_NULL);
+            ValueEnd = (PWSTR)((ULONG_PTR)Data + Length - sizeof(UNICODE_NULL));
             p = Data;
 
             /* Loop all strings */
@@ -837,7 +834,7 @@ RtlpNtEnumerateSubKey(IN HANDLE KeyHandle,
                             KeyInfo,
                             BufferLength,
                             &ReturnedLength);
-    if (NT_SUCCESS(Status) && (KeyInfo != NULL))
+    if (NT_SUCCESS(Status))
     {
         /* Check if the name fits */
         if (KeyInfo->NameLength <= SubKeyName->MaximumLength)