summaryrefslogtreecommitdiffstats
path: root/kresources/groupwise/soap/stdsoap2.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /kresources/groupwise/soap/stdsoap2.cpp
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources/groupwise/soap/stdsoap2.cpp')
-rw-r--r--kresources/groupwise/soap/stdsoap2.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/kresources/groupwise/soap/stdsoap2.cpp
index 0a0f3c58e..175387686 100644
--- a/kresources/groupwise/soap/stdsoap2.cpp
+++ b/kresources/groupwise/soap/stdsoap2.cpp
@@ -3316,7 +3316,7 @@ again:
{ short v;
unsigned int k = soap->omode; /* make sure we only parse HTTP */
size_t n = soap->count; /* save the content length */
- soap->omode &= ~SOAP_ENC; /* mask IO and ENC */
+ soap->omode &= ~SOAP_ENC; /* tqmask IO and ENC */
soap->omode |= SOAP_IO_BUFFER;
soap_begin_send(soap);
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Connecting to proxy server\n"));
@@ -3337,7 +3337,7 @@ again:
return SOAP_INVALID_SOCKET;
soap->omode = k;
k = soap->imode;
- soap->imode &= ~SOAP_ENC; /* mask IO and ENC */
+ soap->imode &= ~SOAP_ENC; /* tqmask IO and ENC */
v = soap->version; /* preserve */
if (soap_begin_recv(soap))
return SOAP_INVALID_SOCKET;
@@ -6957,7 +6957,7 @@ SOAP_FMAC2
soap_string_out(struct soap *soap, const char *s, int flag)
{ register const char *t;
register soap_wchar c;
- register soap_wchar mask = 0xFFFFFF80UL;
+ register soap_wchar tqmask = 0xFFFFFF80UL;
#ifdef WITH_DOM
if ((soap->mode & SOAP_XML_DOM) && soap->dom)
{ soap->dom->data = soap_strdup(soap, s); /* check EOM */
@@ -6965,7 +6965,7 @@ soap_string_out(struct soap *soap, const char *s, int flag)
}
#endif
if (soap->mode & SOAP_C_UTFSTRING)
- mask = 0;
+ tqmask = 0;
t = s;
while ((c = *t++))
{ switch (c)
@@ -7028,7 +7028,7 @@ soap_string_out(struct soap *soap, const char *s, int flag)
}
#endif
#endif
- if (c & mask)
+ if (c & tqmask)
{ if (soap_send_raw(soap, s, t - s - 1) || soap_pututf8(soap, (unsigned char)c))
return soap->error;
s = t;