fixed some more warnings when compiled with -Wwrite-strings

svn path=/trunk/; revision=19144

diff --git a/reactos/boot/freeldr/freeldr/include/inffile.h b/reactos/boot/freeldr/freeldr/include/inffile.h
index 5848be3..1b0bd51 100644 (file)
--- a/reactos/boot/freeldr/freeldr/include/inffile.h
+++ b/reactos/boot/freeldr/freeldr/include/inffile.h
@@ -51,7 +51,7 @@ typedef struct _INFCONTEXT
 
 BOOLEAN
 InfOpenFile (PHINF InfHandle,
-            PCHAR FileName,
+            PCSTR FileName,
             PULONG ErrorLine);
 
 VOID
@@ -60,8 +60,8 @@ InfCloseFile (HINF InfHandle);
 
 BOOLEAN
 InfFindFirstLine (HINF InfHandle,
-                 PCHAR Section,
-                 PCHAR Key,
+                 PCSTR Section,
+                 PCSTR Key,
                  PINFCONTEXT Context);
 
 BOOLEAN
@@ -123,7 +123,7 @@ InfGetData (PINFCONTEXT Context,
 BOOLEAN
 InfGetDataField (PINFCONTEXT Context,
                 ULONG FieldIndex,
-                PCHAR *Data);
+                PCSTR *Data);
 
 #endif /* __INFCACHE_H__ */
 

diff --git a/reactos/boot/freeldr/freeldr/inffile/inffile.c b/reactos/boot/freeldr/freeldr/inffile/inffile.c
index 152706f..ede7480 100644 (file)
--- a/reactos/boot/freeldr/freeldr/inffile/inffile.c
+++ b/reactos/boot/freeldr/freeldr/inffile/inffile.c
@@ -210,7 +210,7 @@ InfpCacheFreeSection (PINFCACHESECTION Section)
 
 static PINFCACHESECTION
 InfpCacheFindSection (PINFCACHE Cache,
-                     PCHAR Name)
+                     PCSTR Name)
 {
   PINFCACHESECTION Section = NULL;
 
@@ -373,7 +373,7 @@ InfpAddFieldToLine (PINFCACHELINE Line,
 
 static PINFCACHELINE
 InfpCacheFindKeyLine (PINFCACHESECTION Section,
-                     PCHAR Key)
+                     PCSTR Key)
 {
   PINFCACHELINE Line;
 
@@ -876,7 +876,7 @@ InfpParseBuffer (PINFCACHE file,
 
 BOOLEAN
 InfOpenFile(PHINF InfHandle,
-           PCHAR FileName,
+           PCSTR FileName,
            PULONG ErrorLine)
 {
   PFILE FileHandle;
@@ -991,8 +991,8 @@ InfCloseFile(HINF InfHandle)
 
 BOOLEAN
 InfFindFirstLine (HINF InfHandle,
-                 PCHAR Section,
-                 PCHAR Key,
+                 PCSTR Section,
+                 PCSTR Key,
                  PINFCONTEXT Context)
 {
   PINFCACHE Cache;
@@ -1457,7 +1457,7 @@ InfGetData (PINFCONTEXT Context,
 BOOLEAN
 InfGetDataField (PINFCONTEXT Context,
                 ULONG FieldIndex,
-                PCHAR *Data)
+                PCSTR *Data)
 {
   PINFCACHELINE CacheLine;
   PINFCACHEFIELD CacheField;

diff --git a/reactos/boot/freeldr/freeldr/reactos/setupldr.c b/reactos/boot/freeldr/freeldr/reactos/setupldr.c
index 88d2683..48204ff 100644 (file)
--- a/reactos/boot/freeldr/freeldr/reactos/setupldr.c
+++ b/reactos/boot/freeldr/freeldr/reactos/setupldr.c
@@ -60,14 +60,14 @@ FreeldrSeekFile(PVOID FileContext, ULONG_PTR Position)
 }
 
 static BOOL
-LoadKernel(PCHAR szSourcePath, PCHAR szFileName)
+LoadKernel(PCSTR szSourcePath, PCSTR szFileName)
 {
   CHAR szFullName[256];
 #ifdef USE_UI
   CHAR szBuffer[80];
 #endif
   PFILE FilePointer;
-  PCHAR szShortName;
+  PCSTR szShortName;
 
   if (szSourcePath[0] != '\\')
     {
@@ -125,7 +125,7 @@ LoadKernel(PCHAR szSourcePath, PCHAR szFileName)
 }
 
 static BOOL
-LoadKernelSymbols(PCHAR szSourcePath, PCHAR szFileName)
+LoadKernelSymbols(PCSTR szSourcePath, PCSTR szFileName)
 {
   static ROSSYM_CALLBACKS FreeldrCallbacks =
     {
@@ -180,14 +180,14 @@ LoadKernelSymbols(PCHAR szSourcePath, PCHAR szFileName)
 }
 
 static BOOL
-LoadDriver(PCHAR szSourcePath, PCHAR szFileName)
+LoadDriver(PCSTR szSourcePath, PCSTR szFileName)
 {
   CHAR szFullName[256];
 #ifdef USE_UI
   CHAR szBuffer[80];
 #endif
   PFILE FilePointer;
-  PCHAR szShortName;
+  PCSTR szShortName;
 
   if (szSourcePath[0] != '\\')
     {
@@ -245,14 +245,14 @@ LoadDriver(PCHAR szSourcePath, PCHAR szFileName)
 
 
 static BOOL
-LoadNlsFile(PCHAR szSourcePath, PCHAR szFileName, PCHAR szModuleName)
+LoadNlsFile(PCSTR szSourcePath, PCSTR szFileName, PCSTR szModuleName)
 {
   CHAR szFullName[256];
 #ifdef USE_UI
   CHAR szBuffer[80];
 #endif
   PFILE FilePointer;
-  PCHAR szShortName;
+  PCSTR szShortName;
 
   if (szSourcePath[0] != '\\')
     {
@@ -312,8 +312,8 @@ VOID RunLoader(VOID)
 {
   ULONG_PTR Base;
   ULONG Size;
-  char *SourcePath;
-  char *LoadOptions;
+  const char *SourcePath;
+  const char *LoadOptions;
   UINT i;
 
   HINF InfHandle;

diff --git a/reactos/drivers/bus/pci/pci.c b/reactos/drivers/bus/pci/pci.c
index 1ac2988..432711f 100644 (file)
--- a/reactos/drivers/bus/pci/pci.c
+++ b/reactos/drivers/bus/pci/pci.c
@@ -342,7 +342,7 @@ NTSTATUS
 PciCreateDeviceDescriptionString(PUNICODE_STRING DeviceDescription,
                                  PPCI_DEVICE Device)
 {
-  PWSTR Description;
+  PCWSTR Description;
 
   switch (Device->PciConfig.BaseClass)
   {

diff --git a/reactos/drivers/fs/cdfs/cdfs.h b/reactos/drivers/fs/cdfs/cdfs.h
index 46e3b94..0770ce2 100644 (file)
--- a/reactos/drivers/fs/cdfs/cdfs.h
+++ b/reactos/drivers/fs/cdfs/cdfs.h
@@ -288,7 +288,7 @@ CdfsDirectoryControl(PDEVICE_OBJECT DeviceObject,
 /* fcb.c */
 
 PFCB
-CdfsCreateFCB(PWCHAR FileName);
+CdfsCreateFCB(PCWSTR FileName);
 
 VOID
 CdfsDestroyFCB(PFCB Fcb);

diff --git a/reactos/drivers/fs/cdfs/fcb.c b/reactos/drivers/fs/cdfs/fcb.c
index a8f0d8f..ecf442e 100644 (file)
--- a/reactos/drivers/fs/cdfs/fcb.c
+++ b/reactos/drivers/fs/cdfs/fcb.c
@@ -68,7 +68,7 @@ CdfsWSubString(PWCHAR pTarget, const PWCHAR pSource, size_t pLength)
 
 
 PFCB
-CdfsCreateFCB(PWSTR FileName)
+CdfsCreateFCB(PCWSTR FileName)
 {
   PFCB Fcb;
 

diff --git a/reactos/drivers/fs/fs_rec/fs_rec.c b/reactos/drivers/fs/fs_rec/fs_rec.c
index a17c570..8f48f9a 100644 (file)
--- a/reactos/drivers/fs/fs_rec/fs_rec.c
+++ b/reactos/drivers/fs/fs_rec/fs_rec.c
@@ -121,8 +121,8 @@ FsRecUnload(IN PDRIVER_OBJECT DriverObject)
 
 static NTSTATUS
 FsRecRegisterFs(PDRIVER_OBJECT DriverObject,
-               PWSTR FsName,
-               PWSTR RecognizerName,
+               PCWSTR FsName,
+               PCWSTR RecognizerName,
                ULONG DeviceType,
                ULONG FsType)
 {

diff --git a/reactos/drivers/fs/ntfs/fcb.c b/reactos/drivers/fs/ntfs/fcb.c
index fbf2e09..e2dbac1 100644 (file)
--- a/reactos/drivers/fs/ntfs/fcb.c
+++ b/reactos/drivers/fs/ntfs/fcb.c
@@ -70,7 +70,7 @@ NtfsWSubString(PWCHAR pTarget, const PWCHAR pSource, size_t pLength)
 
 
 PFCB
-NtfsCreateFCB(PWSTR FileName)
+NtfsCreateFCB(PCWSTR FileName)
 {
   PFCB Fcb;
 
@@ -180,7 +180,7 @@ NtfsAddFCBToTable(PDEVICE_EXTENSION Vcb,
 
 PFCB
 NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb,
-                    PWSTR FileName)
+                    PCWSTR FileName)
 {
   KIRQL  oldIrql;
   PFCB Fcb;

diff --git a/reactos/drivers/fs/ntfs/ntfs.h b/reactos/drivers/fs/ntfs/ntfs.h
index 95d3427..69fc2ee 100644 (file)
--- a/reactos/drivers/fs/ntfs/ntfs.h
+++ b/reactos/drivers/fs/ntfs/ntfs.h
@@ -355,7 +355,7 @@ NtfsDirectoryControl(PDEVICE_OBJECT DeviceObject,
 /* fcb.c */
 
 PFCB
-NtfsCreateFCB(PWCHAR FileName);
+NtfsCreateFCB(PCWSTR FileName);
 
 VOID
 NtfsDestroyFCB(PFCB Fcb);
@@ -380,7 +380,7 @@ NtfsAddFCBToTable(PDEVICE_EXTENSION Vcb,
 
 PFCB
 NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb,
-                    PWSTR FileName);
+                    PCWSTR FileName);
 
 NTSTATUS
 NtfsFCBInitializeCache(PVCB Vcb,

diff --git a/reactos/drivers/fs/vfat/volume.c b/reactos/drivers/fs/vfat/volume.c
index 3a38e0a..7aa1ba7 100644 (file)
--- a/reactos/drivers/fs/vfat/volume.c
+++ b/reactos/drivers/fs/vfat/volume.c
@@ -58,7 +58,7 @@ FsdGetFsAttributeInformation(PDEVICE_EXTENSION DeviceExt,
                             PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo,
                             PULONG BufferLength)
 {
-  WCHAR* pName; ULONG Length;
+  PCWSTR pName; ULONG Length;
   DPRINT("FsdGetFsAttributeInformation()\n");
   DPRINT("FsAttributeInfo = %p\n", FsAttributeInfo);
   DPRINT("BufferLength %lu\n", *BufferLength);

diff --git a/reactos/drivers/net/ndis/ndis/miniport.c b/reactos/drivers/net/ndis/ndis/miniport.c
index 3ff73a0..3f42363 100644 (file)
--- a/reactos/drivers/net/ndis/ndis/miniport.c
+++ b/reactos/drivers/net/ndis/ndis/miniport.c
@@ -1335,7 +1335,7 @@ NdisIPnPStartDevice(
   Status = IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject,
                                DevicePropertyLegacyBusType, Size,
                                &Adapter->NdisMiniportBlock.BusType, &Size);
-  if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.BusType == InterfaceTypeUndefined)
+  if (!NT_SUCCESS(Status) || (INTERFACE_TYPE)Adapter->NdisMiniportBlock.BusType == InterfaceTypeUndefined)
     {
       NdisInitUnicodeString(&ParamName, L"BusType");
       NdisReadConfiguration(&NdisStatus, &ConfigParam, ConfigHandle,

diff --git a/reactos/lib/rossym/find.c b/reactos/lib/rossym/find.c
index 73c0681..b0134b2 100644 (file)
--- a/reactos/lib/rossym/find.c
+++ b/reactos/lib/rossym/find.c
@@ -127,7 +127,7 @@ __asm__("int $3\n");
     }
   if (FileName != NULL)
     {
-      PCHAR Name = "";
+      PCSTR Name = "";
       if (RosSymEntry->FileOffset != 0)
         {
           Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FileOffset;
@@ -136,7 +136,7 @@ __asm__("int $3\n");
     }
   if (FunctionName != NULL)
     {
-      PCHAR Name = "";
+      PCSTR Name = "";
       if (RosSymEntry->FunctionOffset != 0)
         {
           Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FunctionOffset;