Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-28 23:29:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some more warnings when compiled with -Wwrite-strings

Browse source 
svn path=/trunk/; revision=19144
This commit is contained in:
Thomas Bluemel 2005-11-11 19:59:38 +00:00
parent 98fff798f8
commit 183b5a5b51
12 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/boot/freeldr/freeldr/include/inffile.h
View file

@ -51,7 +51,7 @@ typedef struct _INFCONTEXT
BOOLEAN BOOLEAN
InfOpenFile (PHINF InfHandle, InfOpenFile (PHINF InfHandle,
PCHAR FileName, PCSTR FileName,
PULONG ErrorLine); PULONG ErrorLine);
VOID VOID
@ -60,8 +60,8 @@ InfCloseFile (HINF InfHandle);
BOOLEAN BOOLEAN
InfFindFirstLine (HINF InfHandle, InfFindFirstLine (HINF InfHandle,
PCHAR Section, PCSTR Section,
PCHAR Key, PCSTR Key,
PINFCONTEXT Context); PINFCONTEXT Context);
BOOLEAN BOOLEAN
@ -123,7 +123,7 @@ InfGetData (PINFCONTEXT Context,
BOOLEAN BOOLEAN
InfGetDataField (PINFCONTEXT Context, InfGetDataField (PINFCONTEXT Context,
ULONG FieldIndex, ULONG FieldIndex,
PCHAR *Data); PCSTR *Data);
#endif /* __INFCACHE_H__ */ #endif /* __INFCACHE_H__ */

12
reactos/boot/freeldr/freeldr/inffile/inffile.c
View file

@ -210,7 +210,7 @@ InfpCacheFreeSection (PINFCACHESECTION Section)
static PINFCACHESECTION static PINFCACHESECTION
InfpCacheFindSection (PINFCACHE Cache, InfpCacheFindSection (PINFCACHE Cache,
PCHAR Name) PCSTR Name)
{ {
PINFCACHESECTION Section = NULL; PINFCACHESECTION Section = NULL;
@ -373,7 +373,7 @@ InfpAddFieldToLine (PINFCACHELINE Line,
static PINFCACHELINE static PINFCACHELINE
InfpCacheFindKeyLine (PINFCACHESECTION Section, InfpCacheFindKeyLine (PINFCACHESECTION Section,
PCHAR Key) PCSTR Key)
{ {
PINFCACHELINE Line; PINFCACHELINE Line;
@ -876,7 +876,7 @@ InfpParseBuffer (PINFCACHE file,
BOOLEAN BOOLEAN
InfOpenFile(PHINF InfHandle, InfOpenFile(PHINF InfHandle,
PCHAR FileName, PCSTR FileName,
PULONG ErrorLine) PULONG ErrorLine)
{ {
PFILE FileHandle; PFILE FileHandle;
@ -991,8 +991,8 @@ InfCloseFile(HINF InfHandle)
BOOLEAN BOOLEAN
InfFindFirstLine (HINF InfHandle, InfFindFirstLine (HINF InfHandle,
PCHAR Section, PCSTR Section,
PCHAR Key, PCSTR Key,
PINFCONTEXT Context) PINFCONTEXT Context)
{ {
PINFCACHE Cache; PINFCACHE Cache;
@ -1457,7 +1457,7 @@ InfGetData (PINFCONTEXT Context,
BOOLEAN BOOLEAN
InfGetDataField (PINFCONTEXT Context, InfGetDataField (PINFCONTEXT Context,
ULONG FieldIndex, ULONG FieldIndex,
PCHAR *Data) PCSTR *Data)
{ {
PINFCACHELINE CacheLine; PINFCACHELINE CacheLine;
PINFCACHEFIELD CacheField; PINFCACHEFIELD CacheField;

18
reactos/boot/freeldr/freeldr/reactos/setupldr.c
View file

@ -60,14 +60,14 @@ FreeldrSeekFile(PVOID FileContext, ULONG_PTR Position)
} }
static BOOL static BOOL
LoadKernel(PCHAR szSourcePath, PCHAR szFileName) LoadKernel(PCSTR szSourcePath, PCSTR szFileName)
{ {
CHAR szFullName[256]; CHAR szFullName[256];
#ifdef USE_UI #ifdef USE_UI
CHAR szBuffer[80]; CHAR szBuffer[80];
#endif #endif
PFILE FilePointer; PFILE FilePointer;
PCHAR szShortName; PCSTR szShortName;
if (szSourcePath[0] != '\\') if (szSourcePath[0] != '\\')
{ {
@ -125,7 +125,7 @@ LoadKernel(PCHAR szSourcePath, PCHAR szFileName)
} }
static BOOL static BOOL
LoadKernelSymbols(PCHAR szSourcePath, PCHAR szFileName) LoadKernelSymbols(PCSTR szSourcePath, PCSTR szFileName)
{ {
static ROSSYM_CALLBACKS FreeldrCallbacks = static ROSSYM_CALLBACKS FreeldrCallbacks =
{ {
@ -180,14 +180,14 @@ LoadKernelSymbols(PCHAR szSourcePath, PCHAR szFileName)
} }
static BOOL static BOOL
LoadDriver(PCHAR szSourcePath, PCHAR szFileName) LoadDriver(PCSTR szSourcePath, PCSTR szFileName)
{ {
CHAR szFullName[256]; CHAR szFullName[256];
#ifdef USE_UI #ifdef USE_UI
CHAR szBuffer[80]; CHAR szBuffer[80];
#endif #endif
PFILE FilePointer; PFILE FilePointer;
PCHAR szShortName; PCSTR szShortName;
if (szSourcePath[0] != '\\') if (szSourcePath[0] != '\\')
{ {
@ -245,14 +245,14 @@ LoadDriver(PCHAR szSourcePath, PCHAR szFileName)
static BOOL static BOOL
LoadNlsFile(PCHAR szSourcePath, PCHAR szFileName, PCHAR szModuleName) LoadNlsFile(PCSTR szSourcePath, PCSTR szFileName, PCSTR szModuleName)
{ {
CHAR szFullName[256]; CHAR szFullName[256];
#ifdef USE_UI #ifdef USE_UI
CHAR szBuffer[80]; CHAR szBuffer[80];
#endif #endif
PFILE FilePointer; PFILE FilePointer;
PCHAR szShortName; PCSTR szShortName;
if (szSourcePath[0] != '\\') if (szSourcePath[0] != '\\')
{ {
@ -312,8 +312,8 @@ VOID RunLoader(VOID)
{ {
ULONG_PTR Base; ULONG_PTR Base;
ULONG Size; ULONG Size;
char *SourcePath; const char *SourcePath;
char *LoadOptions; const char *LoadOptions;
UINT i; UINT i;
HINF InfHandle; HINF InfHandle;

2
reactos/drivers/bus/pci/pci.c
View file

@ -342,7 +342,7 @@ NTSTATUS
PciCreateDeviceDescriptionString(PUNICODE_STRING DeviceDescription, PciCreateDeviceDescriptionString(PUNICODE_STRING DeviceDescription,
PPCI_DEVICE Device) PPCI_DEVICE Device)
{ {
PWSTR Description; PCWSTR Description;
switch (Device->PciConfig.BaseClass) switch (Device->PciConfig.BaseClass)
{ {

2
reactos/drivers/fs/cdfs/cdfs.h
View file

@ -288,7 +288,7 @@ CdfsDirectoryControl(PDEVICE_OBJECT DeviceObject,
/* fcb.c */ /* fcb.c */
PFCB PFCB
CdfsCreateFCB(PWCHAR FileName); CdfsCreateFCB(PCWSTR FileName);
VOID VOID
CdfsDestroyFCB(PFCB Fcb); CdfsDestroyFCB(PFCB Fcb);

2
reactos/drivers/fs/cdfs/fcb.c
View file

@ -68,7 +68,7 @@ CdfsWSubString(PWCHAR pTarget, const PWCHAR pSource, size_t pLength)
PFCB PFCB
CdfsCreateFCB(PWSTR FileName) CdfsCreateFCB(PCWSTR FileName)
{ {
PFCB Fcb; PFCB Fcb;

4
reactos/drivers/fs/fs_rec/fs_rec.c
View file

@ -121,8 +121,8 @@ FsRecUnload(IN PDRIVER_OBJECT DriverObject)
static NTSTATUS static NTSTATUS
FsRecRegisterFs(PDRIVER_OBJECT DriverObject, FsRecRegisterFs(PDRIVER_OBJECT DriverObject,
PWSTR FsName, PCWSTR FsName,
PWSTR RecognizerName, PCWSTR RecognizerName,
ULONG DeviceType, ULONG DeviceType,
ULONG FsType) ULONG FsType)
{ {

4
reactos/drivers/fs/ntfs/fcb.c
View file

@ -70,7 +70,7 @@ NtfsWSubString(PWCHAR pTarget, const PWCHAR pSource, size_t pLength)
PFCB PFCB
NtfsCreateFCB(PWSTR FileName) NtfsCreateFCB(PCWSTR FileName)
{ {
PFCB Fcb; PFCB Fcb;
@ -180,7 +180,7 @@ NtfsAddFCBToTable(PDEVICE_EXTENSION Vcb,
PFCB PFCB
NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb, NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb,
PWSTR FileName) PCWSTR FileName)
{ {
KIRQL oldIrql; KIRQL oldIrql;
PFCB Fcb; PFCB Fcb;

4
reactos/drivers/fs/ntfs/ntfs.h
View file

@ -355,7 +355,7 @@ NtfsDirectoryControl(PDEVICE_OBJECT DeviceObject,
/* fcb.c */ /* fcb.c */
PFCB PFCB
NtfsCreateFCB(PWCHAR FileName); NtfsCreateFCB(PCWSTR FileName);
VOID VOID
NtfsDestroyFCB(PFCB Fcb); NtfsDestroyFCB(PFCB Fcb);
@ -380,7 +380,7 @@ NtfsAddFCBToTable(PDEVICE_EXTENSION Vcb,
PFCB PFCB
NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb, NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb,
PWSTR FileName); PCWSTR FileName);
NTSTATUS NTSTATUS
NtfsFCBInitializeCache(PVCB Vcb, NtfsFCBInitializeCache(PVCB Vcb,

2
reactos/drivers/fs/vfat/volume.c
View file

@ -58,7 +58,7 @@ FsdGetFsAttributeInformation(PDEVICE_EXTENSION DeviceExt,
PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo,
PULONG BufferLength) PULONG BufferLength)
{ {
WCHAR* pName; ULONG Length; PCWSTR pName; ULONG Length;
DPRINT("FsdGetFsAttributeInformation()\n"); DPRINT("FsdGetFsAttributeInformation()\n");
DPRINT("FsAttributeInfo = %p\n", FsAttributeInfo); DPRINT("FsAttributeInfo = %p\n", FsAttributeInfo);
DPRINT("BufferLength %lu\n", *BufferLength); DPRINT("BufferLength %lu\n", *BufferLength);

2
reactos/drivers/net/ndis/ndis/miniport.c
View file

@ -1335,7 +1335,7 @@ NdisIPnPStartDevice(
Status = IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject, Status = IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject,
DevicePropertyLegacyBusType, Size, DevicePropertyLegacyBusType, Size,
&Adapter->NdisMiniportBlock.BusType, &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"); NdisInitUnicodeString(&ParamName, L"BusType");
NdisReadConfiguration(&NdisStatus, &ConfigParam, ConfigHandle, NdisReadConfiguration(&NdisStatus, &ConfigParam, ConfigHandle,

4
reactos/lib/rossym/find.c
View file

@ -127,7 +127,7 @@ __asm__("int $3\n");
} }
if (FileName != NULL) if (FileName != NULL)
{ {
PCHAR Name = ""; PCSTR Name = "";
if (RosSymEntry->FileOffset != 0) if (RosSymEntry->FileOffset != 0)
{ {
Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FileOffset; Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FileOffset;
@ -136,7 +136,7 @@ __asm__("int $3\n");
} }
if (FunctionName != NULL) if (FunctionName != NULL)
{ {
PCHAR Name = ""; PCSTR Name = "";
if (RosSymEntry->FunctionOffset != 0) if (RosSymEntry->FunctionOffset != 0)
{ {
Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FunctionOffset; Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FunctionOffset;