11 Nov
2005
11 Nov
'05
8 p.m.
fixed some more warnings when compiled with -Wwrite-strings
Modified: trunk/reactos/boot/freeldr/freeldr/include/inffile.h
Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
Modified: trunk/reactos/drivers/bus/pci/pci.c
Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h
Modified: trunk/reactos/drivers/fs/cdfs/fcb.c
Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.c
Modified: trunk/reactos/drivers/fs/ntfs/fcb.c
Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h
Modified: trunk/reactos/drivers/fs/vfat/volume.c
Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c
Modified: trunk/reactos/lib/rossym/find.c
_____
Modified: trunk/reactos/boot/freeldr/freeldr/include/inffile.h
--- trunk/reactos/boot/freeldr/freeldr/include/inffile.h
2005-11-11 19:31:53 UTC (rev 19143)
+++ trunk/reactos/boot/freeldr/freeldr/include/inffile.h
2005-11-11 19:59:38 UTC (rev 19144)
@@ -51,7 +51,7 @@
BOOLEAN
InfOpenFile (PHINF InfHandle,
- PCHAR FileName,
+ PCSTR FileName,
PULONG ErrorLine);
VOID
@@ -60,8 +60,8 @@
BOOLEAN
InfFindFirstLine (HINF InfHandle,
- PCHAR Section,
- PCHAR Key,
+ PCSTR Section,
+ PCSTR Key,
PINFCONTEXT Context);
BOOLEAN
@@ -123,7 +123,7 @@
BOOLEAN
InfGetDataField (PINFCONTEXT Context,
ULONG FieldIndex,
- PCHAR *Data);
+ PCSTR *Data);
#endif /* __INFCACHE_H__ */
_____
Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c
--- trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c
2005-11-11 19:31:53 UTC (rev 19143)
+++ trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c
2005-11-11 19:59:38 UTC (rev 19144)
@@ -210,7 +210,7 @@
static PINFCACHESECTION
InfpCacheFindSection (PINFCACHE Cache,
- PCHAR Name)
+ PCSTR Name)
{
PINFCACHESECTION Section = NULL;
@@ -373,7 +373,7 @@
static PINFCACHELINE
InfpCacheFindKeyLine (PINFCACHESECTION Section,
- PCHAR Key)
+ PCSTR Key)
{
PINFCACHELINE Line;
@@ -876,7 +876,7 @@
BOOLEAN
InfOpenFile(PHINF InfHandle,
- PCHAR FileName,
+ PCSTR FileName,
PULONG ErrorLine)
{
PFILE FileHandle;
@@ -991,8 +991,8 @@
BOOLEAN
InfFindFirstLine (HINF InfHandle,
- PCHAR Section,
- PCHAR Key,
+ PCSTR Section,
+ PCSTR Key,
PINFCONTEXT Context)
{
PINFCACHE Cache;
@@ -1457,7 +1457,7 @@
BOOLEAN
InfGetDataField (PINFCONTEXT Context,
ULONG FieldIndex,
- PCHAR *Data)
+ PCSTR *Data)
{
PINFCACHELINE CacheLine;
PINFCACHEFIELD CacheField;
_____
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
--- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
2005-11-11 19:31:53 UTC (rev 19143)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
2005-11-11 19:59:38 UTC (rev 19144)
@@ -60,14 +60,14 @@
}
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 @@
}
static BOOL
-LoadKernelSymbols(PCHAR szSourcePath, PCHAR szFileName)
+LoadKernelSymbols(PCSTR szSourcePath, PCSTR szFileName)
{
static ROSSYM_CALLBACKS FreeldrCallbacks =
{
@@ -180,14 +180,14 @@
}
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 @@
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 @@
{
ULONG_PTR Base;
ULONG Size;
- char *SourcePath;
- char *LoadOptions;
+ const char *SourcePath;
+ const char *LoadOptions;
UINT i;
HINF InfHandle;
_____
Modified: trunk/reactos/drivers/bus/pci/pci.c
--- trunk/reactos/drivers/bus/pci/pci.c 2005-11-11 19:31:53 UTC (rev
19143)
+++ trunk/reactos/drivers/bus/pci/pci.c 2005-11-11 19:59:38 UTC (rev
19144)
@@ -342,7 +342,7 @@
PciCreateDeviceDescriptionString(PUNICODE_STRING DeviceDescription,
PPCI_DEVICE Device)
{
- PWSTR Description;
+ PCWSTR Description;
switch (Device->PciConfig.BaseClass)
{
_____
Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h
--- trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-11-11 19:31:53 UTC
(rev 19143)
+++ trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-11-11 19:59:38 UTC
(rev 19144)
@@ -288,7 +288,7 @@
/* fcb.c */
PFCB
-CdfsCreateFCB(PWCHAR FileName);
+CdfsCreateFCB(PCWSTR FileName);
VOID
CdfsDestroyFCB(PFCB Fcb);
_____
Modified: trunk/reactos/drivers/fs/cdfs/fcb.c
--- trunk/reactos/drivers/fs/cdfs/fcb.c 2005-11-11 19:31:53 UTC (rev
19143)
+++ trunk/reactos/drivers/fs/cdfs/fcb.c 2005-11-11 19:59:38 UTC (rev
19144)
@@ -68,7 +68,7 @@
PFCB
-CdfsCreateFCB(PWSTR FileName)
+CdfsCreateFCB(PCWSTR FileName)
{
PFCB Fcb;
_____
Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.c
--- trunk/reactos/drivers/fs/fs_rec/fs_rec.c 2005-11-11 19:31:53 UTC
(rev 19143)
+++ trunk/reactos/drivers/fs/fs_rec/fs_rec.c 2005-11-11 19:59:38 UTC
(rev 19144)
@@ -121,8 +121,8 @@
static NTSTATUS
FsRecRegisterFs(PDRIVER_OBJECT DriverObject,
- PWSTR FsName,
- PWSTR RecognizerName,
+ PCWSTR FsName,
+ PCWSTR RecognizerName,
ULONG DeviceType,
ULONG FsType)
{
_____
Modified: trunk/reactos/drivers/fs/ntfs/fcb.c
--- trunk/reactos/drivers/fs/ntfs/fcb.c 2005-11-11 19:31:53 UTC (rev
19143)
+++ trunk/reactos/drivers/fs/ntfs/fcb.c 2005-11-11 19:59:38 UTC (rev
19144)
@@ -70,7 +70,7 @@
PFCB
-NtfsCreateFCB(PWSTR FileName)
+NtfsCreateFCB(PCWSTR FileName)
{
PFCB Fcb;
@@ -180,7 +180,7 @@
PFCB
NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb,
- PWSTR FileName)
+ PCWSTR FileName)
{
KIRQL oldIrql;
PFCB Fcb;
_____
Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h
--- trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-11-11 19:31:53 UTC
(rev 19143)
+++ trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-11-11 19:59:38 UTC
(rev 19144)
@@ -355,7 +355,7 @@
/* fcb.c */
PFCB
-NtfsCreateFCB(PWCHAR FileName);
+NtfsCreateFCB(PCWSTR FileName);
VOID
NtfsDestroyFCB(PFCB Fcb);
@@ -380,7 +380,7 @@
PFCB
NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb,
- PWSTR FileName);
+ PCWSTR FileName);
NTSTATUS
NtfsFCBInitializeCache(PVCB Vcb,
_____
Modified: trunk/reactos/drivers/fs/vfat/volume.c
--- trunk/reactos/drivers/fs/vfat/volume.c 2005-11-11 19:31:53 UTC
(rev 19143)
+++ trunk/reactos/drivers/fs/vfat/volume.c 2005-11-11 19:59:38 UTC
(rev 19144)
@@ -58,7 +58,7 @@
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);
_____
Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c
--- trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-11-11
19:31:53 UTC (rev 19143)
+++ trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-11-11
19:59:38 UTC (rev 19144)
@@ -1335,7 +1335,7 @@
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,
_____
Modified: trunk/reactos/lib/rossym/find.c
--- trunk/reactos/lib/rossym/find.c 2005-11-11 19:31:53 UTC (rev
19143)
+++ trunk/reactos/lib/rossym/find.c 2005-11-11 19:59:38 UTC (rev
19144)
@@ -127,7 +127,7 @@
}
if (FileName != NULL)
{
- PCHAR Name = "";
+ PCSTR Name = "";
if (RosSymEntry->FileOffset != 0)
{
Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FileOffset;
@@ -136,7 +136,7 @@
}
if (FunctionName != NULL)
{
- PCHAR Name = "";
+ PCSTR Name = "";
if (RosSymEntry->FunctionOffset != 0)
{
Name = (PCHAR) RosSymInfo->Strings +
RosSymEntry->FunctionOffset;