doohoyi/comport
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Got rid of some more warnings in the MinGW version.

Browse source 
svn path=/trunk/externals/iem/comport/; revision=13142
This commit is contained in:
Martin Peach 2010-02-03 17:39:14 +00:00
parent 14e6f856c5
commit 217e4a430c
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
comport/comport.c
View file

@ -171,8 +171,6 @@ long baudspeedbittable[] =
struct timeval null_tv; struct timeval null_tv;
#endif /* else _WIN32 */
#define BAUDRATETABLE_LEN 19 #define BAUDRATETABLE_LEN 19
static long baudratetable[] = static long baudratetable[] =
@ -199,6 +197,8 @@ static long baudratetable[] =
}; /* holds the baud rate selections */ }; /* holds the baud rate selections */
#endif /* else _WIN32 */
/* From man cfsetospeed: /* From man cfsetospeed:
cfsetospeed() sets the output baud rate stored in the cfsetospeed() sets the output baud rate stored in the
termios structure pointed to by termios_p to speed, which termios structure pointed to by termios_p to speed, which
@ -506,7 +506,7 @@ static HANDLE open_serial(unsigned int com_num, t_comport *x)
errStr = " "; errStr = " ";
break; break;
} }
pd_error(x, "[comport]: could not open device %s:\n failure(%d) %s\n", pd_error(x, "[comport]: could not open device %s:\n failure(%ld) %s\n",
&x->serial_device->s_name[4], dw, errStr); &x->serial_device->s_name[4], dw, errStr);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
@ -1025,12 +1025,19 @@ static void comport_tick(t_comport *x)
{ /* while there are bytes, read them and send them out, ignore errors (!??) */ { /* while there are bytes, read them and send them out, ignore errors (!??) */
#ifdef _WIN32 #ifdef _WIN32
DWORD dwRead; DWORD dwRead;
OVERLAPPED osReader = {0}; OVERLAPPED osReader;
DWORD dwX; DWORD dwX;
DWORD whicherr = 0; DWORD whicherr = 0;
err = 0; err = 0;
/* initialize all fields off osReader to zero to avoid gcc warnings about */
/* missing initializer if we just do osReader ={0} */
osReader.hEvent = 0;
osReader.Internal = 0;
osReader.InternalHigh = 0;
osReader.Offset = 0;
osReader.OffsetHigh = 0;
osReader.Pointer = 0;
osReader.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); osReader.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
if(ReadFile(x->comhandle, x->x_inbuf, x->x_inbuf_len, &dwRead, &osReader)) if(ReadFile(x->comhandle, x->x_inbuf, x->x_inbuf_len, &dwRead, &osReader))
{ {
@ -1082,12 +1089,20 @@ static void comport_tick(t_comport *x)
if (0 != x->x_outbuf_wr_index) if (0 != x->x_outbuf_wr_index)
{ {
#ifdef _WIN32 #ifdef _WIN32
OVERLAPPED osWrite = {0}; OVERLAPPED osWrite;
DWORD dwWritten; DWORD dwWritten;
DWORD dwToWrite = (DWORD)x->x_outbuf_wr_index; DWORD dwToWrite = (DWORD)x->x_outbuf_wr_index;
DWORD dwErr; DWORD dwErr;
DWORD numTransferred = 0L; DWORD numTransferred = 0L;
/* initialize all fields off osWrite to zero to avoid gcc warnings about */
/* missing initializer if we just do osWrite ={0} */
osWrite.hEvent = 0;
osWrite.Internal = 0;
osWrite.InternalHigh = 0;
osWrite.Offset = 0;
osWrite.OffsetHigh = 0;
osWrite.Pointer = 0;
osWrite.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); osWrite.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
if (osWrite.hEvent == NULL) if (osWrite.hEvent == NULL)
{ {