generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove implicit casts

Browse Source 
Cast parameters of htonl in uint32_t in IN6_IS_ADDR_GLOBAL and
IN6_IS_ADDR_ULA definitions.
Remove comparison with 0 in while statement of vfmatch,
http_SendMessage and http_MakeMessage.
(cherry picked from commit 804088d859)
This commit is contained in:
Fabrice Fontaine
2012-03-24 22:18:20 +01:00
committed by Marcelo Roberto Jimenez
parent 664176c8d6
commit f99dba3967
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -332,6 +332,15 @@ Version 1.8.0
Version 1.6.17
*******************************************************************************
2012-03-24 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
Remove implicit casts
Cast parameters of htonl in uint32_t in IN6_IS_ADDR_GLOBAL and
IN6_IS_ADDR_ULA definitions.
Remove comparison with 0 in while statement of vfmatch,
http_SendMessage and http_MakeMessage.
2012-03-24 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
SF Bug Tracker id 3510693 - build fail with --disable-device

8
upnp/src/api/upnpapi.c
View File

@@ -84,14 +84,14 @@
#ifndef IN6_IS_ADDR_GLOBAL
#define IN6_IS_ADDR_GLOBAL(a) \
((((__const uint32_t *) (a))[0] & htonl(0x70000000)) \
== htonl (0x20000000))
((((__const uint32_t *) (a))[0] & htonl((uint32_t)0x70000000)) \
== htonl ((uint32_t)0x20000000))
#endif /* IS ADDR GLOBAL */
#ifndef IN6_IS_ADDR_ULA
#define IN6_IS_ADDR_ULA(a) \
((((__const uint32_t *) (a))[0] & htonl(0xfe000000)) \
== htonl (0xfc000000))
((((__const uint32_t *) (a))[0] & htonl((uint32_t)0xfe000000)) \
== htonl ((uint32_t)0xfc000000))
#endif /* IS ADDR ULA */
/*! This structure is for virtual directory callbacks */

2
upnp/src/genlib/net/http/httpparser.c
View File

@@ -979,7 +979,7 @@ static parse_status_t vfmatch(
save_pos = scanner->cursor;
status = PARSE_OK;
while( ( ( c = *fmt_ptr++ ) != 0 ) &&
while( ( c = *fmt_ptr++ ) &&
( status == ( parse_status_t ) PARSE_OK ) ) {
if( c == '%' ) {
c = *fmt_ptr++;

4
upnp/src/genlib/net/http/httpreadwrite.c
View File

@@ -443,7 +443,7 @@ int http_SendMessage(SOCKINFO *info, int *TimeOut, const char *fmt, ...)
memset(Chunk_Header, 0, sizeof(Chunk_Header));
va_start(argp, fmt);
while ((c = *fmt++) != 0) {
while ((c = *fmt++)) {
if (c == 'I') {
Instr = va_arg(argp, struct SendInstruction *);
if (Instr->ReadSendSize >= 0)
@@ -1478,7 +1478,7 @@ int http_MakeMessage(membuffer *buf, int http_major_version,
memset(tempbuf, 0, sizeof(tempbuf));
va_start(argp, fmt);
while ((c = *fmt++) != 0) {
while ((c = *fmt++)) {
if (c == 's') {
/* C string */
s = (char *)va_arg(argp, char *);