Constify some of the code.

Integrating the new Chalk interpreter into setup caused some consts to bleed out into their surroundings. This cascaded as it bled into some of the common libraries. This change lets those consts bleed out as far as they naturally went. The most painful one was a change to the prototype of AddDevice, which affected nearly all drivers.
CeperaCPP · Oct 25, 2016 · da594e8 · da594e8
1 parent 3e8584b
commit da594e8
Show file tree

Hide file tree

Showing 110 changed files with 548 additions and 546 deletions.
diff --git a/apps/libc/dynamic/scan.c b/apps/libc/dynamic/scan.c
@@ -644,15 +644,15 @@ Return Value:
 {
 
     double Double;
-    PSTR RemainingString;
+    PCSTR RemainingString;
     KSTATUS Status;
     ULONG StringLength;
 
     StringLength = MAX_ULONG;
     RemainingString = (PSTR)String;
     Status = RtlStringScanDouble(&RemainingString, &StringLength, &Double);
     if (StringAfterScan != NULL) {
-        *StringAfterScan = RemainingString;
+        *StringAfterScan = (PSTR)RemainingString;
     }
 
     if (!KSUCCESS(Status)) {
@@ -758,7 +758,7 @@ Return Value:
 {
 
     LONGLONG Integer;
-    PSTR RemainingString;
+    PCSTR RemainingString;
     KSTATUS Status;
     ULONG StringLength;
 
@@ -771,7 +771,7 @@ Return Value:
                                   &Integer);
 
     if (StringAfterScan != NULL) {
-        *StringAfterScan = RemainingString;
+        *StringAfterScan = (PSTR)RemainingString;
     }
 
     if (!KSUCCESS(Status)) {
@@ -853,7 +853,7 @@ Return Value:
 {
 
     LONGLONG Integer;
-    PSTR RemainingString;
+    PCSTR RemainingString;
     KSTATUS Status;
     ULONG StringLength;
 
@@ -866,7 +866,7 @@ Return Value:
                                   &Integer);
 
     if (StringAfterScan != NULL) {
-        *StringAfterScan = RemainingString;
+        *StringAfterScan = (PSTR)RemainingString;
     }
 
     if (!KSUCCESS(Status)) {
@@ -928,7 +928,7 @@ Return Value:
 {
 
     LONGLONG Integer;
-    PSTR RemainingString;
+    PCSTR RemainingString;
     KSTATUS Status;
     ULONG StringLength;
 
@@ -941,7 +941,7 @@ Return Value:
                                   &Integer);
 
     if (StringAfterScan != NULL) {
-        *StringAfterScan = RemainingString;
+        *StringAfterScan = (PSTR)RemainingString;
     }
 
     if (!KSUCCESS(Status)) {
@@ -1009,7 +1009,7 @@ Return Value:
 {
 
     LONGLONG Integer;
-    PSTR RemainingString;
+    PCSTR RemainingString;
     KSTATUS Status;
     ULONG StringLength;
 
@@ -1022,7 +1022,7 @@ Return Value:
                                   &Integer);
 
     if (StringAfterScan != NULL) {
-        *StringAfterScan = RemainingString;
+        *StringAfterScan = (PSTR)RemainingString;
     }
 
     if (!KSUCCESS(Status)) {

diff --git a/apps/libc/dynamic/wscan.c b/apps/libc/dynamic/wscan.c
@@ -513,15 +513,15 @@ Return Value:
 {
 
     double Double;
-    PWSTR RemainingString;
+    PCWSTR RemainingString;
     KSTATUS Status;
     ULONG StringLength;
 
     StringLength = MAX_ULONG;
     RemainingString = (PWSTR)String;
     Status = RtlStringScanDoubleWide(&RemainingString, &StringLength, &Double);
     if (StringAfterScan != NULL) {
-        *StringAfterScan = RemainingString;
+        *StringAfterScan = (PWSTR)RemainingString;
     }
 
     if (!KSUCCESS(Status)) {
@@ -623,7 +623,7 @@ Return Value:
 {
 
     LONGLONG Integer;
-    PWSTR RemainingString;
+    PCWSTR RemainingString;
     KSTATUS Status;
     ULONG StringLength;
 
@@ -636,7 +636,7 @@ Return Value:
                                       &Integer);
 
     if (StringAfterScan != NULL) {
-        *StringAfterScan = RemainingString;
+        *StringAfterScan = (PWSTR)RemainingString;
     }
 
     if (!KSUCCESS(Status)) {
@@ -718,7 +718,7 @@ Return Value:
 {
 
     LONGLONG Integer;
-    PWSTR RemainingString;
+    PCWSTR RemainingString;
     KSTATUS Status;
     ULONG StringLength;
 
@@ -731,7 +731,7 @@ Return Value:
                                       &Integer);
 
     if (StringAfterScan != NULL) {
-        *StringAfterScan = RemainingString;
+        *StringAfterScan = (PWSTR)RemainingString;
     }
 
     if (!KSUCCESS(Status)) {
@@ -793,7 +793,7 @@ Return Value:
 {
 
     LONGLONG Integer;
-    PWSTR RemainingString;
+    PCWSTR RemainingString;
     KSTATUS Status;
     ULONG StringLength;
 
@@ -806,7 +806,7 @@ Return Value:
                                       &Integer);
 
     if (StringAfterScan != NULL) {
-        *StringAfterScan = RemainingString;
+        *StringAfterScan = (PWSTR)RemainingString;
     }
 
     if (!KSUCCESS(Status)) {
@@ -874,7 +874,7 @@ Return Value:
 {
 
     LONGLONG Integer;
-    PWSTR RemainingString;
+    PCWSTR RemainingString;
     KSTATUS Status;
     ULONG StringLength;
 
@@ -887,7 +887,7 @@ Return Value:
                                       &Integer);
 
     if (StringAfterScan != NULL) {
-        *StringAfterScan = RemainingString;
+        *StringAfterScan = (PWSTR)RemainingString;
     }
 
     if (!KSUCCESS(Status)) {

diff --git a/apps/osbase/osbase.c b/apps/osbase/osbase.c
@@ -205,7 +205,7 @@ OS_API
 KSTATUS
 OsOpen (
     HANDLE Directory,
-    PSTR Path,
+    PCSTR Path,
     ULONG PathLength,
     ULONG Flags,
     FILE_PERMISSIONS CreatePermissions,

diff --git a/apps/osbase/osimag.c b/apps/osbase/osimag.c
@@ -97,7 +97,7 @@ OspImFreeMemory (
 KSTATUS
 OspImOpenFile (
     PVOID SystemContext,
-    PSTR BinaryName,
+    PCSTR BinaryName,
     PIMAGE_FILE_INFORMATION File
     );
 
@@ -1136,7 +1136,7 @@ Return Value:
 KSTATUS
 OspImOpenFile (
     PVOID SystemContext,
-    PSTR BinaryName,
+    PCSTR BinaryName,
     PIMAGE_FILE_INFORMATION File
     )
 

diff --git a/apps/testapps/ktest/driver/ktestdrv.c b/apps/testapps/ktest/driver/ktestdrv.c
@@ -48,9 +48,9 @@ KTestUnload (
 KSTATUS
 KTestAddDevice (
     PVOID Driver,
-    PSTR DeviceId,
-    PSTR ClassId,
-    PSTR CompatibleIds,
+    PCSTR DeviceId,
+    PCSTR ClassId,
+    PCSTR CompatibleIds,
     PVOID DeviceToken
     );
 
@@ -226,9 +226,9 @@ Return Value:
 KSTATUS
 KTestAddDevice (
     PVOID Driver,
-    PSTR DeviceId,
-    PSTR ClassId,
-    PSTR CompatibleIds,
+    PCSTR DeviceId,
+    PCSTR ClassId,
+    PCSTR CompatibleIds,
     PVOID DeviceToken
     )
 

diff --git a/boot/bootman/bootim.c b/boot/bootman/bootim.c
@@ -84,7 +84,7 @@ BmpImFreeMemory (
 KSTATUS
 BmpImOpenFile (
     PVOID SystemContext,
-    PSTR BinaryName,
+    PCSTR BinaryName,
     PIMAGE_FILE_INFORMATION File
     );
 
@@ -323,7 +323,7 @@ Return Value:
 KSTATUS
 BmpImOpenFile (
     PVOID SystemContext,
-    PSTR BinaryName,
+    PCSTR BinaryName,
     PIMAGE_FILE_INFORMATION File
     )
 

diff --git a/boot/bootman/bootman.c b/boot/bootman/bootman.c
@@ -115,7 +115,7 @@ Return Value:
     PDEBUG_DEVICE_DESCRIPTION DebugDevice;
     PDEBUG_MODULE DebugModule;
     PLOADED_IMAGE LoaderImage;
-    PSTR LoaderName;
+    PCSTR LoaderName;
     UINTN LoaderNameSize;
     PBOOT_INITIALIZATION_BLOCK LoaderParameters;
     ULONG LoadFlags;

diff --git a/boot/fatboot/fatboot.c b/boot/fatboot/fatboot.c
@@ -186,7 +186,7 @@ RtlZeroMemory (
 PVOID
 RtlCopyMemory (
     PVOID Destination,
-    PVOID Source,
+    PCVOID Source,
     UINTN ByteCount
     );
 
@@ -1288,7 +1288,7 @@ Return Value:
 PVOID
 RtlCopyMemory (
     PVOID Destination,
-    PVOID Source,
+    PCVOID Source,
     UINTN ByteCount
     )
 

diff --git a/boot/lib/file.c b/boot/lib/file.c
@@ -212,7 +212,7 @@ KSTATUS
 BoLookupPath (
     PBOOT_VOLUME Volume,
     PFILE_ID StartingDirectory,
-    PSTR Path,
+    PCSTR Path,
     PFILE_PROPERTIES FileProperties
     )
 

diff --git a/boot/lib/include/bootlib.h b/boot/lib/include/bootlib.h
@@ -319,7 +319,7 @@ KSTATUS
 BoLookupPath (
     PBOOT_VOLUME Volume,
     PFILE_ID StartingDirectory,
-    PSTR Path,
+    PCSTR Path,
     PFILE_PROPERTIES FileProperties
     );
 

diff --git a/boot/loader/bootim.c b/boot/loader/bootim.c
@@ -106,7 +106,7 @@ BopImFreeMemory (
 KSTATUS
 BopImOpenFile (
     PVOID SystemContext,
-    PSTR BinaryName,
+    PCSTR BinaryName,
     PIMAGE_FILE_INFORMATION File
     );
 
@@ -257,7 +257,7 @@ Return Value:
     PSTR DriversDirectoryPath;
     FILE_PROPERTIES Properties;
     KSTATUS Status;
-    PSTR SystemRootPath;
+    PCSTR SystemRootPath;
 
     INITIALIZE_LIST_HEAD(&BoLoadedImageList);
 
@@ -376,7 +376,7 @@ Return Value:
 KSTATUS
 BopImOpenFile (
     PVOID SystemContext,
-    PSTR BinaryName,
+    PCSTR BinaryName,
     PIMAGE_FILE_INFORMATION File
     )
 

diff --git a/boot/loader/loader.c b/boot/loader/loader.c
@@ -240,7 +240,7 @@ Return Value:
     PLOADED_IMAGE KernelImage;
     PDEBUG_MODULE KernelModule;
     PKERNEL_INITIALIZATION_BLOCK KernelParameters;
-    PSTR KernelPath;
+    PCSTR KernelPath;
     PHYSICAL_ADDRESS KernelStackPhysical;
     PDEBUG_MODULE LoaderModule;
     ULONG LoaderModuleNameLength;

diff --git a/drivers/acpi/acpidrv.c b/drivers/acpi/acpidrv.c
@@ -55,9 +55,9 @@ AcpiUnload (
 KSTATUS
 AcpiAddDevice (
     PVOID Driver,
-    PSTR DeviceId,
-    PSTR ClassId,
-    PSTR CompatibleIds,
+    PCSTR DeviceId,
+    PCSTR ClassId,
+    PCSTR CompatibleIds,
     PVOID DeviceToken
     );
 
@@ -242,9 +242,9 @@ Return Value:
 KSTATUS
 AcpiAddDevice (
     PVOID Driver,
-    PSTR DeviceId,
-    PSTR ClassId,
-    PSTR CompatibleIds,
+    PCSTR DeviceId,
+    PCSTR ClassId,
+    PCSTR CompatibleIds,
     PVOID DeviceToken
     )
 

diff --git a/drivers/ata/ata.c b/drivers/ata/ata.c
@@ -84,9 +84,9 @@ AtapServiceInterruptForChannel (
 KSTATUS
 AtaAddDevice (
     PVOID Driver,
-    PSTR DeviceId,
-    PSTR ClassId,
-    PSTR CompatibleIds,
+    PCSTR DeviceId,
+    PCSTR ClassId,
+    PCSTR CompatibleIds,
     PVOID DeviceToken
     );
 
@@ -360,9 +360,9 @@ Return Value:
 KSTATUS
 AtaAddDevice (
     PVOID Driver,
-    PSTR DeviceId,
-    PSTR ClassId,
-    PSTR CompatibleIds,
+    PCSTR DeviceId,
+    PCSTR ClassId,
+    PCSTR CompatibleIds,
     PVOID DeviceToken
     )