SHA256
1
0
forked from pool/gsoap
gsoap/gsoap-03-seqpoint.diff

56 lines
2.2 KiB
Diff
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

From: Jan Engelhardt <jengelh@inai.de>
Date: 2016-01-28 19:19:57.092815111 +0100
References: http://sf.net/p/gsoap2/patches/157/
In file included from stdsoap2_ssl.c:60:0:
stdsoap2_ssl.c: In function soap_getgziphdr:
stdsoap2.h:2347:128: warning: operation on soap->bufidx may be undefined [-Wsequence-point]
# define soap_get1(soap) (((soap)->bufidx>=(soap)->buflen && soap_recv(soap)) ? EOF : (unsigned char)(soap)->buf[(soap)->bufidx++])
^
stdsoap2_ssl.c:15576:14: note: in expansion of macro soap_get1
{ for (i = soap_get1(soap) | (soap_get1(soap) << 8); i; i--)
^
---
gsoap/stdsoap2.cpp | 2 --
gsoap/stdsoap2.h | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)
Index: gsoap-2.8.22/gsoap/stdsoap2.cpp
===================================================================
--- gsoap-2.8.22.orig/gsoap/stdsoap2.cpp
+++ gsoap-2.8.22/gsoap/stdsoap2.cpp
@@ -1547,7 +1547,6 @@ soap_get0(struct soap *soap)
#endif
/******************************************************************************/
-#ifdef WITH_LEAN
#ifndef PALM_1
soap_wchar
soap_get1(struct soap *soap)
@@ -1556,7 +1555,6 @@ soap_get1(struct soap *soap)
return (unsigned char)soap->buf[soap->bufidx++];
}
#endif
-#endif
/******************************************************************************/
#ifndef PALM_1
Index: gsoap-2.8.22/gsoap/stdsoap2.h
===================================================================
--- gsoap-2.8.22.orig/gsoap/stdsoap2.h
+++ gsoap-2.8.22/gsoap/stdsoap2.h
@@ -2344,11 +2344,10 @@ extern SOAP_NMAC struct Namespace namesp
#ifndef WITH_LEAN
# define soap_get0(soap) (((soap)->bufidx>=(soap)->buflen && soap_recv(soap)) ? EOF : (unsigned char)(soap)->buf[(soap)->bufidx])
-# define soap_get1(soap) (((soap)->bufidx>=(soap)->buflen && soap_recv(soap)) ? EOF : (unsigned char)(soap)->buf[(soap)->bufidx++])
#else
soap_wchar soap_get0(struct soap*);
-soap_wchar soap_get1(struct soap*);
#endif
+soap_wchar soap_get1(struct soap*);
#define SOAP_XSTRINGIFY(s) SOAP_STRINGIFY(s)
#define SOAP_STRINGIFY(s) #s