Skip to content

W
wine-winehq
Commit ea398097 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

winedos: Do not cast NULL.

parent b963dd00
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dlls/winedos/devices.c
View file @ ea398097
...@@ -187,7 +187,7 @@ static void WINAPI con_interrupt(CONTEXT86*ctx) ...@@ -187,7 +187,7 @@ static void WINAPI con_interrupt(CONTEXT86*ctx)
DOS_DATASEG *dataseg = (DOS_DATASEG *)lol; DOS_DATASEG *dataseg = (DOS_DATASEG *)lol;
BYTE *linebuffer = dataseg->buffer; BYTE *linebuffer = dataseg->buffer;
BYTE *curbuffer = (lol->offs_unread_CON) ? BYTE *curbuffer = (lol->offs_unread_CON) ?
(((BYTE*)dataseg) + lol->offs_unread_CON) : (BYTE*)NULL; (((BYTE*)dataseg) + lol->offs_unread_CON) : NULL;
DOS_DEVICE_HEADER *con = dataseg->dev; DOS_DEVICE_HEADER *con = dataseg->dev;
DWORD w; DWORD w;
......
dlls/winedos/ppdev.c
View file @ ea398097
...@@ -139,7 +139,7 @@ char IO_pp_init(void) ...@@ -139,7 +139,7 @@ char IO_pp_init(void)
ERR("Is the ppdev module loaded?\n"); ERR("Is the ppdev module loaded?\n");
continue; continue;
} }
userbase = strtol(name,(char **)NULL, 16); userbase = strtol(name, NULL, 16);
if ( errno == ERANGE) if ( errno == ERANGE)
{ {
WARN("Configuration: Invalid base %s for %s\n",name,buffer); WARN("Configuration: Invalid base %s for %s\n",name,buffer);
...@@ -193,7 +193,7 @@ char IO_pp_init(void) ...@@ -193,7 +193,7 @@ char IO_pp_init(void)
PPDeviceList[nports].lastaccess=GetTickCount(); PPDeviceList[nports].lastaccess=GetTickCount();
if (timeout) if (timeout)
{ {
PPDeviceList[nports].timeout = strtol(timeout,(char **)NULL, 10); PPDeviceList[nports].timeout = strtol(timeout, NULL, 10);
if (errno == ERANGE) if (errno == ERANGE)
{ {
WARN("Configuration: Invalid timeout %s in configuration for %s, Setting to 0\n", WARN("Configuration: Invalid timeout %s in configuration for %s, Setting to 0\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment