mirror of
https://github.com/reactos/reactos.git
synced 2024-12-25 16:50:57 +00:00
fixed some more warnings when compiled with -Wwrite-strings
svn path=/trunk/; revision=19144
This commit is contained in:
parent
98fff798f8
commit
183b5a5b51
12 changed files with 32 additions and 32 deletions
|
@ -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__ */
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -342,7 +342,7 @@ NTSTATUS
|
|||
PciCreateDeviceDescriptionString(PUNICODE_STRING DeviceDescription,
|
||||
PPCI_DEVICE Device)
|
||||
{
|
||||
PWSTR Description;
|
||||
PCWSTR Description;
|
||||
|
||||
switch (Device->PciConfig.BaseClass)
|
||||
{
|
||||
|
|
|
@ -288,7 +288,7 @@ CdfsDirectoryControl(PDEVICE_OBJECT DeviceObject,
|
|||
/* fcb.c */
|
||||
|
||||
PFCB
|
||||
CdfsCreateFCB(PWCHAR FileName);
|
||||
CdfsCreateFCB(PCWSTR FileName);
|
||||
|
||||
VOID
|
||||
CdfsDestroyFCB(PFCB Fcb);
|
||||
|
|
|
@ -68,7 +68,7 @@ CdfsWSubString(PWCHAR pTarget, const PWCHAR pSource, size_t pLength)
|
|||
|
||||
|
||||
PFCB
|
||||
CdfsCreateFCB(PWSTR FileName)
|
||||
CdfsCreateFCB(PCWSTR FileName)
|
||||
{
|
||||
PFCB Fcb;
|
||||
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue