[tkreuzer] 57938: [RTL] Revert silencing a warning and apply a real fix. Spotted by Thomas.

Author: tkreuzer
Date: Mon Dec 17 13:27:33 2012
New Revision: 57938

URL: http://svn.reactos.org/svn/reactos?rev=57938&view=rev
Log:
[RTL]
Revert silencing a warning and apply a real fix. Spotted by Thomas.

Modified:
    trunk/reactos/lib/rtl/registry.c

Modified: trunk/reactos/lib/rtl/registry.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=5793...
==============================================================================
--- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Mon Dec 17 13:27:33 2012
@@ -10,8 +10,6 @@
 /* INCLUDES *****************************************************************/

#include <rtl.h>
-#include <suppress.h>
-
 #define NDEBUG
 #include <debug.h>

@@ -244,8 +242,7 @@
         {
             /* 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 @@
                             KeyInfo,
                             BufferLength,
                             &ReturnedLength);
-    if (NT_SUCCESS(Status) && (KeyInfo != NULL))
+    if (NT_SUCCESS(Status))
     {
         /* Check if the name fits */
         if (KeyInfo->NameLength <= SubKeyName->MaximumLength)