From 77750880af12c7008d17db372c020c8620b4282f Mon Sep 17 00:00:00 2001
From: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>
Date: Tue, 17 Nov 2026 22:51:21 -0300
Subject: GroupWise: Use nullptr in SOAP runtime sources
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modernize pointer constants in the versioned gSOAP runtime and namespace map, preserving the explicit SSL pointer comparison required by soap_putcookies.

Leave the stubs recipe unchanged: gSOAP 2.7.18 completes regeneration but its generated sources do not compile against the bundled 2.7.3 runtime; 2.8.135 also generates incompatible sources.

Signed-off-by: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>
---
 tderesources/groupwise/soap/GroupWiseBinding.nsmap |  18 +-
 tderesources/groupwise/soap/stdsoap2.cpp           | 222 ++++++++++-----------
 tderesources/groupwise/soap/stdsoap2.h             |   6 +-
 3 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/tderesources/groupwise/soap/GroupWiseBinding.nsmap b/tderesources/groupwise/soap/GroupWiseBinding.nsmap
index b07dd5bb4..5183db071 100644
--- a/tderesources/groupwise/soap/GroupWiseBinding.nsmap
+++ b/tderesources/groupwise/soap/GroupWiseBinding.nsmap
@@ -2,13 +2,13 @@
 #include "soapH.h"
 SOAP_NMAC struct Namespace namespaces[] =
 {
-	{"SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/", "http://www.w3.org/*/soap-envelope", NULL},
-	{"SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/", "http://www.w3.org/*/soap-encoding", NULL},
-	{"xsi", "http://www.w3.org/2001/XMLSchema-instance", "http://www.w3.org/*/XMLSchema-instance", NULL},
-	{"xsd", "http://www.w3.org/2001/XMLSchema", "http://www.w3.org/*/XMLSchema", NULL},
-	{"ngwt", "http://schemas.novell.com/2005/01/GroupWise/types", NULL, NULL},
-	{"ngwm", "http://schemas.novell.com/2005/01/GroupWise/methods", NULL, NULL},
-	{"ngw", "http://schemas.novell.com/2005/01/GroupWise/groupwise.wsdl", NULL, NULL},
-	{"ngwe", "http://schemas.novell.com/2005/01/GroupWise/events", NULL, NULL},
-	{NULL, NULL, NULL, NULL}
+	{"SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/", "http://www.w3.org/*/soap-envelope", nullptr},
+	{"SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/", "http://www.w3.org/*/soap-encoding", nullptr},
+	{"xsi", "http://www.w3.org/2001/XMLSchema-instance", "http://www.w3.org/*/XMLSchema-instance", nullptr},
+	{"xsd", "http://www.w3.org/2001/XMLSchema", "http://www.w3.org/*/XMLSchema", nullptr},
+	{"ngwt", "http://schemas.novell.com/2005/01/GroupWise/types", nullptr, nullptr},
+	{"ngwm", "http://schemas.novell.com/2005/01/GroupWise/methods", nullptr, nullptr},
+	{"ngw", "http://schemas.novell.com/2005/01/GroupWise/groupwise.wsdl", nullptr, nullptr},
+	{"ngwe", "http://schemas.novell.com/2005/01/GroupWise/events", nullptr, nullptr},
+	{nullptr, nullptr, nullptr, nullptr}
 };
diff --git a/tderesources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp
index 2e68b668c..ac55b4327 100644
--- a/tderesources/groupwise/soap/stdsoap2.cpp
+++ b/tderesources/groupwise/soap/stdsoap2.cpp
@@ -390,7 +390,7 @@ static const struct soap_code_map h_ssl_error_codes[] =
   _SSL_ERROR(SSL_ERROR_WANT_CONNECT),
   _SSL_ERROR(SSL_ERROR_WANT_X509_LOOKUP),
   _SSL_ERROR(SSL_ERROR_SYSCALL),
-  { 0, NULL }
+  { 0, nullptr }
 };
 #endif
 
@@ -485,7 +485,7 @@ fsend(struct soap *soap, const char *s, size_t n)
               timeout.tv_usec = 1000 * udp_delay; /* ms */
               FD_ZERO(&fd);
               FD_SET((SOAP_SOCKET)soap->socket, &fd);
-              select((SOAP_SOCKET)(soap->socket + 1), NULL, NULL, &fd, &timeout);
+              select((SOAP_SOCKET)(soap->socket + 1), nullptr, nullptr, &fd, &timeout);
 	      if (soap->peerlen)
 	        nwritten = sendto((SOAP_SOCKET)soap->socket, s, n, soap->socket_flags, (struct sockaddr*)&soap->peer, soap->peerlen);
               else
@@ -794,9 +794,9 @@ frecv(struct soap *soap, char *s, size_t n)
         FD_SET((SOAP_SOCKET)soap->socket, &fd);
 #ifdef WITH_OPENSSL
         if (soap->ssl && SSL_get_error(soap->ssl, r) == SSL_ERROR_WANT_WRITE)
-          r = select((SOAP_SOCKET)(soap->socket + 1), NULL, &fd, &fd, &timeout);
+          r = select((SOAP_SOCKET)(soap->socket + 1), nullptr, &fd, &fd, &timeout);
         else
-          r = select((SOAP_SOCKET)(soap->socket + 1), &fd, NULL, &fd, &timeout);
+          r = select((SOAP_SOCKET)(soap->socket + 1), &fd, nullptr, &fd, &timeout);
 #else
         r = select((SOAP_SOCKET)(soap->socket + 1), &fd, nullptr, &fd, &timeout);
 #endif
@@ -1406,7 +1406,7 @@ soap_puthex(struct soap *soap, const unsigned char *s, int n)
   int i;
 #ifdef WITH_DOM
   if ((soap->mode & SOAP_XML_DOM) && soap->dom)
-  { if (!(soap->dom->data = soap_s2hex(soap, s, NULL, n)))
+  { if (!(soap->dom->data = soap_s2hex(soap, s, nullptr, n)))
       return soap->error;
     return SOAP_OK;
   }
@@ -1435,8 +1435,8 @@ soap_gethex(struct soap *soap, int *n)
   for (;;)
   { char *s;
     int i, k;
-    if (soap_append_lab(soap, NULL, 0))
-      return NULL;
+    if (soap_append_lab(soap, nullptr, 0))
+      return nullptr;
     s = soap->labbuf + soap->labidx;
     k = soap->lablen - soap->labidx;
     soap->labidx = soap->lablen;
@@ -1451,7 +1451,7 @@ soap_gethex(struct soap *soap, int *n)
           d2 = (char)c;
         else
         { soap->error = SOAP_TYPE;
-          return NULL;
+          return nullptr;
         }
       }
       else
@@ -1519,7 +1519,7 @@ soap_putbase64(struct soap *soap, const unsigned char *s, int n)
     return SOAP_OK;
 #ifdef WITH_DOM
   if ((soap->mode & SOAP_XML_DOM) && soap->dom)
-  { if (!(soap->dom->data = soap_s2base64(soap, s, NULL, n)))
+  { if (!(soap->dom->data = soap_s2base64(soap, s, nullptr, n)))
       return soap->error;
     return SOAP_OK;
   }
@@ -1562,13 +1562,13 @@ soap_getbase64(struct soap *soap, int *n, int malloc_flag)
   for (;;)
   { int i, k;
     char *s;
-    if (soap_append_lab(soap, NULL, 2))
-      return NULL;
+    if (soap_append_lab(soap, nullptr, 2))
+      return nullptr;
     s = soap->labbuf + soap->labidx;
     k = 3 * ((soap->lablen - soap->labidx) / 3);
     soap->labidx = 3 * (soap->lablen / 3);
     if (!s)
-      return NULL;
+      return nullptr;
     for (i = 0; i < k; i += 3)
     { unsigned long m = 0;
       int j = 0;
@@ -2489,7 +2489,7 @@ soap_ssl_server_context(struct soap *soap, unsigned short flags, const char *key
     soap->rsa = 0;
   }
   else
-  { soap->dhfile = NULL;
+  { soap->dhfile = nullptr;
     soap->rsa = 1;
   }
   soap->randfile = randfile;
@@ -2511,7 +2511,7 @@ soap_ssl_client_context(struct soap *soap, unsigned short flags, const char *key
   soap->password = password;
   soap->cafile = cafile;
   soap->capath = capath;
-  soap->dhfile = NULL;
+  soap->dhfile = nullptr;
   soap->rsa = 0;
   soap->randfile = randfile;
   soap->require_server_auth = (flags & SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION);
@@ -2661,7 +2661,7 @@ ssl_auth_init(struct soap *soap)
   }
 */
   if (soap->rsa)
-  { RSA *rsa = RSA_generate_key(512, RSA_F4, NULL, NULL);
+  { RSA *rsa = RSA_generate_key(512, RSA_F4, nullptr, nullptr);
     if (!SSL_CTX_set_tmp_rsa(soap->ctx, rsa))
     { if (rsa)
         RSA_free(rsa);
@@ -2675,7 +2675,7 @@ ssl_auth_init(struct soap *soap)
     bio = BIO_new_file(soap->dhfile, "r");
     if (!bio)
       return soap_set_receiver_error(soap, "SSL error", "Can't read DH file", SOAP_SSL_ERROR);
-    dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL);
+    dh = PEM_read_bio_DHparams(bio, nullptr, nullptr, nullptr);
     BIO_free(bio);
     if (SSL_CTX_set_tmp_dh(soap->ctx, dh) < 0)
     { if (dh)
@@ -2757,7 +2757,7 @@ soap_ssl_accept(struct soap *soap)
       timeout.tv_usec = 100000;
       FD_ZERO(&fd);
       FD_SET((SOAP_SOCKET)soap->socket, &fd);
-      r = select((SOAP_SOCKET)(soap->socket + 1), &fd, NULL, &fd, &timeout);
+      r = select((SOAP_SOCKET)(soap->socket + 1), &fd, nullptr, &fd, &timeout);
       if (r < 0 && soap_socket_errno != SOAP_EINTR)
       { soap->errnum = soap_socket_errno;
         return SOAP_EOF;
@@ -2864,7 +2864,7 @@ soap_done(struct soap *soap)
 #ifndef WITH_IPV6
   soap->fresolve = tcp_gethost;
 #else
-  soap->fresolve = NULL;
+  soap->fresolve = nullptr;
 #endif
   soap->faccept = tcp_accept;
   soap->fopen = tcp_connect;
@@ -2875,9 +2875,9 @@ soap_done(struct soap *soap)
   soap->frecv = frecv;
   soap->fpoll = soap_poll;
 #else
-  soap->fopen = NULL;
-  soap->fclose = NULL;
-  soap->fpoll = NULL;
+  soap->fopen = nullptr;
+  soap->fclose = nullptr;
+  soap->fpoll = nullptr;
 #endif
 #ifndef WITH_LEANER
   soap->fprepareinit = nullptr;
@@ -2890,7 +2890,7 @@ soap_done(struct soap *soap)
 #ifdef WITH_OPENSSL
   if (soap->session)
   { SSL_SESSION_free(soap->session);
-    soap->session = NULL;
+    soap->session = nullptr;
   }
 #endif
   if (!soap->copy)
@@ -2901,7 +2901,7 @@ soap_done(struct soap *soap)
 #ifdef WITH_OPENSSL
     if (soap->ctx)
     { SSL_CTX_free(soap->ctx);
-      soap->ctx = NULL;
+      soap->ctx = nullptr;
     }
 #endif
   }
@@ -2909,7 +2909,7 @@ soap_done(struct soap *soap)
   for (i = 0; i < SOAP_MAXLOGS; i++)
   { if (soap->logfile[i])
     { SOAP_FREE(soap, (void*)soap->logfile[i]);
-      soap->logfile[i] = NULL;
+      soap->logfile[i] = nullptr;
     }
     soap_close_logfile(soap, i);
   }
@@ -3014,7 +3014,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr)
 #elif defined(_AIXVERSION_431)
   memset((void*)&ht_data, 0, sizeof(ht_data));
   if (gethostbyname_r(addr, &hostent, &ht_data) < 0)
-  { host = NULL;
+  { host = nullptr;
     soap->errnum = h_errno;
   }
 #elif defined(HAVE_GETHOSTBYNAME_R)
@@ -3025,7 +3025,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr)
    * name was not found in the local host table. */
   hostint = hostGetByName(addrcopy);
   if (hostint == ERROR)
-  { host = NULL;
+  { host = nullptr;
     soap->errnum = soap_errno;
   }
   SOAP_FREE(soap, addrcopy);  /*free() is placed after the error checking to assure that
@@ -3321,7 +3321,7 @@ again:
       soap_begin_send(soap);
       DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Connecting to proxy server\n"));
       sprintf(soap->tmpbuf, "CONNECT %s:%d HTTP/%s", host, port, soap->http_version);
-      if ((soap->error = soap->fposthdr(soap, soap->tmpbuf, NULL)))
+      if ((soap->error = soap->fposthdr(soap, soap->tmpbuf, nullptr)))
         return SOAP_INVALID_SOCKET;
 #ifndef WITH_LEAN
       if (soap->proxy_userid && soap->proxy_passwd && strlen(soap->proxy_userid) + strlen(soap->proxy_passwd) < 761)
@@ -3332,7 +3332,7 @@ again:
           return soap->error;
       }
 #endif
-      if ((soap->error = soap->fposthdr(soap, NULL, NULL))
+      if ((soap->error = soap->fposthdr(soap, nullptr, nullptr))
        || soap_flush(soap))
         return SOAP_INVALID_SOCKET;
       soap->omode = k;
@@ -3359,7 +3359,7 @@ again:
     { if (!strcmp(soap->session_host, host) && soap->session_port == port)
         SSL_set_session(soap->ssl, soap->session);
       SSL_SESSION_free(soap->session);
-      soap->session = NULL;
+      soap->session = nullptr;
     }
     soap->imode |= SOAP_ENC_SSL;
     soap->omode |= SOAP_ENC_SSL;
@@ -3396,7 +3396,7 @@ again:
           FD_ZERO(&fds);
           FD_SET((SOAP_SOCKET)soap->socket, &fds);
           for (;;)
-          { int r = select((SOAP_SOCKET)(soap->socket + 1), &fds, NULL, &fds, &timeout);
+          { int r = select((SOAP_SOCKET)(soap->socket + 1), &fds, nullptr, &fds, &timeout);
             if (r > 0)
 	      break;
             if (!r)
@@ -3764,7 +3764,7 @@ soap_accept(struct soap *soap)
       {
 #ifdef WITH_IPV6
 /* Use soap->host to store the numeric form of the remote host */
-        getnameinfo((struct sockaddr*)&soap->peer, n, soap->host, sizeof(soap->host), NULL, 0, NI_NUMERICHOST | NI_NUMERICSERV);
+        getnameinfo((struct sockaddr*)&soap->peer, n, soap->host, sizeof(soap->host), nullptr, 0, NI_NUMERICHOST | NI_NUMERICSERV);
         DBGLOG(TEST,SOAP_MESSAGE(fdebug, "Accept socket %d from %s\n", soap->socket, soap->host));
         soap->ip = 0; /* info stored in soap->peer and soap->host */
         soap->port = 0; /* info stored in soap->peer and soap->host */
@@ -3882,7 +3882,7 @@ tcp_disconnect(struct soap *soap)
     }
     DBGLOG(TEST, if (s) SOAP_MESSAGE(fdebug, "Shutdown failed: %d\n", SSL_get_error(soap->ssl, r)));
     SSL_free(soap->ssl);
-    soap->ssl = NULL;
+    soap->ssl = nullptr;
     if (s)
       return SOAP_SSL_ERROR;
     ERR_remove_state(0);
@@ -4085,7 +4085,7 @@ soap_pointer_enter(struct soap *soap, const void *p, const struct soap_array *a,
     h = soap_hash_ptr(a->__ptr);
   else
     h = soap_hash_ptr(p);
-  DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Pointer enter location=%p array=%p size=%d dim=%d type=%d id=%lu\n", p, a?a->__ptr:NULL, a?a->__size:0, n, type, soap->idnum+1));
+  DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Pointer enter location=%p array=%p size=%d dim=%d type=%d id=%lu\n", p, a?a->__ptr:nullptr, a?a->__size:0, n, type, soap->idnum+1));
   pp->next = soap->pht[h];
   pp->type = type;
   pp->mark1 = 0;
@@ -4269,7 +4269,7 @@ soap_begin_send(struct soap *soap)
     memcpy(soap->z_buf, "\37\213\10\0\0\0\0\0\0\377", 10);
     soap->d_stream.next_out = (Byte*)soap->z_buf + 10;
     soap->d_stream.avail_out = SOAP_BUFLEN - 10;
-    soap->z_crc = crc32(0L, NULL, 0);
+    soap->z_crc = crc32(0L, nullptr, 0);
     if (deflateInit2(&soap->d_stream, soap->z_level, Z_DEFLATED, -MAX_WBITS, 8, Z_DEFAULT_STRATEGY) != Z_OK)
 #else
     soap->d_stream.next_out = (Byte*)soap->z_buf;
@@ -4646,7 +4646,7 @@ static void
 soap_init_mht(struct soap *soap)
 { int i;
   for (i = 0; i < (int)SOAP_PTRHASH; i++)
-    soap->mht[i] = NULL;
+    soap->mht[i] = nullptr;
 }
 #endif
 
@@ -4663,7 +4663,7 @@ soap_free_mht(struct soap *soap)
         fprintf(stderr, "%s(%d): malloc() = %p not freed (memory leak or forgot to call soap_end()?)\n", mp->file, mp->line, mp->ptr);
       free(mp);
     }
-    soap->mht[i] = NULL;
+    soap->mht[i] = nullptr;
   }
 }
 #endif
@@ -5310,7 +5310,7 @@ soap_free(struct soap *soap)
 #ifdef WITH_FAST
   if (soap->labbuf)
     SOAP_FREE(soap, soap->labbuf);
-  soap->labbuf = NULL;
+  soap->labbuf = nullptr;
   soap->lablen = 0;
   soap->labidx = 0;
 #endif
@@ -5349,8 +5349,8 @@ static void
 soap_init_logs(struct soap *soap)
 { int i;
   for (i = 0; i < SOAP_MAXLOGS; i++)
-  { soap->logfile[i] = NULL;
-    soap->fdebug[i] = NULL;
+  { soap->logfile[i] = nullptr;
+    soap->fdebug[i] = nullptr;
   }
 }
 #endif
@@ -5372,7 +5372,7 @@ static void
 soap_close_logfile(struct soap *soap, int i)
 { if (soap->fdebug[i])
   { fclose(soap->fdebug[i]);
-    soap->fdebug[i] = NULL;
+    soap->fdebug[i] = nullptr;
   }
 }
 #endif
@@ -5393,7 +5393,7 @@ soap_close_logfiles(struct soap *soap)
 #ifdef SOAP_DEBUG
 static void
 soap_set_logfile(struct soap *soap, int i, const char *logfile)
-{ char *s = NULL;
+{ char *s = nullptr;
   soap_close_logfile(soap, i);
   if (soap->logfile[i])
     SOAP_FREE(soap, (void*)soap->logfile[i]);
@@ -5538,7 +5538,7 @@ soap_init(struct soap *soap)
 #ifndef WITH_IPV6
   soap->fresolve = tcp_gethost;
 #else
-  soap->fresolve = NULL;
+  soap->fresolve = nullptr;
 #endif
   soap->faccept = tcp_accept;
   soap->fopen = tcp_connect;
@@ -5549,9 +5549,9 @@ soap_init(struct soap *soap)
   soap->frecv = frecv;
   soap->fpoll = soap_poll;
 #else
-  soap->fopen = NULL;
-  soap->fclose = NULL;
-  soap->fpoll = NULL;
+  soap->fopen = nullptr;
+  soap->fclose = nullptr;
+  soap->fpoll = nullptr;
 #endif
 #ifndef WITH_LEANER
   soap->fprepareinit = nullptr;
@@ -5587,7 +5587,7 @@ soap_init(struct soap *soap)
   soap->accept_flags = 0;
   soap->ip = 0;
 #ifdef WITH_FAST
-  soap->labbuf = NULL;
+  soap->labbuf = nullptr;
   soap->lablen = 0;
   soap->labidx = 0;
 #endif
@@ -5595,7 +5595,7 @@ soap_init(struct soap *soap)
 #ifndef WITH_NONAMESPACES
   soap->namespaces = namespaces;
 #else
-  soap->namespaces = NULL;
+  soap->namespaces = nullptr;
 #endif
   soap->local_namespaces = nullptr;
   soap->nlist = nullptr;
@@ -5640,27 +5640,27 @@ soap_init(struct soap *soap)
 #ifdef WITH_OPENSSL
   soap->fsslauth = ssl_auth_init;
   soap->fsslverify = ssl_verify_callback;
-  soap->bio = NULL;
-  soap->ssl = NULL;
-  soap->ctx = NULL;
+  soap->bio = nullptr;
+  soap->ssl = nullptr;
+  soap->ctx = nullptr;
   soap->require_server_auth = 0;
   soap->require_client_auth = 0;
   soap->rsa = 0;
-  soap->keyfile = NULL;
-  soap->password = NULL;
-  soap->dhfile = NULL;
-  soap->cafile = NULL;
-  soap->capath = NULL;
-  soap->randfile = NULL;
-  soap->session = NULL;
+  soap->keyfile = nullptr;
+  soap->password = nullptr;
+  soap->dhfile = nullptr;
+  soap->cafile = nullptr;
+  soap->capath = nullptr;
+  soap->randfile = nullptr;
+  soap->session = nullptr;
 #endif
 #ifdef WITH_ZLIB
   soap->zlib_state = SOAP_ZLIB_NONE;
   soap->zlib_in = SOAP_ZLIB_NONE;
   soap->zlib_out = SOAP_ZLIB_NONE;
-  soap->d_stream.zalloc = NULL;
-  soap->d_stream.zfree = NULL;
-  soap->d_stream.opaque = NULL;
+  soap->d_stream.zalloc = nullptr;
+  soap->d_stream.zfree = nullptr;
+  soap->d_stream.opaque = nullptr;
   soap->z_level = 6;
 #endif
 #ifndef WITH_LEAN
@@ -5674,10 +5674,10 @@ soap_init(struct soap *soap)
   soap_init_logs(soap);
   soap_set_recv_logfile(soap, "RECV.log");
   soap_set_sent_logfile(soap, "SENT.log");
-  soap_set_test_logfile(soap, NULL);
+  soap_set_test_logfile(soap, nullptr);
 #endif
 #ifdef WMW_RPM_IO
-  soap->rpmreqid = NULL;
+  soap->rpmreqid = nullptr;
 #endif /* WMW_RPM_IO */
 #ifdef PALM
   palmNetLibOpen();
@@ -5874,15 +5874,15 @@ soap_element(struct soap *soap, const char *tag, int id, const char *type)
 #ifdef WITH_DOM
   if (soap->mode & SOAP_XML_DOM)
   { struct soap_dom_element *p, *e = (struct soap_dom_element*)soap_malloc(soap, sizeof(struct soap_dom_element));
-    e->next = NULL;
+    e->next = nullptr;
     e->prnt = soap->dom;
-    e->nstr = NULL;
+    e->nstr = nullptr;
     e->name = soap_strdup(soap, tag); /* check EOM? */
-    e->data = NULL;
+    e->data = nullptr;
     e->type = 0;
-    e->node = NULL;
-    e->elts = NULL;
-    e->atts = NULL;
+    e->node = nullptr;
+    e->elts = nullptr;
+    e->atts = nullptr;
     if (soap->dom)
     { p = soap->dom->elts;
       if (p)
@@ -5984,7 +5984,7 @@ SOAP_FMAC1
 char*
 SOAP_FMAC2
 soap_strrchr(const char *s, int t)
-{ char *r = NULL;
+{ char *r = nullptr;
   while (*s)
     if (*s++ == t)
       r = (char*)s - 1;
@@ -6132,10 +6132,10 @@ soap_element_start_end_out(struct soap *soap, const char *tag)
     { if (tp->visible)
       { struct soap_dom_attribute *a = (struct soap_dom_attribute*)soap_malloc(soap, sizeof(struct soap_dom_attribute));
 	a->next = soap->dom->atts;
-        a->nstr = NULL;
+        a->nstr = nullptr;
         a->name = soap_strdup(soap, tp->name); /* check EOM */
         a->data = soap_strdup(soap, tp->value); /* check EOM */
-        a->wide = NULL;
+        a->wide = nullptr;
 	soap->dom->atts = a;
         tp->visible = 0;
       }
@@ -6317,10 +6317,10 @@ soap_attribute(struct soap *soap, const char *name, const char *value)
   if ((soap->mode & SOAP_XML_DOM) && soap->dom)
   { struct soap_dom_attribute *a = (struct soap_dom_attribute*)soap_malloc(soap, sizeof(struct soap_dom_attribute));
     a->next = soap->dom->atts;
-    a->nstr = NULL;
+    a->nstr = nullptr;
     a->name = soap_strdup(soap, name); /* check EOM */
     a->data = soap_strdup(soap, value); /* check EOM */
-    a->wide = NULL;
+    a->wide = nullptr;
     soap->dom->atts = a;
     return SOAP_OK;
   }
@@ -6796,7 +6796,7 @@ soap_peek_element(struct soap *soap)
 	      return soap->error;
             soap->error = SOAP_OK;
 	    soap->labidx = soap->lablen;
-	    if (soap_append_lab(soap, NULL, 0))
+	    if (soap_append_lab(soap, nullptr, 0))
 	      return soap->error;
 	  }
 	  else
@@ -7058,21 +7058,21 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
     soap->labidx = 0;			/* use look-aside buffer */
 #else
     if (soap_new_block(soap))
-      return NULL;
+      return nullptr;
 #endif
     for (;;)
     {
 #ifdef WITH_FAST
       size_t k;
-      if (soap_append_lab(soap, NULL, 0))	/* allocate more space in look-aside buffer if necessary */
-        return NULL;
+      if (soap_append_lab(soap, nullptr, 0))	/* allocate more space in look-aside buffer if necessary */
+        return nullptr;
       s = soap->labbuf + soap->labidx;	/* space to populate */
       k = soap->lablen - soap->labidx;	/* number of bytes available */
       soap->labidx = soap->lablen;	/* claim this space */
 #else
       size_t k = SOAP_BLKLEN;
       if (!(s = (char*)soap_push_block(soap, k)))
-        return NULL;
+        return nullptr;
 #endif
       for (i = 0; i < k; i++)
       { if (m > 0)
@@ -7257,7 +7257,7 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
         if ((soap->mode & SOAP_XML_STRICT) && maxlen >= 0 && l > maxlen)
         { DBGLOG(TEST,SOAP_MESSAGE(fdebug, "String too long: maxlen=%ld\n", maxlen));
           soap->error = SOAP_LENGTH;
-          return NULL;
+          return nullptr;
         }
       }
     }
@@ -7273,8 +7273,8 @@ soap_string_in(struct soap *soap, int flag, long minlen, long maxlen)
   {
 #ifdef WITH_FAST
     size_t k;
-    if (soap_append_lab(soap, NULL, 0))	/* allocate more space in look-aside buffer if necessary */
-      return NULL;
+    if (soap_append_lab(soap, nullptr, 0))	/* allocate more space in look-aside buffer if necessary */
+      return nullptr;
     s = soap->labbuf + soap->labidx;	/* space to populate */
     k = soap->lablen - soap->labidx;	/* number of bytes available */
     soap->labidx = soap->lablen;	/* claim this space */
@@ -7468,7 +7468,7 @@ soap_wstring_out(struct soap *soap, const wchar_t *s, int flag)
   soap_wchar c;
 #ifdef WITH_DOM
   if ((soap->mode & SOAP_XML_DOM) && soap->dom)
-  { soap->dom->wide = NULL; /* soap_malloc() ??? */
+  { soap->dom->wide = nullptr; /* soap_malloc() ??? */
     return SOAP_OK;
   }
 #endif
@@ -10186,8 +10186,8 @@ soap_set_cookie(struct soap *soap, const char *name, const char *value, const ch
   if (!path)
     path = soap->cookie_path;
   if (!path)
-  { soap_set_receiver_error(soap, "Cookie path not set", NULL, SOAP_HTTP_ERROR);
-    return NULL;
+  { soap_set_receiver_error(soap, "Cookie path not set", nullptr, SOAP_HTTP_ERROR);
+    return nullptr;
   }
   if (*path == '/')
     path++;
@@ -10196,9 +10196,9 @@ soap_set_cookie(struct soap *soap, const char *name, const char *value, const ch
   { if ((q = (struct soap_cookie*)SOAP_MALLOC(soap, sizeof(struct soap_cookie))))
     { if ((q->name = (char*)SOAP_MALLOC(soap, strlen(name)+1)))
         strcpy(q->name, name);
-      q->value = NULL;
-      q->domain = NULL;
-      q->path = NULL;
+      q->value = nullptr;
+      q->domain = nullptr;
+      q->path = nullptr;
       q->expire = -1;
       q->version = 0;
       q->secure = 0;
@@ -10213,7 +10213,7 @@ soap_set_cookie(struct soap *soap, const char *name, const char *value, const ch
       else
       { SOAP_FREE(soap, q->name);
         SOAP_FREE(soap, q);
-        q = NULL;
+        q = nullptr;
       }
     }
   }
@@ -10222,15 +10222,15 @@ soap_set_cookie(struct soap *soap, const char *name, const char *value, const ch
   if (q)
   { if (q->value)
     { SOAP_FREE(soap, q->value);
-      q->value = NULL;
+      q->value = nullptr;
     }
     if (q->domain)
     { SOAP_FREE(soap, q->domain);
-      q->domain = NULL;
+      q->domain = nullptr;
     }
     if (q->path)
     { SOAP_FREE(soap, q->path);
-      q->path = NULL;
+      q->path = nullptr;
     }
     if (value && *value && (q->value = (char*)SOAP_MALLOC(soap, strlen(value)+1)))
       strcpy(q->value, value);
@@ -10253,13 +10253,13 @@ soap_clr_cookie(struct soap *soap, const char *name, const char *domain, const c
   if (!domain)
     domain = soap->cookie_domain;
   if (!domain)
-  { soap_set_receiver_error(soap, "Cookie domain not set", NULL, SOAP_HTTP_ERROR);
+  { soap_set_receiver_error(soap, "Cookie domain not set", nullptr, SOAP_HTTP_ERROR);
     return;
   }
   if (!path)
     path = soap->cookie_path;
   if (!path)
-  { soap_set_receiver_error(soap, "Cookie path not set", NULL, SOAP_HTTP_ERROR);
+  { soap_set_receiver_error(soap, "Cookie path not set", nullptr, SOAP_HTTP_ERROR);
     return;
   }
   if (*path == '/')
@@ -10287,7 +10287,7 @@ soap_cookie_value(struct soap *soap, const char *name, const char *domain, const
 { struct soap_cookie *p;
   if ((p = soap_cookie(soap, name, domain, path)))
     return p->value;
-  return NULL;
+  return nullptr;
 }
 
 /******************************************************************************/
@@ -10298,7 +10298,7 @@ soap_env_cookie_value(struct soap *soap, const char *name, const char *domain, c
 { struct soap_cookie *p;
   if ((p = soap_cookie(soap, name, domain, path)) && p->env)
     return p->value;
-  return NULL;
+  return nullptr;
 }
 
 /******************************************************************************/
@@ -10409,7 +10409,7 @@ SOAP_FMAC2
 soap_putcookies(struct soap *soap, const char *domain, const char *path, int secure)
 { struct soap_cookie **p, *q;
   unsigned int version = 0;
-  time_t now = time(NULL);
+  time_t now = time(nullptr);
   char *s, tmp[4096];
   p = &soap->cookies;
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Sending cookies for domain=%s path=%s\n", domain, path));
@@ -10470,13 +10470,13 @@ SOAP_FMAC1
 void
 SOAP_FMAC2
 soap_getcookies(struct soap *soap, const char *val)
-{ struct soap_cookie *p = NULL, *q;
+{ struct soap_cookie *p = nullptr, *q;
   const char *s;
   char *t, tmp[4096]; /* cookie size is up to 4096 bytes [RFC2109] */
-  char *domain = NULL;
-  char *path = NULL;
+  char *domain = nullptr;
+  char *path = nullptr;
   unsigned int version = 0;
-  time_t now = time(NULL);
+  time_t now = time(nullptr);
   if (!val)
     return;
   s = val;
@@ -10497,7 +10497,7 @@ soap_getcookies(struct soap *soap, const char *val)
           strcpy(t, tmp);
       }
       else
-        t = NULL;
+        t = nullptr;
       if (p)
       { if (p->path)
           SOAP_FREE(soap, p->path);
@@ -10516,7 +10516,7 @@ soap_getcookies(struct soap *soap, const char *val)
           strcpy(t, tmp);
       }
       else
-        t = NULL;
+        t = nullptr;
       if (p)
       { if (p->domain)
           SOAP_FREE(soap, p->domain);
@@ -10537,7 +10537,7 @@ soap_getcookies(struct soap *soap, const char *val)
           strcpy(p->path, tmp);
       }
       else
-        p->path = NULL;
+        p->path = nullptr;
     }
     else if (p && !soap_tag_cmp(tmp, "Domain"))
     { if (p->domain)
@@ -10548,7 +10548,7 @@ soap_getcookies(struct soap *soap, const char *val)
           strcpy(p->domain, tmp);
       }
       else
-        p->domain = NULL;
+        p->domain = nullptr;
     }
     else if (p && !soap_tag_cmp(tmp, "Version"))
     { s = soap_decode_val(tmp, sizeof(tmp), s);
@@ -10617,7 +10617,7 @@ soap_getcookies(struct soap *soap, const char *val)
           strcpy(p->value, tmp);
         }
         else
-          p->value = NULL;
+          p->value = nullptr;
         p->domain = domain;
         p->path = path;
         p->expire = 0;
@@ -10663,7 +10663,7 @@ soap_getenv_cookies(struct soap *soap)
   do
   { s = soap_decode_key(key, sizeof(key), s);
     s = soap_decode_val(val, sizeof(val), s);
-    p = soap_set_cookie(soap, key, val, NULL, NULL);
+    p = soap_set_cookie(soap, key, val, nullptr, nullptr);
     if (p)
       p->env = 1;
   } while (*s);
@@ -10699,7 +10699,7 @@ soap_copy_cookies(struct soap *soap)
     }
     q = &(*q)->next;
   }
-  *q = NULL;
+  *q = nullptr;
   return r;
 }
 
@@ -10842,7 +10842,7 @@ soap_begin_recv(struct soap *soap)
     soap->zlib_state = SOAP_ZLIB_INFLATE;
     soap->mode |= SOAP_ENC_ZLIB;
     soap->zlib_in = SOAP_ZLIB_GZIP;
-    soap->z_crc = crc32(0L, NULL, 0);
+    soap->z_crc = crc32(0L, nullptr, 0);
     DBGLOG(TEST, SOAP_MESSAGE(fdebug, "gzip initialized\n"));
     memcpy(soap->z_buf, soap->buf, SOAP_BUFLEN);
     /* should not chunk over plain transport, so why bother to check? */
@@ -10896,7 +10896,7 @@ soap_begin_recv(struct soap *soap)
         if (inflateInit2(&soap->d_stream, -MAX_WBITS) != Z_OK)
           return soap->error = SOAP_ZLIB_ERROR;
         soap->zlib_state = SOAP_ZLIB_INFLATE;
-        soap->z_crc = crc32(0L, NULL, 0);
+        soap->z_crc = crc32(0L, nullptr, 0);
         DBGLOG(TEST, SOAP_MESSAGE(fdebug, "gzip initialized\n"));
       }
       else
@@ -11867,7 +11867,7 @@ http_post(struct soap *soap, const char *endpoint, const char *host, int port, c
 #endif
 #ifdef WITH_COOKIES
 #ifdef WITH_OPENSSL
-  if (soap_putcookies(soap, host, path, soap->ssl != NULL))
+  if (soap_putcookies(soap, host, path, soap->ssl != nullptr))
     return soap->error;
 #else
   if (soap_putcookies(soap, host, path, 0))
@@ -12357,7 +12357,7 @@ soap_strerror(struct soap *soap)
 #ifndef WIN32
     return strerror(err);
 #else
-    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, 0, (LPTSTR)&soap->errorstr, sizeof(soap->errorstr), NULL);
+    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS, nullptr, err, 0, (LPTSTR)&soap->errorstr, sizeof(soap->errorstr), nullptr);
     return soap->errorstr;
 #endif
   }
diff --git a/tderesources/groupwise/soap/stdsoap2.h b/tderesources/groupwise/soap/stdsoap2.h
index 5ca669619..2b9f6101e 100644
--- a/tderesources/groupwise/soap/stdsoap2.h
+++ b/tderesources/groupwise/soap/stdsoap2.h
@@ -1035,7 +1035,7 @@ class soap_multipart_iterator
     { return *content; }
   soap_multipart_iterator &operator++()
     { content = soap_next_multipart(content); return *this; }
-  soap_multipart_iterator() : content(NULL)
+  soap_multipart_iterator() : content(nullptr)
     { }
   soap_multipart_iterator(struct soap_multipart *p) : content(p)
     { }
@@ -1059,7 +1059,7 @@ struct soap_dime
   soap_multipart_iterator begin()
     { soap_multipart_iterator iter(list); return iter; };
   soap_multipart_iterator end()
-    { soap_multipart_iterator iter(NULL); return iter; };
+    { soap_multipart_iterator iter(nullptr); return iter; };
 #endif
 };
 #endif
@@ -1074,7 +1074,7 @@ struct soap_mime
   soap_multipart_iterator begin()
     { soap_multipart_iterator iter(list); return iter; };
   soap_multipart_iterator end()
-    { soap_multipart_iterator iter(NULL); return iter; };
+    { soap_multipart_iterator iter(nullptr); return iter; };
 #endif
 };
 #endif
-- 
cgit v1.2.3

