From 73eaec15396038c8b9900ba8c031e1d148d7029d Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 8 Nov 2026 08:05:40 -0300 Subject: Replace NULL pointer constants in crypto protocols MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- certmanager/certmanager.cpp | 2 +- certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp | 2 +- certmanager/lib/cryptplug.cpp | 28 ++++++++++++------------ certmanager/lib/cryptplugwrapper.cpp | 4 ++-- certmanager/lib/kleo/dn.cpp | 14 ++++++------ libkpimexchange/core/utils.cpp | 4 ++-- tdeioslave/imap4/imap4.cpp | 6 ++--- tdeioslave/imap4/imap4.h | 4 ++-- tdeioslave/imap4/imapparser.cpp | 16 +++++++------- tdeioslave/imap4/imapparser.h | 4 ++-- tdeioslave/imap4/mimehdrline.cpp | 6 ++--- tdeioslave/imap4/mimeheader.cpp | 4 ++-- tdeioslave/imap4/mimeheader.h | 2 +- tdeioslave/imap4/mimeio.cpp | 2 +- tdeioslave/imap4/rfcdecoder.cpp | 4 ++-- tdeioslave/sieve/sieve.cpp | 28 ++++++++++++------------ 16 files changed, 65 insertions(+), 65 deletions(-) diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index f74673912..7b726e233 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -1334,7 +1334,7 @@ void CertManager::startSecretKeyExport( const TQString & fingerprint ) { "ibm850", "euc-jp", "big5", - NULL + nullptr }; TQStringList charsetList; for ( const char** c = charsets; *c; ++c ) { diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp index 5ab837152..d22843649 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp @@ -76,7 +76,7 @@ static void parse_user_id (char *src, char **name, char **email, char **comment, char *tail) { - const char *start = NULL; + const char *start = nullptr; int in_name = 0; int in_email = 0; int in_comment = 0; diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp index 24ded7959..a9fbc1692 100644 --- a/certmanager/lib/cryptplug.cpp +++ b/certmanager/lib/cryptplug.cpp @@ -387,13 +387,13 @@ trim_trailing_spaces( char *string ) { char *p, *mark; - for( mark = NULL, p = string; *p; p++ ) { + for( mark = nullptr, p = string; *p; p++ ) { if( isspace( *p ) ) { if( !mark ) mark = p; } else - mark = NULL; + mark = nullptr; } if( mark ) *mark = '\0' ; @@ -415,10 +415,10 @@ parse_dn_part (CryptPlug::DnPair *array, const unsigned char *string) for (s = string+1; *s && *s != '='; s++) ; if (!*s) - return NULL; /* error */ + return nullptr; /* error */ n = s - string; if (!n) - return NULL; /* empty key */ + return nullptr; /* empty key */ p = (char*)xmalloc (n+1); @@ -442,7 +442,7 @@ parse_dn_part (CryptPlug::DnPair *array, const unsigned char *string) s++; n = s - string; if (!n || (n & 1)) - return NULL; /* empty or odd number of digits */ + return nullptr; /* empty or odd number of digits */ n /= 2; array->value = p = (char*)xmalloc (n+1); @@ -468,10 +468,10 @@ parse_dn_part (CryptPlug::DnPair *array, const unsigned char *string) n++; } else - return NULL; /* invalid escape sequence */ + return nullptr; /* invalid escape sequence */ } else if (*s == '\"') - return NULL; /* invalid encoding */ + return nullptr; /* invalid encoding */ else if (*s == ',' || *s == '=' || *s == '+' || *s == '<' || *s == '>' || *s == '#' || *s == ';' ) break; @@ -514,7 +514,7 @@ parse_dn (const unsigned char *string) size_t arrayidx, arraysize; if( !string ) - return NULL; + return nullptr; arraysize = 7; /* C,ST,L,O,OU,CN,email */ arrayidx = 0; @@ -541,8 +541,8 @@ parse_dn (const unsigned char *string) free (array); array = a2; } - array[arrayidx].key = NULL; - array[arrayidx].value = NULL; + array[arrayidx].key = nullptr; + array[arrayidx].value = nullptr; string = parse_dn_part (array+arrayidx, string); arrayidx++; if (!string) @@ -554,8 +554,8 @@ parse_dn (const unsigned char *string) if (*string) string++; } - array[arrayidx].key = NULL; - array[arrayidx].value = NULL; + array[arrayidx].key = nullptr; + array[arrayidx].value = nullptr; return array; failure: @@ -565,7 +565,7 @@ parse_dn (const unsigned char *string) free (array[i].value); } free (array); - return NULL; + return nullptr; } static void @@ -617,7 +617,7 @@ reorder_dn( struct CryptPlug::DnPair *dn, "OU", "O", "C", - NULL + nullptr }; const char** stdpart = attrOrder ? ((const char**)attrOrder) : defaultpart; int any=0, any2=0, found_X_=0, i; diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp index f1246f39c..6303708f1 100644 --- a/certmanager/lib/cryptplugwrapper.cpp +++ b/certmanager/lib/cryptplugwrapper.cpp @@ -176,7 +176,7 @@ public: strcpy( _attrOrderChar[ i ], (*itOrder).latin1() ); ++i; } - _attrOrderChar[ i ] = NULL; + _attrOrderChar[ i ] = nullptr; } } ~DNBeautifier() @@ -397,7 +397,7 @@ CryptPlugWrapper::Config::Config( gpgme_protocol_t proto ) certificateInChainExpiryNearWarning = true; certificateInChainExpiryNearWarningInterval = NEAR_EXPIRY; receiverEmailAddressNotInCertificateWarning = true; - libVersion = gpgme_check_version (NULL); + libVersion = gpgme_check_version (nullptr); } CryptPlugWrapper::Config::~Config() { diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp index d6db7d183..ec8e255da 100644 --- a/certmanager/lib/kleo/dn.cpp +++ b/certmanager/lib/kleo/dn.cpp @@ -107,13 +107,13 @@ trim_trailing_spaces( char *string ) { char *p, *mark; - for( mark = NULL, p = string; *p; p++ ) { + for( mark = nullptr, p = string; *p; p++ ) { if( isspace( *p ) ) { if( !mark ) mark = p; } else - mark = NULL; + mark = nullptr; } if( mark ) *mark = '\0' ; @@ -135,10 +135,10 @@ parse_dn_part (DnPair *array, const unsigned char *string) for (s = string+1; *s && *s != '='; s++) ; if (!*s) - return NULL; /* error */ + return nullptr; /* error */ n = s - string; if (!n) - return NULL; /* empty key */ + return nullptr; /* empty key */ p = (char*)malloc (n+1); @@ -162,7 +162,7 @@ parse_dn_part (DnPair *array, const unsigned char *string) s++; n = s - string; if (!n || (n & 1)) - return NULL; /* empty or odd number of digits */ + return nullptr; /* empty or odd number of digits */ n /= 2; array->value = p = (char*)malloc (n+1); @@ -188,10 +188,10 @@ parse_dn_part (DnPair *array, const unsigned char *string) n++; } else - return NULL; /* invalid escape sequence */ + return nullptr; /* invalid escape sequence */ } else if (*s == '\"') - return NULL; /* invalid encoding */ + return nullptr; /* invalid encoding */ else if (*s == ',' || *s == '=' || *s == '+' || *s == '<' || *s == '>' || *s == '#' || *s == ';' ) break; diff --git a/libkpimexchange/core/utils.cpp b/libkpimexchange/core/utils.cpp index 4f0568c8c..fd35dc996 100644 --- a/libkpimexchange/core/utils.cpp +++ b/libkpimexchange/core/utils.cpp @@ -56,7 +56,7 @@ TQDateTime utcAsZone( const TQDateTime& utc, const TQString& timeZoneId ) TQDateTime epoch; epoch.setTime_t( 0 ); time_t v = epoch.secsTo( utc ); - struct icaltimetype tt = icaltime_from_timet_with_zone( v, 0, NULL ); + struct icaltimetype tt = icaltime_from_timet_with_zone( v, 0, nullptr ); int offset = icaltimezone_get_utc_offset( icaltimezone_get_builtin_timezone( timeZoneId.latin1() ), &tt, &daylight ); @@ -72,7 +72,7 @@ TQDateTime zoneAsUtc( const TQDateTime& zone, const TQString& timeZoneId ) TQDateTime epoch; epoch.setTime_t( 0 ); time_t v = epoch.secsTo( zone ); - struct icaltimetype tt = icaltime_from_timet_with_zone( v, 0, NULL ); + struct icaltimetype tt = icaltime_from_timet_with_zone( v, 0, nullptr ); int offset = icaltimezone_get_utc_offset( icaltimezone_get_builtin_timezone( timeZoneId.latin1() ), &tt, &daylight ); diff --git a/tdeioslave/imap4/imap4.cpp b/tdeioslave/imap4/imap4.cpp index 0e325ff90..ff989cc21 100644 --- a/tdeioslave/imap4/imap4.cpp +++ b/tdeioslave/imap4/imap4.cpp @@ -120,7 +120,7 @@ kdemain (int argc, char **argv) } #ifdef HAVE_LIBSASL2 - if ( sasl_client_init( NULL ) != SASL_OK ) { + if ( sasl_client_init( nullptr ) != SASL_OK ) { fprintf(stderr, "SASL library initialization failed!\n"); ::exit (-1); } @@ -215,7 +215,7 @@ IMAP4Protocol::get (const KURL & _url) } mProcessedSize = 0; - imapCommand *cmd = NULL; + imapCommand *cmd = nullptr; if (!assureBox (aBox, true)) return; #ifdef USE_VALIDITY @@ -513,7 +513,7 @@ IMAP4Protocol::listDir (const KURL & _url) query = query.right (query.length () - 1); if (!query.isEmpty()) { - imapCommand *cmd = NULL; + imapCommand *cmd = nullptr; if (!assureBox (myBox, true)) return; diff --git a/tdeioslave/imap4/imap4.h b/tdeioslave/imap4/imap4.h index e57300e4e..f55b82f5f 100644 --- a/tdeioslave/imap4/imap4.h +++ b/tdeioslave/imap4/imap4.h @@ -155,7 +155,7 @@ protected: { outputLine (_str.latin1 (), _str.length()); } - void doListEntry (const KURL & _url, int stretch, imapCache * cache = NULL, + void doListEntry (const KURL & _url, int stretch, imapCache * cache = nullptr, bool withFlags = false, bool withSubject = false); /** @@ -183,7 +183,7 @@ private: // This method behaves like the above method but takes an already encoded url, // so you don't have to call KURL::url() for every mail. - void doListEntry (const TQString & encodedUrl, int stretch, imapCache * cache = NULL, + void doListEntry (const TQString & encodedUrl, int stretch, imapCache * cache = nullptr, bool withFlags = false, bool withSubject = false); TQString myHost, myUser, myPass, myAuth, myTLS; diff --git a/tdeioslave/imap4/imapparser.cpp b/tdeioslave/imap4/imapparser.cpp index bdb733f3a..718f28f27 100644 --- a/tdeioslave/imap4/imapparser.cpp +++ b/tdeioslave/imap4/imapparser.cpp @@ -60,14 +60,14 @@ extern "C" { #ifdef HAVE_LIBSASL2 static sasl_callback_t callbacks[] = { - { SASL_CB_ECHOPROMPT, NULL, NULL }, - { SASL_CB_NOECHOPROMPT, NULL, NULL }, - { SASL_CB_GETREALM, NULL, NULL }, - { SASL_CB_USER, NULL, NULL }, - { SASL_CB_AUTHNAME, NULL, NULL }, - { SASL_CB_PASS, NULL, NULL }, - { SASL_CB_CANON_USER, NULL, NULL }, - { SASL_CB_LIST_END, NULL, NULL } + { SASL_CB_ECHOPROMPT, nullptr, nullptr }, + { SASL_CB_NOECHOPROMPT, nullptr, nullptr }, + { SASL_CB_GETREALM, nullptr, nullptr }, + { SASL_CB_USER, nullptr, nullptr }, + { SASL_CB_AUTHNAME, nullptr, nullptr }, + { SASL_CB_PASS, nullptr, nullptr }, + { SASL_CB_CANON_USER, nullptr, nullptr }, + { SASL_CB_LIST_END, nullptr, nullptr } }; #endif diff --git a/tdeioslave/imap4/imapparser.h b/tdeioslave/imap4/imapparser.h index 24e4747a4..e17159224 100644 --- a/tdeioslave/imap4/imapparser.h +++ b/tdeioslave/imap4/imapparser.h @@ -114,7 +114,7 @@ class imapCache public: imapCache () { - myHeader = NULL; + myHeader = nullptr; mySize = 0; myFlags = 0; myUid = 0; @@ -172,7 +172,7 @@ public: void clear() { if (myHeader) delete myHeader; - myHeader = NULL; + myHeader = nullptr; mySize = 0; myFlags = 0; myDate = TQCString(); diff --git a/tdeioslave/imap4/mimehdrline.cpp b/tdeioslave/imap4/mimehdrline.cpp index 591d33863..f5cd62310 100644 --- a/tdeioslave/imap4/mimehdrline.cpp +++ b/tdeioslave/imap4/mimehdrline.cpp @@ -36,7 +36,7 @@ const char *months[] = { }; mimeHdrLine::mimeHdrLine (): -mimeValue ((const char *) NULL), mimeLabel ((const char *) NULL) +mimeValue ((const char *) nullptr), mimeLabel ((const char *) nullptr) { } @@ -96,8 +96,8 @@ mimeHdrLine::setStr (const char *inCStr) int retVal = 0; char *aCStr = (char *) inCStr; // char *begin = aCStr; - mimeLabel = TQCString ((const char *) NULL); - mimeValue = TQCString ((const char *) NULL); + mimeLabel = TQCString ((const char *) nullptr); + mimeValue = TQCString ((const char *) nullptr); if (aCStr) { diff --git a/tdeioslave/imap4/mimeheader.cpp b/tdeioslave/imap4/mimeheader.cpp index c273e6e6f..9ce3b032b 100644 --- a/tdeioslave/imap4/mimeheader.cpp +++ b/tdeioslave/imap4/mimeheader.cpp @@ -40,7 +40,7 @@ typeList (17, false), dispositionList (17, false) nestedParts.setAutoDelete (true); typeList.setAutoDelete (true); dispositionList.setAutoDelete (true); - nestedMessage = NULL; + nestedMessage = nullptr; contentLength = 0; contentType = "application/octet-stream"; } @@ -573,7 +573,7 @@ mimeHeader::parseHeader (mimeIO & useIO) mbox = true; first = false; } - inputStr = (const char *) NULL; + inputStr = (const char *) nullptr; } kdDebug(7116) << "mimeHeader::parseHeader - finished parsing" << endl; diff --git a/tdeioslave/imap4/mimeheader.h b/tdeioslave/imap4/mimeheader.h index bc2fd2bcd..67985d4b3 100644 --- a/tdeioslave/imap4/mimeheader.h +++ b/tdeioslave/imap4/mimeheader.h @@ -216,7 +216,7 @@ public: { return nestedParts.count (); } - mimeHeader *bodyPart (int which, mimeHeader ** ret = NULL) + mimeHeader *bodyPart (int which, mimeHeader ** ret = nullptr) { if (ret) (*ret) = nestedParts.at (which); diff --git a/tdeioslave/imap4/mimeio.cpp b/tdeioslave/imap4/mimeio.cpp index a3315c268..7bb9e5d81 100644 --- a/tdeioslave/imap4/mimeio.cpp +++ b/tdeioslave/imap4/mimeio.cpp @@ -35,7 +35,7 @@ mimeIO::inputLine (TQCString & aLine) { char input; - aLine = (const char *) NULL; + aLine = (const char *) nullptr; while (inputChar (input)) { aLine += input; diff --git a/tdeioslave/imap4/rfcdecoder.cpp b/tdeioslave/imap4/rfcdecoder.cpp index a82ebcd28..2a64f0d66 100644 --- a/tdeioslave/imap4/rfcdecoder.cpp +++ b/tdeioslave/imap4/rfcdecoder.cpp @@ -309,7 +309,7 @@ TQTextCodec * rfcDecoder::codecForName (const TQString & _str) { if (_str.isEmpty ()) - return NULL; + return nullptr; return TQTextCodec::codecForName (_str.lower (). replace ("windows", "cp").latin1 ()); } @@ -343,7 +343,7 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset, TQCString aStr = _str.ascii (); // TQString.length() means Unicode chars TQCString result; - char *pos, *beg, *end, *mid = NULL; + char *pos, *beg, *end, *mid = nullptr; TQCString str; char encoding = 0, ch; bool valid; diff --git a/tdeioslave/sieve/sieve.cpp b/tdeioslave/sieve/sieve.cpp index 4a590d1d9..85704bfe6 100644 --- a/tdeioslave/sieve/sieve.cpp +++ b/tdeioslave/sieve/sieve.cpp @@ -65,14 +65,14 @@ static inline #define SIEVE_DEFAULT_PORT 2000 static sasl_callback_t callbacks[] = { - { SASL_CB_ECHOPROMPT, NULL, NULL }, - { SASL_CB_NOECHOPROMPT, NULL, NULL }, - { SASL_CB_GETREALM, NULL, NULL }, - { SASL_CB_USER, NULL, NULL }, - { SASL_CB_AUTHNAME, NULL, NULL }, - { SASL_CB_PASS, NULL, NULL }, - { SASL_CB_CANON_USER, NULL, NULL }, - { SASL_CB_LIST_END, NULL, NULL } + { SASL_CB_ECHOPROMPT, nullptr, nullptr }, + { SASL_CB_NOECHOPROMPT, nullptr, nullptr }, + { SASL_CB_GETREALM, nullptr, nullptr }, + { SASL_CB_USER, nullptr, nullptr }, + { SASL_CB_AUTHNAME, nullptr, nullptr }, + { SASL_CB_PASS, nullptr, nullptr }, + { SASL_CB_CANON_USER, nullptr, nullptr }, + { SASL_CB_LIST_END, nullptr, nullptr } }; static const unsigned int SIEVE_DEFAULT_RECIEVE_BUFFER = 512; @@ -91,7 +91,7 @@ extern "C" exit(-1); } - if ( sasl_client_init( NULL ) != SASL_OK ) { + if ( sasl_client_init( nullptr ) != SASL_OK ) { fprintf(stderr, "SASL library initialization failed!\n"); ::exit (-1); } @@ -1008,7 +1008,7 @@ bool tdeio_sieveProtocol::saslInteract( void *in, AuthInfo &ai ) interact->len = strlen( (const char *) interact->result ); break; default: - interact->result = NULL; interact->len = 0; + interact->result = nullptr; interact->len = 0; break; } interact++; @@ -1022,11 +1022,11 @@ bool tdeio_sieveProtocol::saslInteract( void *in, AuthInfo &ai ) bool tdeio_sieveProtocol::authenticate() { int result; - sasl_conn_t *conn = NULL; - sasl_interact_t *client_interact = NULL; - const char *out = NULL; + sasl_conn_t *conn = nullptr; + sasl_interact_t *client_interact = nullptr; + const char *out = nullptr; uint outlen; - const char *mechusing = NULL; + const char *mechusing = nullptr; TQByteArray challenge, tmp; /* Retrieve authentication details from user. -- cgit v1.2.3