From 6edcf7a2825b6654a5d5a14a1d97e891250a97bf Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:49:39 -0300 Subject: Replace NULL pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- src/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp | 32 +-- src/kxsldbgpart/libxsldbg/arraylist.cpp | 6 +- src/kxsldbgpart/libxsldbg/breakpoint.cpp | 24 +-- src/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp | 60 +++--- src/kxsldbgpart/libxsldbg/callstack.cpp | 36 ++-- src/kxsldbgpart/libxsldbg/debug.cpp | 6 +- src/kxsldbgpart/libxsldbg/debugXSL.cpp | 120 ++++++------ src/kxsldbgpart/libxsldbg/file_cmds.cpp | 2 +- src/kxsldbgpart/libxsldbg/files.cpp | 100 +++++----- src/kxsldbgpart/libxsldbg/files_unix.cpp | 12 +- src/kxsldbgpart/libxsldbg/help_unix.cpp | 2 +- src/kxsldbgpart/libxsldbg/nodeview_cmds.cpp | 38 ++-- src/kxsldbgpart/libxsldbg/options.cpp | 42 ++-- src/kxsldbgpart/libxsldbg/options_unix.cpp | 2 +- src/kxsldbgpart/libxsldbg/os_cmds.cpp | 2 +- src/kxsldbgpart/libxsldbg/param_cmds.cpp | 8 +- src/kxsldbgpart/libxsldbg/search.cpp | 257 ++++++++++--------------- src/kxsldbgpart/libxsldbg/search_cmds.cpp | 8 +- src/kxsldbgpart/libxsldbg/template_cmds.cpp | 14 +- src/kxsldbgpart/libxsldbg/utils.cpp | 4 +- src/kxsldbgpart/libxsldbg/variable_cmds.cpp | 14 +- src/kxsldbgpart/libxsldbg/xsldbg.cpp | 122 ++++++------ src/kxsldbgpart/libxsldbg/xsldbgthread.cpp | 4 +- src/xsldbgmain.cpp | 8 +- 24 files changed, 430 insertions(+), 493 deletions(-) diff --git a/src/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp b/src/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp index d717a1f..58b1614 100644 --- a/src/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp +++ b/src/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp @@ -51,7 +51,7 @@ pthread_t mythread; /* The reader for stdout */ pthread_t stdoutReaderThread; -FILE *stdoutIO = NULL; +FILE *stdoutIO = nullptr; /* ----------------------------------------------- @@ -93,7 +93,7 @@ xsldbgThreadInit(void) /* create the thread */ - if (pthread_create(&mythread, NULL, xsldbgThreadMain, NULL) != EAGAIN) { + if (pthread_create(&mythread, nullptr, xsldbgThreadMain, nullptr) != EAGAIN) { int counter; for (counter = 0; counter < 11; counter++){ if (getThreadStatus() != XSLDBG_MSG_THREAD_INIT) @@ -194,10 +194,10 @@ qtXslDbgShellReadline(xmlChar * prompt) #else char line_read[DEBUG_BUFFER_SIZE]; - if (prompt != NULL) + if (prompt) xsltGenericError(xsltGenericErrorContext, "%s", prompt); if (!fgets(line_read, DEBUG_BUFFER_SIZE - 1, stdin)) - return (NULL); + return (nullptr); line_read[DEBUG_BUFFER_SIZE - 1] = 0; /* if only is pressed then try last saved command line */ if ((strlen(line_read) == 0) || (line_read[0] == '\n')) { @@ -212,7 +212,7 @@ qtXslDbgShellReadline(xmlChar * prompt) else{ setInputStatus(XSLDBG_MSG_AWAITING_INPUT); - notifyXsldbgApp(XSLDBG_MSG_AWAITING_INPUT, NULL); + notifyXsldbgApp(XSLDBG_MSG_AWAITING_INPUT, nullptr); while (getInputReady() == 0){ usleep(10000); @@ -220,7 +220,7 @@ qtXslDbgShellReadline(xmlChar * prompt) if (getThreadStatus() == XSLDBG_MSG_THREAD_STOP){ fprintf(stderr, "About to stop thread\n"); xslDebugStatus = DEBUG_QUIT; - return NULL; + return nullptr; } } @@ -230,7 +230,7 @@ qtXslDbgShellReadline(xmlChar * prompt) notifyXsldbgApp(XSLDBG_MSG_READ_INPUT, inputReadBuff); return (xmlChar*)xmlMemStrdup(inputReadBuff); }else{ - return NULL; + return nullptr; } } } @@ -238,7 +238,7 @@ qtXslDbgShellReadline(xmlChar * prompt) xsldbgErrorMsg msg; xsldbgErrorMsgPtr msgPtr = &msg; -xmlChar *msgText = NULL; +xmlChar *msgText = nullptr; int qtNotifyStateXsldbgApp(XsldbgMessageEnum type, int commandId, XsldbgCommandStateEnum commandState, const char *text) @@ -247,20 +247,20 @@ int qtNotifyStateXsldbgApp(XsldbgMessageEnum type, int commandId, msg.type = type; msg.commandId = commandId; msg.commandState = commandState; - if (text != NULL) + if (text) { msg.text = (xmlChar*)xmlMemStrdup(text); - if (msg.text == NULL) + if (!msg.text) return result; /* out of memory */ } else - msg.text = NULL; + msg.text = nullptr; notifyXsldbgApp(XSLDBG_MSG_PROCESSING_RESULT, msgPtr); - if (msg.text != NULL) + if (msg.text) { xmlFree(msg.text); - msg.text = NULL; + msg.text = nullptr; } result = 1; @@ -287,7 +287,7 @@ xsldbgThreadMain(void *) if (getThreadStatus() != XSLDBG_MSG_THREAD_INIT){ fprintf(stderr, "xsldbg thread is not ready to be started. Or one is already running.\n"); - return NULL; /* we can't start more than one thread of xsldbg */ + return nullptr; /* we can't start more than one thread of xsldbg */ } // defaultArgv[0] = xmlMemStrdup("xsldbg"); @@ -320,8 +320,8 @@ xsldbgThreadMain(void *) setThreadStatus(XSLDBG_MSG_THREAD_DEAD); setInputStatus(XSLDBG_MSG_PROCESSING_INPUT); - notifyXsldbgApp(XSLDBG_MSG_THREAD_DEAD, NULL); - return NULL; + notifyXsldbgApp(XSLDBG_MSG_THREAD_DEAD, nullptr); + return nullptr; } diff --git a/src/kxsldbgpart/libxsldbg/arraylist.cpp b/src/kxsldbgpart/libxsldbg/arraylist.cpp index a9de14f..30b5bb5 100644 --- a/src/kxsldbgpart/libxsldbg/arraylist.cpp +++ b/src/kxsldbgpart/libxsldbg/arraylist.cpp @@ -19,7 +19,7 @@ #include "arraylist.h" #include -#ifndef NULL +#ifndef nullptr #define NULL 0 #endif @@ -36,7 +36,7 @@ arrayListPtr arrayListNew(int initialSize, freeItemFunc deleteFunction) { - arrayListPtr list = NULL; + arrayListPtr list = nullptr; if (initialSize <= 0) { #ifdef WITH_XSLDBG_DEBUG_PROCESS @@ -231,7 +231,7 @@ arrayListDelete(arrayListPtr list, int position) void * arrayListGet(arrayListPtr list, int position) { - void *result = NULL; + void *result = nullptr; if (list && (position >= 0) && (position < list->count)) { result = list->data[position]; diff --git a/src/kxsldbgpart/libxsldbg/breakpoint.cpp b/src/kxsldbgpart/libxsldbg/breakpoint.cpp index 56a3ad2..0a37480 100644 --- a/src/kxsldbgpart/libxsldbg/breakpoint.cpp +++ b/src/kxsldbgpart/libxsldbg/breakpoint.cpp @@ -74,7 +74,7 @@ int breakPointCounter = 0; /* What is the current breakpoint is only valid up to the start of xsldbg command prompt. ie don't use it after deletion of breakpoints */ -breakPointPtr activeBreakPointItem = NULL; +breakPointPtr activeBreakPointItem = nullptr; /** @@ -185,7 +185,7 @@ breakPointGetLineNoHash(long lineNo) xsltGenericError(xsltGenericErrorContext, "Error: Breakpoints structures not initialized\n"); #endif - return NULL; + return nullptr; } else return (xmlHashTablePtr) arrayListGet(breakList, lineNo); } @@ -231,7 +231,7 @@ breakPointFree(void) { if (breakList) arrayListFree(breakList); - breakList = NULL; + breakList = nullptr; } @@ -263,10 +263,10 @@ breakPointItemNew(void) breakPointPtr breakPtr = (breakPointPtr) xmlMalloc(sizeof(breakPoint)); if (breakPtr) { - breakPtr->url = NULL; + breakPtr->url = nullptr; breakPtr->lineNo = -1; - breakPtr->templateName = NULL; - breakPtr->modeName = NULL; + breakPtr->templateName = nullptr; + breakPtr->modeName = nullptr; breakPtr->flags = BREAKPOINT_ENABLED; breakPtr->id = ++breakPointCounter; breakPtr->type = DEBUG_BREAK_SOURCE; @@ -317,7 +317,7 @@ breakPointPtr breakPointActiveBreakPoint(void) { /* This function is depreciated */ - return NULL; /* activeBreakPointItem; */ + return nullptr; /* activeBreakPointItem; */ } @@ -363,7 +363,7 @@ breakPointAdd(const xmlChar * url, long lineNumber, BreakPointTypeEnum type) { int result = 0, breakPointType = type; - xmlHashTablePtr breakPointHash = NULL; /* hash of breakPoints */ + xmlHashTablePtr breakPointHash = nullptr; /* hash of breakPoints */ breakPointPtr breakPtr; if (!breakList) { @@ -400,12 +400,12 @@ breakPointAdd(const xmlChar * url, long lineNumber, breakPtr->templateName = xmlStrdup( templateName); else - breakPtr->templateName = NULL; + breakPtr->templateName = nullptr; if (modeName) breakPtr->modeName = xmlStrdup(modeName); else - breakPtr->modeName = NULL; + breakPtr->modeName = nullptr; breakPtr->type = BreakPointTypeEnum(breakPointType); /* add new breakPoint to the right hash table */ @@ -596,7 +596,7 @@ breakPointPtr breakPointGet(const xmlChar * url, long lineNumber) { xmlHashTablePtr breakHash = breakPointGetLineNoHash(lineNumber); - breakPointPtr breakPtr = NULL; + breakPointPtr breakPtr = nullptr; if (!breakHash || !url) return breakPtr; @@ -666,7 +666,7 @@ breakPointIsPresent(const xmlChar * url, long lineNumber) if (!url || (lineNumber == -1)) return result; - result = (breakPointGet(url, lineNumber) != NULL); + result = (breakPointGet(url, lineNumber) != nullptr); return result; } diff --git a/src/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp b/src/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp index a757c14..8396ae9 100644 --- a/src/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp +++ b/src/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp @@ -145,7 +145,7 @@ validateSource(xmlChar ** url, long *lineNo) int result = 0, type; searchInfoPtr searchInf; - nodeSearchDataPtr searchData = NULL; + nodeSearchDataPtr searchData = nullptr; if (!filesGetStylesheet()) { xsldbgGenericErrorFunc(i18n("Error: Stylesheet is not valid or file is not loaded.\n")); @@ -165,7 +165,7 @@ validateSource(xmlChar ** url, long *lineNo) if (searchInf && searchInf->data) { type = DEBUG_BREAK_SOURCE; searchData = (nodeSearchDataPtr) searchInf->data; - if (lineNo != NULL) + if (lineNo) searchData->lineNo = *lineNo; searchData->nameInput = (xmlChar *) xmlMemStrdup((char *) *url); guessStylesheetName(searchInf); @@ -180,7 +180,7 @@ validateSource(xmlChar ** url, long *lineNo) searchData->url = (xmlChar *) xmlMemStrdup((char *) searchData->guessedNameMatch); - if (lineNo != NULL) { + if (lineNo) { /* now to check the line number */ if (searchData->node) { searchInf->found = 0; @@ -241,7 +241,7 @@ validateData(xmlChar ** url, long *lineNo) { int result = 0; searchInfoPtr searchInf; - nodeSearchDataPtr searchData = NULL; + nodeSearchDataPtr searchData = nullptr; char *lastSlash; if (!filesGetMainDoc()) { @@ -264,7 +264,7 @@ validateData(xmlChar ** url, long *lineNo) /* Try to verify that the line number is valid. First try an absolute name match */ searchData = (nodeSearchDataPtr) searchInf->data; - if (lineNo != NULL) + if (lineNo) searchData->lineNo = *lineNo; else searchData->lineNo = -1; @@ -338,13 +338,13 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, { int result = 0; long lineNo = -1; - xmlChar *url = NULL; + xmlChar *url = nullptr; int orphanedBreakPoint = 0; breakPointPtr breakPtr; static const char *errorPrompt = I18N_NOOP("Failed to add breakpoint."); - if (style == NULL) { + if (!style) { style = filesGetStylesheet(); } if (!style || !filesGetMainDoc()) { @@ -394,22 +394,22 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, if (filesIsSourceFile(url)) { if (validateSource(&url, &lineNo)) result = - breakPointAdd(url, lineNo, NULL, NULL, + breakPointAdd(url, lineNo, nullptr, nullptr, DEBUG_BREAK_SOURCE); } else { if (validateData(&url, &lineNo)) result = - breakPointAdd(url, lineNo, NULL, NULL, + breakPointAdd(url, lineNo, nullptr, nullptr, DEBUG_BREAK_DATA); } }else{ if (filesIsSourceFile(url)) { result = - breakPointAdd(url, lineNo, NULL, NULL, + breakPointAdd(url, lineNo, nullptr, nullptr, DEBUG_BREAK_SOURCE); }else{ result = - breakPointAdd(url, lineNo, NULL, NULL, + breakPointAdd(url, lineNo, nullptr, nullptr, DEBUG_BREAK_DATA); } breakPtr = breakPointGet(url, lineNo); @@ -427,9 +427,9 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, } else { /* add breakpoint at specified template names */ xmlChar *opts[2]; - xmlChar *name = NULL, *nameURI = NULL, *mode = NULL, *modeURI = NULL; - xmlChar *templateName = NULL, *modeName = NULL; - xmlChar *tempUrl = NULL; /* we must use a non-const xmlChar * + xmlChar *name = nullptr, *nameURI = nullptr, *mode = nullptr, *modeURI = nullptr; + xmlChar *templateName = nullptr, *modeName = nullptr; + xmlChar *tempUrl = nullptr; /* we must use a non-const xmlChar * and we are not making a copy of orginal value so this must not be freed */ @@ -444,7 +444,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, /* Add an orphaned template breakpoint we will need to call this function later to activate the breakpoint */ result = - breakPointAdd(orphanedTemplateURL, orphanedTemplateLineNo, arg, NULL, + breakPointAdd(orphanedTemplateURL, orphanedTemplateLineNo, arg, nullptr, DEBUG_BREAK_SOURCE); breakPtr = breakPointGet(orphanedTemplateURL, orphanedTemplateLineNo++); if (breakPtr){ @@ -478,7 +478,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, } name = xmlSplitQName2(opts[0], &nameURI); - if (name == NULL){ + if (!name){ name = xmlStrdup(opts[0]); }else{ if (nameURI){ @@ -500,7 +500,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, ignoreTemplateNames = 1; }else{ name = xmlSplitQName2(opts[0], &nameURI); - if (name == NULL) + if (!name) name = xmlStrdup(opts[0]); if (nameURI){ /* get the real URI for this namespace */ @@ -512,7 +512,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, } } mode = xmlSplitQName2(opts[1], &modeURI); - if (mode == NULL) + if (!mode) mode = xmlStrdup(opts[1]); if (modeURI){ /* get the real URI for this namespace */ @@ -608,11 +608,11 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, } if (templateName){ xmlFree(templateName); - templateName = NULL; + templateName = nullptr; } if (modeName){ xmlFree(modeName); - modeName = NULL; + modeName = nullptr; } templ = templ->next; } @@ -624,7 +624,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, if ((newBreakPoints == 0) && (validatedBreakPoints == 0)) { xsldbgGenericErrorFunc(i18n("Error: No templates found or unable to add breakpoint.\n")); - url = NULL; /* flag that we've printed partial error message about the problem url */ + url = nullptr; /* flag that we've printed partial error message about the problem url */ } else { result = 1; if (newBreakPoints){ @@ -673,7 +673,7 @@ xslDbgShellDelete(xmlChar * arg) { int result = 0, breakPointId; long lineNo; - breakPointPtr breakPtr = NULL; + breakPointPtr breakPtr = nullptr; static const char *errorPrompt = I18N_NOOP("Failed to delete breakpoint."); if (!arg) { @@ -686,7 +686,7 @@ xslDbgShellDelete(xmlChar * arg) } if (arg[0] == '-') { - xmlChar *opts[2], *url = NULL; + xmlChar *opts[2], *url = nullptr; if ((xmlStrLen(arg) > 1) && (arg[1] == 'l')) { if (splitString(&arg[2], 2, opts) == 2) { @@ -793,7 +793,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType) { int result = 0, breakPointId; long lineNo; - breakPointPtr breakPtr = NULL; + breakPointPtr breakPtr = nullptr; static const char *errorPrompt = I18N_NOOP("Failed to enable/disable breakpoint."); if (!filesGetStylesheet() || !filesGetMainDoc()) { @@ -812,7 +812,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType) } if (arg[0] == '-') { - xmlChar *opts[2], *url = NULL; + xmlChar *opts[2], *url = nullptr; if ((xmlStrLen(arg) > 1) && (arg[1] == 'l')) { if (splitString(&arg[2], 2, opts) == 2) { @@ -832,9 +832,9 @@ xslDbgShellEnable(xmlChar * arg, int enableType) } if (url) { if (strstr((char *) url, ".xsl")) { - if (validateSource(&url, NULL)) + if (validateSource(&url, nullptr)) breakPtr = breakPointGet(url, lineNo); - } else if (validateData(&url, NULL)) + } else if (validateData(&url, nullptr)) breakPtr = breakPointGet(url, lineNo); if (breakPtr){ result = breakPointEnable(breakPtr, enableType); @@ -941,7 +941,7 @@ static int validateBreakPoint(breakPointPtr breakPtr, breakPointPtr copy) copy->templateName = xmlStrdup(breakPtr->templateName); copy->modeName = xmlStrdup(breakPtr->modeName); if (breakPointDelete(breakPtr) && !breakPointGet(copy->url, copy->lineNo)){ - if (breakPointAdd(copy->url, copy->lineNo, NULL, NULL, copy->type)){ + if (breakPointAdd(copy->url, copy->lineNo, nullptr, nullptr, copy->type)){ breakPtr = breakPointGet(copy->url, copy->lineNo); if (breakPtr){ breakPtr->id = copy->id; @@ -979,14 +979,14 @@ static int validateTemplateBreakPoint(breakPointPtr breakPtr, breakPointPtr copy if ((xmlStrlen(copy->templateName) == 0) || xmlStrEqual(copy->templateName, (xmlChar*)"*")){ if (xmlStrEqual(breakPtr->url, orphanedTemplateURL)) breakPointDelete(breakPtr); - if ( xslDbgShellBreak(copy->templateName, NULL, ctxt)){ + if ( xslDbgShellBreak(copy->templateName, nullptr, ctxt)){ result = 1; xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused one or more breakpoints to be re-created.\n")); } }else{ if (xmlStrEqual(breakPtr->url, orphanedTemplateURL)) breakPointDelete(breakPtr); - if (xslDbgShellBreak(copy->templateName, NULL, ctxt)){ + if (xslDbgShellBreak(copy->templateName, nullptr, ctxt)){ result = 1; } } diff --git a/src/kxsldbgpart/libxsldbg/callstack.cpp b/src/kxsldbgpart/libxsldbg/callstack.cpp index cd9e320..5c76a1f 100644 --- a/src/kxsldbgpart/libxsldbg/callstack.cpp +++ b/src/kxsldbgpart/libxsldbg/callstack.cpp @@ -71,21 +71,21 @@ callStackInit(void) callInfo = (callPointInfoPtr) xmlMalloc(sizeof(callPointInfo)); if (callInfo) { - callInfo->next = NULL; - callInfo->templateName = NULL; - callInfo->templateURI = NULL; - callInfo->modeName = NULL; - callInfo->modeURI = NULL; - callInfo->url = NULL; + callInfo->next = nullptr; + callInfo->templateName = nullptr; + callInfo->templateURI = nullptr; + callInfo->modeName = nullptr; + callInfo->modeURI = nullptr; + callInfo->url = nullptr; } callStackBot = (callPointPtr) xmlMalloc(sizeof(callPoint)); if (callStackBot) { - callStackBot->next = NULL; - callStackBot->info = NULL; + callStackBot->next = nullptr; + callStackBot->info = nullptr; callStackBot->lineNo = -1; callStackTop = callStackBot; } - return (callInfo != NULL) && (callStackBot != NULL); + return (callInfo != nullptr) && (callStackBot != nullptr); } @@ -119,7 +119,7 @@ callStackFree(void) xmlFree(curInfo); curInfo = nextInfo; } - curInfo = NULL; + curInfo = nullptr; /* remove all call stack items left. There should be none !! */ while (curCall) { @@ -128,9 +128,9 @@ callStackFree(void) curCall = nextCall; } - callStackBot = NULL; - callStackTop = NULL; - callInfo = NULL; + callStackBot = nullptr; + callStackTop = nullptr; + callInfo = nullptr; } @@ -151,7 +151,7 @@ callPointInfoPtr addCallInfo(const xmlChar * templateName, const xmlChar *templateURI, const xmlChar * modeName, const xmlChar* modeURI, const xmlChar * url) { - callPointInfoPtr result = NULL, cur = callInfo; + callPointInfoPtr result = nullptr, cur = callInfo; int found; if (!templateName || !url) { @@ -209,7 +209,7 @@ addCallInfo(const xmlChar * templateName, const xmlChar *templateURI, result->modeURI = (xmlChar *) xmlMemStrdup((char *) modeURI); result->url = (xmlChar *) xmlMemStrdup((char *) url); - result->next = NULL; + result->next = nullptr; }else { #ifdef WITH_XSLDBG_DEBUG_PROCESS xsltGenericError(xsltGenericErrorContext, @@ -297,7 +297,7 @@ callStackAdd(xsltTemplatePtr templ, xmlNodePtr source) callStackTop = cur; cur->info = info; cur->lineNo = xmlGetLineNo(source); - cur->next = NULL; + cur->next = nullptr; result = 1; } else { #ifdef WITH_XSLDBG_DEBUG_PROCESS @@ -350,7 +350,7 @@ callStackDrop(void) } if (cur->next) xmlFree(cur->next); - cur->next = NULL; + cur->next = nullptr; callStackTop = cur; } else { #ifdef WITH_XSLDBG_DEBUG_PROCESS @@ -431,7 +431,7 @@ callStackStepdown(int depth) callPointPtr callStackGet(int depth) { - callPointPtr result = NULL, cur = callStackBot; + callPointPtr result = nullptr, cur = callStackBot; if (!callStackBot) { #ifdef WITH_XSLDBG_DEBUG_PROCESS diff --git a/src/kxsldbgpart/libxsldbg/debug.cpp b/src/kxsldbgpart/libxsldbg/debug.cpp index 2975f81..84eae3e 100644 --- a/src/kxsldbgpart/libxsldbg/debug.cpp +++ b/src/kxsldbgpart/libxsldbg/debug.cpp @@ -197,8 +197,8 @@ debugHandleDebugger(xmlNodePtr cur, xmlNodePtr node, case DEBUG_CONT: { - breakPointPtr breakPtr = NULL; - xmlChar *baseUri = NULL; + breakPointPtr breakPtr = nullptr; + xmlChar *baseUri = nullptr; if (cur) { breakPtr = @@ -212,7 +212,7 @@ debugHandleDebugger(xmlNodePtr cur, xmlNodePtr node, } if (node) { baseUri = filesGetBaseUri(node); - if (baseUri != NULL) { + if (baseUri) { breakPtr = breakPointGet(baseUri, xmlGetLineNo(node)); } else { diff --git a/src/kxsldbgpart/libxsldbg/debugXSL.cpp b/src/kxsldbgpart/libxsldbg/debugXSL.cpp index c865713..58dca3a 100644 --- a/src/kxsldbgpart/libxsldbg/debugXSL.cpp +++ b/src/kxsldbgpart/libxsldbg/debugXSL.cpp @@ -164,7 +164,7 @@ const char *commandNames[] = { /* language change */ "lang", - NULL /* Indicate the end of list */ + nullptr /* Indicate the end of list */ }; /* valid commands of xslShell in there alternative|shorter format */ @@ -251,7 +251,7 @@ const char *shortCommandNames[] = { /* language change */ "lang", - NULL /* Indicate the end of list */ + nullptr /* Indicate the end of list */ }; @@ -261,7 +261,7 @@ const char *cdShortCuts[] = { ">>", "<-", "->", - NULL /* indicate end of list */ + nullptr /* indicate end of list */ }; /* what to replace shortcuts with */ @@ -270,7 +270,7 @@ const char *cdAlternative[] = { "following-sibling::node()", "ancestor::node()", "descendant::node()", - NULL /* indicate end of list */ + nullptr /* indicate end of list */ }; /* what enum to use for shortcuts */ @@ -500,7 +500,7 @@ int xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, xmlChar * arg, xmlNodePtr source) { - xmlXPathObjectPtr list = NULL; + xmlXPathObjectPtr list = nullptr; int result = 0; int offset = 2; /* in some cases I'm only interested after first two chars */ @@ -509,7 +509,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, return result; } - if (arg == NULL) + if (!arg) arg = (xmlChar *) ""; if (arg[0] == 0) { ctxt->node = (xmlNodePtr) ctxt->doc; @@ -541,7 +541,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, if (source) { pctxt = xmlXPathNewContext(source->doc); - if (pctxt == NULL) { + if (!pctxt) { xmlFree(ctxt); /* xslDebugStatus = DEBUG_QUIT; */ return result; @@ -584,7 +584,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, } } - if (list != NULL) { + if (list) { switch (list->type) { case XPATH_NODESET: if (list->nodesetval) { @@ -615,7 +615,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, xsldbgGenericErrorFunc(i18n("Error: XPath %1 was not found.\n").arg(xsldbgText(arg))); } if (ctxt->pctxt) - ctxt->pctxt->node = NULL; + ctxt->pctxt->node = nullptr; } return result; } @@ -637,7 +637,7 @@ xslDbgPrintCallStack(const xmlChar * arg) int result = 1; callPointPtr callPointItem; - if (arg == NULL) { + if (!arg) { if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_CALLSTACK_CHANGED); /* we send the oldest frame stack first */ @@ -652,8 +652,8 @@ xslDbgPrintCallStack(const xmlChar * arg) xmlChar *nameTemp, *modeTemp; for (depth = callStackGetDepth(); depth >= 1; depth--) { callPointItem = callStackGet(depth); - nameTemp = NULL; - modeTemp = NULL; + nameTemp = nullptr; + modeTemp = nullptr; if (callPointItem && callPointItem->info) { if (depth == callStackGetDepth()) { xmlChar *curUrl = xsldbgUrl(); @@ -679,11 +679,11 @@ xslDbgPrintCallStack(const xmlChar * arg) } if (rootNameTemp){ xmlFree(rootNameTemp); - rootNameTemp = NULL; + rootNameTemp = nullptr; } if (rootModeTemp){ xmlFree(rootModeTemp); - rootModeTemp = NULL; + rootModeTemp = nullptr; } } else if (curUrl) { /* display information about the current XSLT template */ @@ -713,11 +713,11 @@ xslDbgPrintCallStack(const xmlChar * arg) } if (nameTemp){ xmlFree(nameTemp); - nameTemp = NULL; + nameTemp = nullptr; } if(modeTemp){ xmlFree(modeTemp); - modeTemp = NULL; + modeTemp = nullptr; } } else { @@ -1037,7 +1037,7 @@ updateSearchData(xsltTransformContextPtr styleCtxt, walkLocals((xmlHashScanner) addLocalNode, data, style); xsldbgGenericErrorFunc(i18n("Information: Formatting output.\n")); - result = searchSave(NULL); + result = searchSave(nullptr); return result; } @@ -1055,21 +1055,21 @@ void debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root, xsltTransformContextPtr ctxt) { - xmlDocPtr tempDoc = NULL; - xmlNodePtr tempNode = NULL; + xmlDocPtr tempDoc = nullptr; + xmlNodePtr tempNode = nullptr; rootCopy = root; - static const xmlChar *lastTemplate = NULL; + static const xmlChar *lastTemplate = nullptr; xmlBufferPtr buffer = xmlBufferCreate(); static char mybuff[6] = " 0\n\x0"; if (ctxt && templ && root && !xsldbgReachedFirstTemplate) xsldbgReachedFirstTemplate = true; - if (templ == NULL) { + if (!templ) { tempDoc = xmlNewDoc((xmlChar *) "1.0"); if (!tempDoc) return; - tempNode = xmlNewNode(NULL, (xmlChar *) "xsldbg_default_node"); + tempNode = xmlNewNode(nullptr, (xmlChar *) "xsldbg_default_node"); if (!tempNode) { xmlFreeDoc(tempDoc); return; @@ -1078,14 +1078,14 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root, templ = tempNode; } - if (node == NULL) + if (!node) node = (xmlNodePtr) filesGetMainDoc(); - if (node == NULL) { + if (!node) { tempDoc = xmlNewDoc((xmlChar *) "1.0"); if (!tempDoc) return; - tempNode = xmlNewNode(NULL, (xmlChar *) "xsldbg_default_node"); + tempNode = xmlNewNode(nullptr, (xmlChar *) "xsldbg_default_node"); if (!tempNode) { xmlFreeDoc(tempDoc); return; @@ -1094,13 +1094,13 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root, node = tempNode; } if (root) { - xmlChar *nameTemp = NULL, *modeTemp = NULL; + xmlChar *nameTemp = nullptr, *modeTemp = nullptr; nameTemp = fullTQName(root->nameURI, root->name); modeTemp = fullTQName(root->modeURI, root->mode); if (!nextCommandActive){ /* we only want messages if we are not in the process of completing the next command */ - if (terminalIO == NULL) { + if (!terminalIO) { if (root->match){ xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(root->match)).arg(xsldbgText(modeTemp))); @@ -1170,7 +1170,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, xsltTransformContextPtr styleCtxt) { xmlChar prompt[DEBUG_BUFFER_SIZE] = "/ > "; - xmlChar *cmdline = NULL, *cur; + xmlChar *cmdline = nullptr, *cur; int nbargs = 0; int loadedFiles = 0; int commandId = -1; /* stores what was the last @@ -1184,7 +1184,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, int shortCutId = -1; /* used by cd command */ int i; static int showSource = 1; /* Do we first show source or data ? */ - xmlChar *baseUri = NULL; /* for used for included xml entities */ + xmlChar *baseUri = nullptr; /* for used for included xml entities */ const xmlChar *breakUri; /* for convenience keep track of which node was last @@ -1195,35 +1195,35 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, xmlShellCtxtPtr ctxt; int exitShell = 0; /* Indicate when to exit xslShell */ - if (source == NULL){ + if (!source){ #ifdef WITH_XSLDBG_DEBUG_PROCESS xsltGenericError(xsltGenericErrorContext, "Error: Source NULL in shellPrompt\n"); #endif return; } - if (doc == NULL){ + if (!doc){ #ifdef WITH_XSLDBG_DEBUG_PROCESS xsltGenericError(xsltGenericErrorContext, "Error: doc NULL in shellPrompt\n"); #endif return; } - if (filename == NULL){ + if (!filename){ #ifdef WITH_XSLDBG_DEBUG_PROCESS xsltGenericError(xsltGenericErrorContext, "Error: fileName NULL in shellPrompt\n"); #endif return; } - if (input == NULL){ + if (!input){ #ifdef WITH_XSLDBG_DEBUG_PROCESS xsltGenericError(xsltGenericErrorContext, "Error: Input function NULL in shellPrompt\n"); #endif return; } - if (output == NULL){ + if (!output){ #ifdef WITH_XSLDBG_DEBUG_PROCESS xsltGenericError(xsltGenericErrorContext, "Error: Output NULL in shellPrompt\n"); @@ -1231,7 +1231,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, return; } ctxt = (xmlShellCtxtPtr) xmlMalloc(sizeof(xmlShellCtxt)); - if (ctxt == NULL){ + if (!ctxt){ xsldbgGenericErrorFunc(i18n("Error: Out of memory.\n")); return; } @@ -1282,7 +1282,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, && ctxt->node->doc->URL) { if (!showSource) { baseUri = filesGetBaseUri(ctxt->node); - if (baseUri != NULL) + if (baseUri) breakUri = baseUri; else breakUri = ctxt->node->doc->URL; @@ -1293,13 +1293,13 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, messageTxt = i18n("Breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(breakUri)).arg(xmlGetLineNo(ctxt->node)); else messageTxt = i18n("Breakpoint at text node in file \"%1\".\n").arg(xsldbgUrl(breakUri)); - if (baseUri != NULL) { + if (baseUri) { xmlFree(baseUri); - baseUri = NULL; + baseUri = nullptr; } if (((xslDebugStatus == DEBUG_TRACE) || - (xslDebugStatus == DEBUG_WALK)) && (terminalIO != NULL)) + (xslDebugStatus == DEBUG_WALK)) && terminalIO) fprintf(terminalIO, "%s", messageTxt.utf8().data()); else xsldbgGenericErrorFunc(messageTxt); @@ -1313,7 +1313,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, xslDbgShellShowWatches(styleCtxt, ctxt, 0); xsldbgGenericErrorFunc("\n"); xmlXPathFreeContext(ctxt->pctxt); - ctxt->pctxt = NULL; + ctxt->pctxt = nullptr; } } @@ -1333,7 +1333,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, } ctxt->pctxt = xmlXPathNewContext(ctxt->doc); - if (ctxt->pctxt == NULL) { + if (!ctxt->pctxt) { xmlFree(ctxt); xsldbgGenericErrorFunc(i18n("Error: Out of memory.\n")); return; @@ -1393,14 +1393,14 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, cmdline = (xmlChar *) ctxt->input((char *) messageBuffer); } - if (cmdline == NULL) + if (!cmdline) break; /* don't allow next command to be active more than at one breakpoint */ if (nextCommandActive) nextCommandActive = 0; - notifyXsldbgApp(XSLDBG_MSG_PROCESSING_INPUT, NULL); + notifyXsldbgApp(XSLDBG_MSG_PROCESSING_INPUT, nullptr); /* remove leading/trailing blanks */ trimString(cmdline); @@ -1545,9 +1545,9 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, case DEBUG_WHERE_CMD: /* Print the current working directory as well */ - xslDbgPrintCallStack(NULL); + xslDbgPrintCallStack(nullptr); if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) { - if (!xmlShellPwd(ctxt, (char *) dir, ctxt->node, NULL)){ + if (!xmlShellPwd(ctxt, (char *) dir, ctxt->node, nullptr)){ xsldbgGenericErrorFunc((const char*)dir); xsldbgGenericErrorFunc("\n"); } @@ -1572,7 +1572,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, xslDbgShellBreak(arg, styleCtxt->style, styleCtxt); else - cmdResult = xslDbgShellBreak(arg, NULL, styleCtxt); + cmdResult = xslDbgShellBreak(arg, nullptr, styleCtxt); } else { /* select current node to break at */ xmlChar buff[100]; @@ -1589,7 +1589,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, styleCtxt); else cmdResult = - xslDbgShellBreak(buff, NULL, styleCtxt); + xslDbgShellBreak(buff, nullptr, styleCtxt); } break; @@ -1598,7 +1598,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_BREAKPOINT_CHANGED); walkBreakPoints((xmlHashScanner) - xslDbgShellPrintBreakPoint, NULL); + xslDbgShellPrintBreakPoint, nullptr); notifyListSend(); } else { xsldbgGenericErrorFunc("\n"); @@ -1606,7 +1606,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, * xslDbgShellPrintBreakPoint */ walkBreakPoints((xmlHashScanner) - xslDbgShellPrintBreakPoint, NULL); + xslDbgShellPrintBreakPoint, nullptr); if (printCount == 0) xsldbgGenericErrorFunc(i18n("\nNo breakpoints are set for the file.\n")); else @@ -1619,7 +1619,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, if (xmlStrLen(arg)) cmdResult = xslDbgShellDelete((xmlChar *) arg); else { - breakPointPtr breakPtr = NULL; + breakPointPtr breakPtr = nullptr; xmlChar* tempBaseName = filesGetBaseUri(ctxt->node); if (tempBaseName){ @@ -1640,7 +1640,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, cmdResult = xslDbgShellEnable(arg, XSL_TOGGLE_BREAKPOINT); else { - breakPointPtr breakPtr = NULL; + breakPointPtr breakPtr = nullptr; xmlChar * tempBaseName = filesGetBaseUri(ctxt->node); if (tempBaseName){ @@ -1661,7 +1661,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, if (xmlStrLen(arg)) cmdResult = xslDbgShellEnable(arg, 0); else { - breakPointPtr breakPtr = NULL; + breakPointPtr breakPtr = nullptr; xmlChar *tempBaseName = filesGetBaseUri(ctxt->node); if (tempBaseName){ @@ -1689,7 +1689,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, break; case DEBUG_DU_CMD: - xmlShellDu(ctxt, NULL, ctxt->node, NULL); + xmlShellDu(ctxt, nullptr, ctxt->node, nullptr); cmdResult = 1; break; @@ -1699,7 +1699,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, break; case DEBUG_PWD_CMD: - if (!xmlShellPwd(ctxt, (char *) dir, ctxt->node, NULL)) { + if (!xmlShellPwd(ctxt, (char *) dir, ctxt->node, nullptr)) { xmlChar* tempBaseName = filesGetBaseUri(ctxt->node); if(tempBaseName){ xsldbgGenericErrorFunc("\n"); @@ -1721,7 +1721,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, break; case DEBUG_BASE_CMD: - xmlShellBase(ctxt, NULL, ctxt->node, NULL); + xmlShellBase(ctxt, nullptr, ctxt->node, nullptr); cmdResult = 1; break; @@ -1777,8 +1777,8 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, showSource = 1; xsldbgUpdateFileDetails((xmlNodePtr) ctxt->node); /* let any listener know that we got to a new line */ - notifyXsldbgApp(XSLDBG_MSG_LINE_CHANGED, NULL); - if (ctxt->pctxt == NULL) { + notifyXsldbgApp(XSLDBG_MSG_LINE_CHANGED, nullptr); + if (!ctxt->pctxt) { xmlFree(ctxt); xslDebugStatus = DEBUG_QUIT; return; @@ -1817,8 +1817,8 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, showSource = 0; xsldbgUpdateFileDetails((xmlNodePtr) ctxt->node); /* let any listener know that we got to a new line */ - notifyXsldbgApp(XSLDBG_MSG_LINE_CHANGED, NULL); - if (ctxt->pctxt == NULL) { + notifyXsldbgApp(XSLDBG_MSG_LINE_CHANGED, nullptr); + if (!ctxt->pctxt) { xmlFree(ctxt); xslDebugStatus = DEBUG_QUIT; return; @@ -2101,7 +2101,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, } xmlFree(cmdline); - cmdline = NULL; + cmdline = nullptr; } xmlXPathFreeContext(ctxt->pctxt); diff --git a/src/kxsldbgpart/libxsldbg/file_cmds.cpp b/src/kxsldbgpart/libxsldbg/file_cmds.cpp index 10abbaf..1bd2973 100644 --- a/src/kxsldbgpart/libxsldbg/file_cmds.cpp +++ b/src/kxsldbgpart/libxsldbg/file_cmds.cpp @@ -241,7 +241,7 @@ int xslDbgShellOutput(const xmlChar *arg) } } else if (xmlStrEqual(arg, (xmlChar*)"-")) { optionsSetStringOption(OPTIONS_OUTPUT_FILE_NAME, - NULL); + nullptr); notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, 0L); result = 1; } else if (!xmlStrnCmp(arg, "ftp://", 6) || !xmlStrnCmp(arg, "http://", 7)){ diff --git a/src/kxsldbgpart/libxsldbg/files.cpp b/src/kxsldbgpart/libxsldbg/files.cpp index 6b8f8a8..101a8cb 100644 --- a/src/kxsldbgpart/libxsldbg/files.cpp +++ b/src/kxsldbgpart/libxsldbg/files.cpp @@ -55,23 +55,23 @@ static xmlChar filesBuffer[DEBUG_BUFFER_SIZE]; static xsltStylesheetPtr topStylesheet; /* what is the base path for top stylesheet */ -static xmlChar *stylePathName = NULL; +static xmlChar *stylePathName = nullptr; /* what is the path for current working directory*/ -static xmlChar *workingDirPath = NULL; +static xmlChar *workingDirPath = nullptr; -static arrayListPtr entityNameList = NULL; +static arrayListPtr entityNameList = nullptr; /* Current encoding to use for standard output*/ -static xmlCharEncodingHandlerPtr stdoutEncoding = NULL; +static xmlCharEncodingHandlerPtr stdoutEncoding = nullptr; /* input and output buffers for encoding*/ -static xmlBufferPtr encodeInBuff = NULL; -static xmlBufferPtr encodeOutBuff = NULL; +static xmlBufferPtr encodeInBuff = nullptr; +static xmlBufferPtr encodeOutBuff = nullptr; /* Current line number and URI for xsldbg*/ static int currentLineNo = -1; -static xmlChar *currentUrl = NULL; +static xmlChar *currentUrl = nullptr; /* ----------------------------------------- Private function declarations for files.c @@ -126,7 +126,7 @@ FILE *terminalIO; //static char *ttyName = NULL; /* what is the name of the default terminal */ -static char *termName = NULL; /* what is the name of terminal we are redirected to */ +static char *termName = nullptr; /* what is the name of terminal we are redirected to */ /** @@ -165,7 +165,7 @@ openTerminal(xmlChar * device) if (terminalIO) { fclose(terminalIO); - terminalIO = NULL; + terminalIO = nullptr; } @@ -187,7 +187,7 @@ openTerminal(xmlChar * device) case '1': if (termName) { terminalIO = fopen((char *) termName, "w"); - if (terminalIO != NULL) { + if (terminalIO) { xmlFree(termName); termName = xmlMemStrdup((char *) device); result = 1; @@ -209,7 +209,7 @@ openTerminal(xmlChar * device) default: terminalIO = fopen((char *) device, "w"); - if (terminalIO != NULL) { + if (terminalIO) { if (termName) xmlFree(termName); termName = xmlMemStrdup((char *) device); @@ -241,7 +241,7 @@ guessStylesheetHelper(void *payload, void *data, Q_UNUSED(name); xsltStylesheetPtr style = (xsltStylesheetPtr) payload; searchInfoPtr searchCriteria = (searchInfoPtr) data; - nodeSearchDataPtr searchData = NULL; + nodeSearchDataPtr searchData = nullptr; /* where did the directory/URI separator occur */ char *lastSlash; @@ -250,7 +250,7 @@ guessStylesheetHelper(void *payload, void *data, return; searchData = (nodeSearchDataPtr) searchCriteria->data; - if (searchData->nameInput && (searchData->absoluteNameMatch == NULL)) { + if (searchData->nameInput && !searchData->absoluteNameMatch) { /* at this point we know that we have not made an absolute match * but we may have made a relative match */ if (xmlStrCmp(style->doc->URL, searchData->nameInput) == 0) { @@ -332,7 +332,7 @@ guessStylesheetHelper2(void *payload, void *data, Q_UNUSED(name); xmlNodePtr node = (xmlNodePtr) payload; searchInfoPtr searchCriteria = (searchInfoPtr) data; - nodeSearchDataPtr searchData = NULL; + nodeSearchDataPtr searchData = nullptr; /* where did the directory/URI separator occur */ char *lastSlash; @@ -341,7 +341,7 @@ guessStylesheetHelper2(void *payload, void *data, return; searchData = (nodeSearchDataPtr) searchCriteria->data; - if (searchData->nameInput && (searchData->absoluteNameMatch == NULL)) { + if (searchData->nameInput && !searchData->absoluteNameMatch) { /* at this point we know that we have not made an absolute match * but we may have made a relative match */ if (xmlStrCmp(node->doc->URL, searchData->nameInput) == 0) { @@ -422,7 +422,7 @@ guessStylesheetName(searchInfoPtr searchCriteria) return; searchData = (nodeSearchDataPtr) searchCriteria->data; - if (searchData->nameInput == NULL) + if (!searchData->nameInput) return; /* must supply name of file to look for */ walkStylesheets((xmlHashScanner) guessStylesheetHelper, @@ -480,7 +480,7 @@ changeDir(const xmlChar * path) int result = 0; int charIndex; const char endString[2] = { PATHCHAR, '\0' }; - xmlChar *expandedName = NULL; + xmlChar *expandedName = nullptr; if (path && (xmlStrLen(path) > 0)) { @@ -628,7 +628,7 @@ filesFreeXmlFile(FileTypeEnum fileType) case FILES_XMLFILE_TYPE: if (topDocument) xmlFreeDoc(topDocument); - topDocument = NULL; + topDocument = nullptr; result = 1; break; @@ -637,15 +637,15 @@ filesFreeXmlFile(FileTypeEnum fileType) xsltFreeStylesheet(topStylesheet); if (stylePathName) xmlFree(stylePathName); - stylePathName = NULL; - topStylesheet = NULL; + stylePathName = nullptr; + topStylesheet = nullptr; result = 1; break; case FILES_TEMPORARYFILE_TYPE: if (tempDocument) xmlFreeDoc(tempDocument); - tempDocument = NULL; + tempDocument = nullptr; result = 1; break; } @@ -731,7 +731,7 @@ filesInit(void) { int result = 0; - terminalIO = NULL; + terminalIO = nullptr; #ifdef __riscos ttyName = ":tt"; /* Default tty */ #endif @@ -742,9 +742,9 @@ filesInit(void) oldStdout = stdout; oldStderr = stderr; #endif - topDocument = NULL; - tempDocument = NULL; - topStylesheet = NULL; + topDocument = nullptr; + tempDocument = nullptr; + topStylesheet = nullptr; entityNameList = arrayListNew(4, (freeItemFunc) filesFreeEntityInfo); /* setup the encoding */ @@ -771,11 +771,11 @@ filesFree(void) if (terminalIO) { fclose(terminalIO); - terminalIO = NULL; + terminalIO = nullptr; } if (termName) { xmlFree(termName); - termName = NULL; + termName = nullptr; } result = filesFreeXmlFile(FILES_SOURCEFILE_TYPE); @@ -791,17 +791,17 @@ filesFree(void) } if (stylePathName) { xmlFree(stylePathName); - stylePathName = NULL; + stylePathName = nullptr; } if (workingDirPath) { xmlFree(workingDirPath); - workingDirPath = NULL; + workingDirPath = nullptr; } if (entityNameList) { arrayListFree(entityNameList); - entityNameList = NULL; + entityNameList = nullptr; } /* Free memory used by encoding related structures */ @@ -812,7 +812,7 @@ filesFree(void) xmlBufferFree(encodeOutBuff); /* close current encoding */ - filesSetEncoding(NULL); + filesSetEncoding(nullptr); if (currentUrl) xmlFree(currentUrl); @@ -931,7 +931,7 @@ filesEntityRef(xmlEntityPtr ent, xmlNodePtr firstNode, xmlNodePtr lastNode) if (node != lastNode) node = node->next; else - node = NULL; + node = nullptr; } } @@ -983,7 +983,7 @@ filesSetBaseUri(xmlNodePtr node, const xmlChar * uri) xmlChar * filesGetBaseUri(xmlNodePtr node) { - xmlChar *result = NULL; + xmlChar *result = nullptr; if (!node || !node->doc) return result; @@ -1036,18 +1036,18 @@ int filesLoadCatalogs(void) { int result = 0; - const char *catalogs = NULL; + const char *catalogs = nullptr; xmlCatalogCleanup(); if (optionsGetIntOption(OPTIONS_CATALOGS)) { - if (optionsGetStringOption(OPTIONS_CATALOG_NAMES) == NULL) { + if (!optionsGetStringOption(OPTIONS_CATALOG_NAMES)) { /* use the SGML catalog */ #ifdef __riscos catalogs = getenv("SGML$CatalogFiles"); #else catalogs = getenv("SGML_CATALOG_FILES"); #endif - if (catalogs == NULL) { + if (!catalogs) { #ifdef __riscos xsldbgGenericErrorFunc("Warning: Environment variable SGML$CatalogFiles is not set.\n"); #else @@ -1088,7 +1088,7 @@ filesLoadCatalogs(void) xmlChar * filesEncode(const xmlChar * text) { - xmlChar *result = NULL; + xmlChar *result = nullptr; if (!text) return result; @@ -1123,7 +1123,7 @@ filesEncode(const xmlChar * text) xmlChar * filesDecode(const xmlChar * text) { - xmlChar *result = NULL; + xmlChar *result = nullptr; if (!text) return result; @@ -1167,14 +1167,14 @@ filesSetEncoding(const char *encoding) xmlCharEncodingHandlerPtr tempEncoding = xmlFindCharEncodingHandler(encoding); if (tempEncoding) { - filesSetEncoding(NULL); /* re-use code to close encoding */ + filesSetEncoding(nullptr); /* re-use code to close encoding */ stdoutEncoding = tempEncoding; result = - (xmlCharEncOutFunc(stdoutEncoding, encodeOutBuff, NULL) + (xmlCharEncOutFunc(stdoutEncoding, encodeOutBuff, nullptr) >= 0); if (!result) { xmlCharEncCloseFunc(stdoutEncoding); - stdoutEncoding = NULL; + stdoutEncoding = nullptr; xsldbgGenericErrorFunc(i18n("Unable to initialize encoding %1.").arg(xsldbgText(encoding))); } else optionsSetStringOption(OPTIONS_ENCODING, @@ -1188,7 +1188,7 @@ filesSetEncoding(const char *encoding) result = (xmlCharEncCloseFunc(stdoutEncoding) >= 0); else result = 1; - stdoutEncoding = NULL; + stdoutEncoding = nullptr; } return result; } @@ -1307,9 +1307,9 @@ filesSearchResultsPath() */ xmlChar *filesURItoFileName(const xmlChar* uri) { - xmlChar *result = NULL; - xmlChar *unescapedFileName = NULL; - const xmlChar* tempName = NULL; + xmlChar *result = nullptr; + xmlChar *unescapedFileName = nullptr; + const xmlChar* tempName = nullptr; if (uri){ if (!xmlStrnCmp(uri, "file://localhost", 16 )){ @@ -1356,7 +1356,7 @@ xmlChar *filesURItoFileName(const xmlChar* uri) if (unescapedFileName) /* not needed, here for completeness */ xmlFree(unescapedFileName); - result = NULL; + result = nullptr; } }else{ xsldbgGenericErrorFunc(i18n("Error: Unable to convert %1 to local file name.\n").arg(xsldbgText(uri))); @@ -1378,8 +1378,8 @@ xmlChar *filesURItoFileName(const xmlChar* uri) void xsldbgUpdateFileDetails(xmlNodePtr node) { - if ((node != NULL) && (node->doc != NULL)){ - if (currentUrl != NULL) + if (node && node->doc){ + if (currentUrl) xmlFree(currentUrl); currentUrl = filesGetBaseUri(node); currentLineNo = xmlGetLineNo(node); @@ -1412,8 +1412,8 @@ xsldbgLineNo(void) xmlChar * xsldbgUrl(void) { - if (currentUrl != NULL) + if (currentUrl) return (xmlChar *) xmlMemStrdup((char *) currentUrl); else - return NULL; + return nullptr; } diff --git a/src/kxsldbgpart/libxsldbg/files_unix.cpp b/src/kxsldbgpart/libxsldbg/files_unix.cpp index 992b014..ac580d0 100644 --- a/src/kxsldbgpart/libxsldbg/files_unix.cpp +++ b/src/kxsldbgpart/libxsldbg/files_unix.cpp @@ -23,7 +23,7 @@ #include "options.h" #include -static char *tempNames[2] = { NULL, NULL }; +static char *tempNames[2] = { nullptr, nullptr }; /** * filesPlatformInit: @@ -108,7 +108,7 @@ const char * filesTempFileName(int fileNumber) { - const char *result = NULL; + const char *result = nullptr; if ((fileNumber < 0) || ((fileNumber + 1) > 2)){ //don't use > (int) sizeof(tempNames), it depends on the platform and is wrong even on i586 #ifdef WITH_XSLDBG_DEBUG_PROCESS @@ -140,7 +140,7 @@ filesTempFileName(int fileNumber) xmlChar * filesExpandName(const xmlChar * fileName) { - xmlChar *result = NULL; + xmlChar *result = nullptr; if (fileName) { if ((fileName[0] == '~') && getenv("HOME")) { @@ -176,11 +176,11 @@ filesExpandName(const xmlChar * fileName) xmlChar * filesSearchFileName(FilesSearchFileNameEnum fileType) { - xmlChar *result = NULL; + xmlChar *result = nullptr; int type = fileType; int preferHtml = optionsGetIntOption(OPTIONS_PREFER_HTML); - const xmlChar *baseDir = NULL; - const xmlChar *name = NULL; + const xmlChar *baseDir = nullptr; + const xmlChar *name = nullptr; static const char *searchNames[] = { /* Note: File names here are in native format, to be appended to the * help directory name or search results path diff --git a/src/kxsldbgpart/libxsldbg/help_unix.cpp b/src/kxsldbgpart/libxsldbg/help_unix.cpp index 45e40df..c00a527 100644 --- a/src/kxsldbgpart/libxsldbg/help_unix.cpp +++ b/src/kxsldbgpart/libxsldbg/help_unix.cpp @@ -99,7 +99,7 @@ helpTop(const xmlChar * args) else xsldbgGenericErrorFunc(i18n("Error: Unable to find xsldbg or help files.\n")); } else { - if (filesMoreFile((xmlChar*)filesTempFileName(0), NULL) == 1) { + if (filesMoreFile((xmlChar*)filesTempFileName(0), nullptr) == 1) { result = 1; } else { xsldbgGenericErrorFunc(i18n("Error: Unable to print help file.\n")); diff --git a/src/kxsldbgpart/libxsldbg/nodeview_cmds.cpp b/src/kxsldbgpart/libxsldbg/nodeview_cmds.cpp index 6e673e2..80cb663 100644 --- a/src/kxsldbgpart/libxsldbg/nodeview_cmds.cpp +++ b/src/kxsldbgpart/libxsldbg/nodeview_cmds.cpp @@ -102,9 +102,9 @@ xslDbgShellPrintList(xmlShellCtxtPtr ctxt, xmlChar * arg, int dir) if (arg[0] == 0) { if (dir) - xmlShellDir(ctxt, NULL, ctxt->node, NULL); + xmlShellDir(ctxt, nullptr, ctxt->node, nullptr); else - xmlShellList(ctxt, NULL, ctxt->node, NULL); + xmlShellList(ctxt, nullptr, ctxt->node, nullptr); result = 1; /*assume that this worked */ } else { ctxt->pctxt->node = ctxt->node; @@ -113,7 +113,7 @@ xslDbgShellPrintList(xmlShellCtxtPtr ctxt, xmlChar * arg, int dir) xmlXPathRegisterNs(ctxt->pctxt, (xmlChar *) "xsl", XSLT_NAMESPACE); list = xmlXPathEval(arg, ctxt->pctxt); - if (list != NULL) { + if (list) { switch (list->type) { case XPATH_NODESET:{ int indx; @@ -121,13 +121,13 @@ xslDbgShellPrintList(xmlShellCtxtPtr ctxt, xmlChar * arg, int dir) for (indx = 0; indx < list->nodesetval->nodeNr; indx++) { if (dir) - xmlShellList(ctxt, NULL, + xmlShellList(ctxt, nullptr, list->nodesetval-> - nodeTab[indx], NULL); + nodeTab[indx], nullptr); else - xmlShellList(ctxt, NULL, + xmlShellList(ctxt, nullptr, list->nodesetval-> - nodeTab[indx], NULL); + nodeTab[indx], nullptr); } result = 1; break; @@ -139,7 +139,7 @@ xslDbgShellPrintList(xmlShellCtxtPtr ctxt, xmlChar * arg, int dir) } else { xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(arg))); } - ctxt->pctxt->node = NULL; + ctxt->pctxt->node = nullptr; } return result; } @@ -219,7 +219,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){ int indx; const char *fileName = filesTempFileName(0); - FILE *file = NULL; + FILE *file = nullptr; if (!fileName) break; @@ -269,7 +269,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){ } /* inner switch statement */ if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { fclose(file); - file = NULL; + file = nullptr; /* send the data to application */ notifyXsldbgApp(XSLDBG_MSG_FILEOUT, fileName); } else { @@ -340,7 +340,7 @@ xslDbgShellCat(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, static const char * QUIET_STR = "-q"; bool silenceCtxtErrors = false; - if ((arg == NULL) || (xmlStrLen(arg) == 0)) + if (!arg || xmlStrLen(arg) == 0) arg = (xmlChar *) "."; /* Do we quietly ingore style context errors */ @@ -358,7 +358,7 @@ xslDbgShellCat(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, return 0; } - if ((arg == NULL) || (xmlStrLen(arg) == 0)) + if (!arg || xmlStrLen(arg) == 0) arg = (xmlChar *) "."; ctxt->pctxt->node = ctxt->node; @@ -375,13 +375,13 @@ xslDbgShellCat(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, list = xmlXPathEval((xmlChar *) arg, styleCtxt->xpathCtxt); styleCtxt->xpathCtxt->node = savenode; } - if (list != NULL) { + if (list) { result = printXPathObject(list, arg); xmlXPathFreeObject(list); } else { xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(arg))); } - ctxt->pctxt->node = NULL; + ctxt->pctxt->node = nullptr; return result; } @@ -407,7 +407,7 @@ xslDbgShellPrintNames(void *payload, } else if (payload && name) { xmlChar * fullQualifiedName = nodeViewBuffer; xsltStackElemPtr item = (xsltStackElemPtr)payload; - if (item->nameURI == NULL){ + if (!item->nameURI){ snprintf((char*)fullQualifiedName, sizeof(nodeViewBuffer), "$%s", item->name); }else{ snprintf((char*)fullQualifiedName, sizeof(nodeViewBuffer), "$%s:%s", @@ -432,7 +432,7 @@ xslDbgShellPrintNames(void *payload, } varCount++; } - return NULL; + return nullptr; } @@ -500,13 +500,13 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg, /* list global variables */ xmlHashScan(styleCtxt->globalVars, (xmlHashScanner) xslDbgShellPrintNames, - NULL); + nullptr); notifyListSend(); } else /* list global variables */ xmlHashScan(styleCtxt->globalVars, (xmlHashScanner) xslDbgShellPrintNames, - NULL); + nullptr); result = 1; /* ensure that the locals follow imediately after the * globals when in gdb mode */ @@ -543,7 +543,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg, xsltStackElemPtr item = styleCtxt->varsTab[i-1]; while (item) { if (item->name) { - if (item->nameURI == NULL){ + if (!item->nameURI){ snprintf((char*)fullQualifiedName, sizeof(nodeViewBuffer), "$%s", item->name); }else{ diff --git a/src/kxsldbgpart/libxsldbg/options.cpp b/src/kxsldbgpart/libxsldbg/options.cpp index ec3b2b9..8ac4e10 100644 --- a/src/kxsldbgpart/libxsldbg/options.cpp +++ b/src/kxsldbgpart/libxsldbg/options.cpp @@ -83,7 +83,7 @@ const char *optionNames[] = { "encoding", /* What encoding to use for standard output */ "searchresultspath", /* Where do we store the results of search */ "data", /* The xml data file to use */ - NULL /* indicate end of list */ + nullptr /* indicate end of list */ }; @@ -152,7 +152,7 @@ optionsInit(void) for (optionId = 0; optionId <= OPTIONS_LAST_STRING_OPTIONID - OPTIONS_FIRST_STRING_OPTIONID; optionId++) { - stringOptions[optionId] = NULL; + stringOptions[optionId] = nullptr; } /* init our parameter list */ @@ -178,7 +178,7 @@ optionsInit(void) /* set output default as standard output. Must be changed if not using * xsldbg's command line. Or the tty command is used */ - optionsSetStringOption(OPTIONS_OUTPUT_FILE_NAME, NULL); + optionsSetStringOption(OPTIONS_OUTPUT_FILE_NAME, nullptr); /* init our list of expressions to watch which are only a list of strings ie xmlChar*'s */ @@ -200,14 +200,14 @@ optionsFree(void) for (string_option = OPTIONS_FIRST_STRING_OPTIONID; string_option <= OPTIONS_LAST_STRING_OPTIONID; string_option++) { - optionsSetStringOption(OptionTypeEnum(string_option), NULL); + optionsSetStringOption(OptionTypeEnum(string_option), nullptr); } /* Free up memory used by parameters and watches*/ arrayListFree(parameterList); arrayListFree(watchExpressionList); - parameterList = NULL; - watchExpressionList = NULL; + parameterList = nullptr; + watchExpressionList = nullptr; } @@ -362,7 +362,7 @@ optionsSetStringOption(OptionTypeEnum optionType, const xmlChar * value) stringOptions[optionId] = (xmlChar *) xmlMemStrdup((char *) value); else /* we want to be able to provide a NULL value */ - stringOptions[optionId] = NULL; + stringOptions[optionId] = nullptr; result = 1; } else{ if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){ @@ -389,7 +389,7 @@ const xmlChar * optionsGetStringOption(OptionTypeEnum optionType) { int type = optionType; - xmlChar *result = NULL; + xmlChar *result = nullptr; if ((type >= OPTIONS_FIRST_STRING_OPTIONID) && (type <= OPTIONS_LAST_STRING_OPTIONID)) { @@ -438,7 +438,7 @@ optionsCopyVolitleOptions(void) parameterItemPtr optionsParamItemNew(const xmlChar * name, const xmlChar * value) { - parameterItemPtr result = NULL; + parameterItemPtr result = nullptr; if (name) { result = (parameterItem *) xmlMalloc(sizeof(parameterItem)); @@ -562,14 +562,14 @@ optionsPrintParamList(void) xmlNodePtr optionsNode(OptionTypeEnum optionType) { - xmlNodePtr node = NULL; + xmlNodePtr node = nullptr; char numberBuffer[10]; int result = 1; numberBuffer[0] = '\0'; if (optionType <= OPTIONS_VERBOSE) { /* integer option */ - node = xmlNewNode(NULL, (xmlChar *) "intoption"); + node = xmlNewNode(nullptr, (xmlChar *) "intoption"); if (node) { snprintf(numberBuffer, sizeof(numberBuffer), "%d", optionsGetIntOption(optionType)); @@ -577,41 +577,41 @@ optionsNode(OptionTypeEnum optionType) (node, (xmlChar *) "name", (xmlChar *) optionNames[optionType - OPTIONS_XINCLUDE]) - != NULL); + != nullptr); if (result) result = result && (xmlNewProp(node, (xmlChar *) "value", (xmlChar *) numberBuffer) != - NULL); + nullptr); if (!result) { xmlFreeNode(node); - node = NULL; + node = nullptr; } } } else { /* string option */ - node = xmlNewNode(NULL, (xmlChar *) "stringoption"); + node = xmlNewNode(nullptr, (xmlChar *) "stringoption"); if (node) { result = result && (xmlNewProp (node, (xmlChar *) "name", (xmlChar *) optionNames[optionType - OPTIONS_XINCLUDE]) - != NULL); + != nullptr); if (result) { if (optionsGetStringOption(optionType)) result = result && (xmlNewProp (node, (xmlChar *) "value", optionsGetStringOption - (optionType)) != NULL); + (optionType)) != nullptr); else result = result && (xmlNewProp (node, (xmlChar *) "value", - (xmlChar *) "") != NULL); + (xmlChar *) "") != nullptr); } if (!result) { xmlFreeNode(node); - node = NULL; + node = nullptr; } } @@ -700,7 +700,7 @@ optionsSavetoFile(xmlChar * fileName) int optionIndex = 0; xmlDocPtr configDoc; xmlNodePtr rootNode; - xmlNodePtr node = NULL; + xmlNodePtr node = nullptr; if (!fileName) { #ifdef WITH_XSLDBG_DEBUG_PROCESS @@ -711,7 +711,7 @@ optionsSavetoFile(xmlChar * fileName) } configDoc = xmlNewDoc((xmlChar *) "1.0"); - rootNode = xmlNewNode(NULL, (xmlChar *) "config"); + rootNode = xmlNewNode(nullptr, (xmlChar *) "config"); if (configDoc && rootNode) { xmlCreateIntSubset(configDoc, (xmlChar *) "config", (xmlChar *) diff --git a/src/kxsldbgpart/libxsldbg/options_unix.cpp b/src/kxsldbgpart/libxsldbg/options_unix.cpp index c2e035d..640b9cc 100644 --- a/src/kxsldbgpart/libxsldbg/options_unix.cpp +++ b/src/kxsldbgpart/libxsldbg/options_unix.cpp @@ -63,7 +63,7 @@ optionsPlatformFree(void) xmlChar * optionsConfigFileName(void) { - xmlChar *result = NULL; + xmlChar *result = nullptr; const char *homeDir = getenv("HOME"); const char *configName = "xsldbg.rc"; int bufferSize = 0; diff --git a/src/kxsldbgpart/libxsldbg/os_cmds.cpp b/src/kxsldbgpart/libxsldbg/os_cmds.cpp index 8c5e26e..d1bf3a8 100644 --- a/src/kxsldbgpart/libxsldbg/os_cmds.cpp +++ b/src/kxsldbgpart/libxsldbg/os_cmds.cpp @@ -69,7 +69,7 @@ xslDbgShellExecute(xmlChar * name, int verbose) /* Quick check to see if we have a command processor; embedded systems * may not have such a thing */ - if (system(NULL) == 0) { + if (system(nullptr) == 0) { xsldbgGenericErrorFunc(i18n("Error: No command processor available for shell command \"%1\".\n").arg(xsldbgText(name))); } else { int return_code; diff --git a/src/kxsldbgpart/libxsldbg/param_cmds.cpp b/src/kxsldbgpart/libxsldbg/param_cmds.cpp index befa330..098e718 100644 --- a/src/kxsldbgpart/libxsldbg/param_cmds.cpp +++ b/src/kxsldbgpart/libxsldbg/param_cmds.cpp @@ -44,7 +44,7 @@ int xslDbgShellAddParam(xmlChar * arg) { int result = 0; - parameterItemPtr paramItem = NULL; + parameterItemPtr paramItem = nullptr; static const char *errorPrompt = I18N_NOOP("Failed to add parameter"); xmlChar *opts[2]; @@ -55,7 +55,7 @@ xslDbgShellAddParam(xmlChar * arg) int count; for (count = 0; count < arrayListCount(optionsGetParamItemList()); count++){ paramItem = (parameterItemPtr)arrayListGet(optionsGetParamItemList(), count); - if (paramItem != NULL){ + if (paramItem){ if (xmlStrCmp(opts[0], paramItem->name) == 0){ /* parameter exist just update its value */ if (paramItem->value) @@ -152,12 +152,12 @@ xslDbgShellShowParam(xmlChar * arg) notifyListStart(XSLDBG_MSG_PARAMETER_CHANGED); if (itemCount > 0) { - parameterItemPtr paramItem = NULL; + parameterItemPtr paramItem = nullptr; while (paramIndex < itemCount) { paramItem = (parameterItemPtr) arrayListGet(optionsGetParamItemList(), paramIndex++); - if (paramItem != NULL) + if (paramItem) notifyListQueue(paramItem); } } diff --git a/src/kxsldbgpart/libxsldbg/search.cpp b/src/kxsldbgpart/libxsldbg/search.cpp index 6d30193..30a818c 100644 --- a/src/kxsldbgpart/libxsldbg/search.cpp +++ b/src/kxsldbgpart/libxsldbg/search.cpp @@ -106,13 +106,13 @@ void int searchInit(void) { - searchDataBase = NULL; - searchDataBaseRoot = NULL; - lastQuery = NULL; + searchDataBase = nullptr; + searchDataBaseRoot = nullptr; + lastQuery = nullptr; if (!searchEmpty()) { xsldbgGenericErrorFunc(i18n("Error: Out of memory.\n")); } - return (searchRootNode() != NULL); + return (searchRootNode() != nullptr); } @@ -126,8 +126,8 @@ searchFree(void) { if (searchDataBase) { xmlFreeDoc(searchDataBase); - searchDataBase = NULL; - searchDataBaseRoot = NULL; + searchDataBase = nullptr; + searchDataBaseRoot = nullptr; } } @@ -144,7 +144,7 @@ searchFree(void) searchInfoPtr searchNewInfo(SearchEnum type) { - searchInfoPtr result = NULL; + searchInfoPtr result = nullptr; int searchType = type; switch (searchType) { @@ -158,12 +158,12 @@ searchNewInfo(SearchEnum type) xmlMalloc(sizeof(breakPointSearchData)); if (searchData) { searchData->id = -1; - searchData->templateName = NULL; - searchData->breakPtr = NULL; + searchData->templateName = nullptr; + searchData->breakPtr = nullptr; result->data = searchData; } else { xmlFree(result); - result = NULL; + result = nullptr; } } break; @@ -177,16 +177,16 @@ searchNewInfo(SearchEnum type) searchData = (nodeSearchDataPtr) xmlMalloc(sizeof(nodeSearchData)); if (searchData) { - searchData->node = NULL; + searchData->node = nullptr; searchData->lineNo = -1; - searchData->url = NULL; - searchData->nameInput = NULL; - searchData->guessedNameMatch = NULL; - searchData->absoluteNameMatch = NULL; + searchData->url = nullptr; + searchData->nameInput = nullptr; + searchData->guessedNameMatch = nullptr; + searchData->absoluteNameMatch = nullptr; result->data = searchData; } else { xmlFree(result); - result = NULL; + result = nullptr; } } break; @@ -203,13 +203,13 @@ searchNewInfo(SearchEnum type) searchData = (variableSearchDataPtr) xmlMalloc(sizeof(variableSearchData)); if (searchData) { - searchData->name = NULL; - searchData->nameURI = NULL; - searchData->select = NULL; + searchData->name = nullptr; + searchData->nameURI = nullptr; + searchData->select = nullptr; result->data = searchData; } else { xmlFree(result); - result = NULL; + result = nullptr; } } break; @@ -308,27 +308,27 @@ searchEmpty(void) xmlFreeDoc(searchDataBase); } searchDataBase = xmlNewDoc((xmlChar *) "1.0"); - searchDataBaseRoot = NULL; + searchDataBaseRoot = nullptr; if (searchDataBase) { xmlCreateIntSubset(searchDataBase, (xmlChar *) "search", (xmlChar *) "-//xsldbg//DTD search XML V1.1//EN", (xmlChar *) "search_v1_1.dtd"); - searchDataBaseRoot = xmlNewNode(NULL, (xmlChar *) "search"); + searchDataBaseRoot = xmlNewNode(nullptr, (xmlChar *) "search"); if (searchDataBaseRoot) xmlAddChild((xmlNodePtr) searchDataBase, searchDataBaseRoot); } if (lastQuery) xmlFree(lastQuery); - lastQuery = NULL; - if (searchRootNode() == NULL) { + lastQuery = nullptr; + if (!searchRootNode()) { #ifdef WITH_XSLDBG_DEBUG_PROCESS xsltGenericError(xsltGenericErrorContext, "Error: Unable to clear old search results, memory error?\n"); #endif } - return (searchRootNode() != NULL); + return (searchRootNode() != nullptr); } @@ -401,9 +401,9 @@ searchSave(const xmlChar * fileName) { int result = 0; - xmlChar *searchInput = NULL; + xmlChar *searchInput = nullptr; - if (fileName == NULL) + if (!fileName) searchInput = filesSearchFileName(FILES_SEARCHINPUT); else searchInput = xmlStrdup(fileName); @@ -442,17 +442,17 @@ searchQuery(const xmlChar * tempFile, const xmlChar * outputFile, int result = 0; /* The file name of where the input is comming from */ - xmlChar *searchInput = NULL; + xmlChar *searchInput = nullptr; /* The XSL file name to use during transformation of searchInput */ - xmlChar *searchXSL = NULL; + xmlChar *searchXSL = nullptr; /* Where to store the result of transformation */ - xmlChar *searchOutput = NULL; + xmlChar *searchOutput = nullptr; /* if a tempFile if provided its up you to make sure that it is correct !! */ - if (tempFile == NULL) + if (!tempFile) searchInput = filesSearchFileName(FILES_SEARCHINPUT); else searchInput = xmlStrdup(tempFile); @@ -460,7 +460,7 @@ searchQuery(const xmlChar * tempFile, const xmlChar * outputFile, searchXSL = filesSearchFileName(FILES_SEARCHXSL); /* if a outputFile if provided its up you to make sure that it is correct */ - if (outputFile == NULL) + if (!outputFile) searchOutput = filesSearchFileName(FILES_SEARCHRESULT); else searchOutput = xmlStrdup(outputFile); @@ -483,7 +483,7 @@ searchQuery(const xmlChar * tempFile, const xmlChar * outputFile, if (result && (optionsGetIntOption(OPTIONS_PREFER_HTML) == 0)) { /* try printing out the file */ - result = filesMoreFile(searchOutput, NULL); + result = filesMoreFile(searchOutput, nullptr); } xsldbgGenericErrorFunc(i18n("Information: Transformed %1 using %2 and saved to %3.\n").arg(xsldbgText(searchInput)).arg(xsldbgText(searchXSL)).arg(xsldbgText(searchOutput))); @@ -523,7 +523,7 @@ scanForBreakPoint(void *payload, void *data, Q_UNUSED(name); breakPointPtr breakPtr = (breakPointPtr) payload; searchInfoPtr searchInf = (searchInfoPtr) data; - breakPointSearchDataPtr searchData = NULL; + breakPointSearchDataPtr searchData = nullptr; int found = 0; if (!payload || !searchInf || !searchInf->data @@ -563,9 +563,9 @@ scanForNode(void *payload, void *data, xmlChar * name) { Q_UNUSED(name); searchInfoPtr searchInf = (searchInfoPtr) data; - nodeSearchDataPtr searchData = NULL; + nodeSearchDataPtr searchData = nullptr; xmlNodePtr node = (xmlNodePtr) payload; - xmlChar *baseUri = NULL; + xmlChar *baseUri = nullptr; int match = 1; if (!node || !node->doc || !node->doc->URL || @@ -637,9 +637,9 @@ xmlNodePtr findNodeByLineNo(xsltTransformContextPtr ctxt, const xmlChar * url, long lineNumber) { - xmlNodePtr result = NULL; + xmlNodePtr result = nullptr; searchInfoPtr searchInf = searchNewInfo(SEARCH_NODE); - nodeSearchDataPtr searchData = NULL; + nodeSearchDataPtr searchData = nullptr; if (!searchInf) { #ifdef WITH_XSLDBG_DEBUG_PROCESS @@ -692,7 +692,7 @@ findNodeByLineNo(xsltTransformContextPtr ctxt, xmlNodePtr findTemplateNode(xsltStylesheetPtr style, const xmlChar * name) { - xmlNodePtr result = NULL; + xmlNodePtr result = nullptr; xmlChar *templName; xsltTemplatePtr templ; @@ -745,7 +745,7 @@ findTemplateNode(xsltStylesheetPtr style, const xmlChar * name) breakPointPtr findBreakPointByName(const xmlChar * templateName) { - breakPointPtr result = NULL; + breakPointPtr result = nullptr; searchInfoPtr searchInf = searchNewInfo(SEARCH_BREAKPOINT); breakPointSearchDataPtr searchData; @@ -784,7 +784,7 @@ findBreakPointByName(const xmlChar * templateName) breakPointPtr findBreakPointById(int id) { - breakPointPtr result = NULL; + breakPointPtr result = nullptr; searchInfoPtr searchInf = searchNewInfo(SEARCH_BREAKPOINT); breakPointSearchDataPtr searchData; @@ -822,7 +822,7 @@ xmlXPathObjectPtr findNodesByQuery(const xmlChar * query) { Q_UNUSED(query); - xmlXPathObjectPtr list = NULL; + xmlXPathObjectPtr list = nullptr; return list; } @@ -875,7 +875,7 @@ walkTemplates(xmlHashScanner walkFunc, void *data, xsltStylesheetPtr style) while (style) { templ = style->templates; while (templ) { - (*walkFunc) (templ, data, NULL); + (*walkFunc) (templ, data, nullptr); templ = templ->next; } if (style->next) @@ -906,7 +906,7 @@ walkStylesheets(xmlHashScanner walkFunc, void *data, next = style->next; while (style) { - (*walkFunc) (style, data, NULL); + (*walkFunc) (style, data, nullptr); if (style->imports) style = style->imports; else @@ -916,7 +916,7 @@ walkStylesheets(xmlHashScanner walkFunc, void *data, -xmlHashScanner globalWalkFunc = NULL; +xmlHashScanner globalWalkFunc = nullptr; /** * globalVarHelper: @@ -941,7 +941,7 @@ globalVarHelper(void **payload, void *data, global = style->variables; while (global &&global->comp) { - (*globalWalkFunc) (global->comp->inst, data, NULL); + (*globalWalkFunc) (global->comp->inst, data, nullptr); global = global->next; } } @@ -972,7 +972,7 @@ walkGlobals(xmlHashScanner walkFunc, void *data, -xmlHashScanner localWalkFunc = NULL; +xmlHashScanner localWalkFunc = nullptr; /** * localVarHelper: @@ -999,7 +999,7 @@ localVarHelper(void **payload, void *data, while (node) { if (IS_XSLT_NAME(node, "param") || IS_XSLT_NAME(node, "variable")) { - (*localWalkFunc) (node, data, NULL); + (*localWalkFunc) (node, data, nullptr); node = node->next; } else break; @@ -1052,7 +1052,7 @@ walkIncludes(xmlHashScanner walkFunc, void *data, xsltStylesheetPtr style) document = style->docList; /* look at included documents */ while (document) { - (*walkFunc) ((xmlNodePtr) document->doc, data, NULL); + (*walkFunc) ((xmlNodePtr) document->doc, data, nullptr); document = document->next; } /* try next stylesheet */ @@ -1077,7 +1077,7 @@ void walkIncludeInst(xmlHashScanner walkFunc, void *data, xsltStylesheetPtr style) { - xmlNodePtr node = NULL, styleChild = NULL; + xmlNodePtr node = nullptr, styleChild = nullptr; if (!walkFunc || !style) return; @@ -1099,7 +1099,7 @@ walkIncludeInst(xmlHashScanner walkFunc, void *data, /* look for includes */ while (styleChild) { if (IS_XSLT_NAME(styleChild, "include")) - (*walkFunc) (styleChild, data, NULL); + (*walkFunc) (styleChild, data, nullptr); styleChild = styleChild->next; } } @@ -1124,14 +1124,14 @@ walkIncludeInst(xmlHashScanner walkFunc, void *data, void walkChildNodes(xmlHashScanner walkFunc, void *data, xmlNodePtr node) { - xmlNodePtr child = NULL; + xmlNodePtr child = nullptr; searchInfoPtr searchInf = (searchInfoPtr) data; if (!walkFunc || !searchInf || !searchInf->data) return; while (node && !searchInf->found) { - (walkFunc) (node, data, NULL); + (walkFunc) (node, data, nullptr); child = node->children; if (child && !searchInf->found) { walkChildNodes(walkFunc, data, child); @@ -1155,43 +1155,25 @@ xmlNodePtr searchBreakPointNode(breakPointPtr breakPtr) { - xmlNodePtr node = NULL; + xmlNodePtr node = nullptr; int result = 1; if (breakPtr) { - node = xmlNewNode(NULL, (xmlChar *) "breakpoint"); + node = xmlNewNode(nullptr, (xmlChar *) "breakpoint"); if (node) { /* if unable to create any property failed then result will be equal to 0 */ - result = result - && (xmlNewProp(node, (xmlChar *) "url", breakPtr->url) != - NULL); + result = result && xmlNewProp(node, (xmlChar *) "url", breakPtr->url); sprintf((char *) searchBuffer, "%ld", breakPtr->lineNo); - result = result - && - (xmlNewProp(node, (xmlChar *) "line", (xmlChar *) searchBuffer) - != NULL); + result = result && xmlNewProp(node, (xmlChar *) "line", (xmlChar *) searchBuffer); if (breakPtr->templateName) { - result = result - && - (xmlNewProp - (node, (xmlChar *) "template", - breakPtr->templateName) != NULL); + result = result && xmlNewProp(node, (xmlChar *) "template", breakPtr->templateName); } sprintf((char *) searchBuffer, "%d", breakPtr->flags & BREAKPOINT_ENABLED); - result = result - && - (xmlNewProp - (node, (xmlChar *) "enabled", (xmlChar *) searchBuffer) - != NULL); + result = result && xmlNewProp(node, (xmlChar *) "enabled", (xmlChar *) searchBuffer); sprintf((char *) searchBuffer, "%d", breakPtr->type); - result = result - && - (xmlNewProp(node, (xmlChar *) "type", (xmlChar *) searchBuffer) - != NULL); + result = result && xmlNewProp(node, (xmlChar *) "type", (xmlChar *) searchBuffer); sprintf((char *) searchBuffer, "%d", breakPtr->id); - result = result - && (xmlNewProp(node, (xmlChar *) "id", (xmlChar *) searchBuffer) - != NULL); + result = result && xmlNewProp(node, (xmlChar *) "id", (xmlChar *) searchBuffer); } else result = 0; if (!result) { @@ -1215,40 +1197,29 @@ searchBreakPointNode(breakPointPtr breakPtr) xmlNodePtr searchTemplateNode(xmlNodePtr templNode) { - xmlNodePtr node = NULL; + xmlNodePtr node = nullptr; xmlChar *value; int result = 1; if (templNode) { - node = xmlNewNode(NULL, (xmlChar *) "template"); + node = xmlNewNode(nullptr, (xmlChar *) "template"); if (node) { /* if unable to create any property failed then result will be equal to 0 */ value = xmlGetProp(templNode, (xmlChar *) "match"); if (value) { - result = result - && (xmlNewProp(node, (xmlChar *) "match", value) != - NULL); + result = result && xmlNewProp(node, (xmlChar *) "match", value); xmlFree(value); } value = xmlGetProp(templNode, (xmlChar *) "name"); if (value) { - result = result - && (xmlNewProp(node, (xmlChar *) "name", value) != - NULL); + result = result && xmlNewProp(node, (xmlChar *) "name", value); xmlFree(value); } if (templNode->doc) { - result = result - && - (xmlNewProp - (node, (xmlChar *) "url", - templNode->doc->URL) != NULL); + result = result && xmlNewProp(node, (xmlChar *) "url", templNode->doc->URL); } sprintf((char *) searchBuffer, "%ld", xmlGetLineNo(templNode)); - result = result - && - (xmlNewProp(node, (xmlChar *) "line", (xmlChar *) searchBuffer) - != NULL); + result = result && xmlNewProp(node, (xmlChar *) "line", (xmlChar *) searchBuffer); if (result) { xmlNodePtr textNode = searchCommentNode(templNode); @@ -1278,35 +1249,27 @@ searchTemplateNode(xmlNodePtr templNode) xmlNodePtr searchGlobalNode(xmlNodePtr variable) { - xmlNodePtr node = NULL; + xmlNodePtr node = nullptr; int result = 1; xmlChar *value; if (variable) { - node = xmlNewNode(NULL, (xmlChar *) "variable"); + node = xmlNewNode(nullptr, (xmlChar *) "variable"); if (node) { /* if unable to create any property failed then result will be equal to 0 */ if (variable->doc) { - result = result && - (xmlNewProp(node, (xmlChar *) "url", - variable->doc->URL) != NULL); + result = result && xmlNewProp(node, (xmlChar *) "url", variable->doc->URL); sprintf((char *) searchBuffer, "%ld", xmlGetLineNo(variable)); - result = result - && (xmlNewProp(node, (xmlChar *) "line", - (xmlChar *) searchBuffer) != NULL); + result = result && xmlNewProp(node, (xmlChar *) "line", (xmlChar *) searchBuffer); } value = xmlGetProp(variable, (xmlChar *) "name"); if (value) { - result = result - && (xmlNewProp(node, (xmlChar *) "name", value) != - NULL); + result = result && xmlNewProp(node, (xmlChar *) "name", value); xmlFree(value); } value = xmlGetProp(variable, (xmlChar *) "select"); if (value) { - result = result - && (xmlNewProp(node, (xmlChar *) "select", value) != - NULL); + result = result && xmlNewProp(node, (xmlChar *) "select", value); xmlFree(value); } if (result) { @@ -1338,7 +1301,7 @@ searchGlobalNode(xmlNodePtr variable) xmlNodePtr searchLocalNode(xmlNodePtr variable) { - xmlNodePtr node = NULL; + xmlNodePtr node = nullptr; int result = 1; xmlChar *value; xmlNodePtr parent; @@ -1352,18 +1315,12 @@ searchLocalNode(xmlNodePtr variable) if (parent && IS_XSLT_NAME(parent, "template")) { value = xmlGetProp(parent, (xmlChar *) "name"); if (value) { - result = result - && - (xmlNewProp(node, (xmlChar *) "templname", value) - != NULL); + result = result && xmlNewProp(node, (xmlChar *) "templname", value); xmlFree(value); } value = xmlGetProp(parent, (xmlChar *) "match"); if (value) { - result = result - && - (xmlNewProp(node, (xmlChar *) "templmatch", value) - != NULL); + result = result && xmlNewProp(node, (xmlChar *) "templmatch", value); xmlFree(value); } } @@ -1389,24 +1346,20 @@ searchLocalNode(xmlNodePtr variable) xmlNodePtr searchSourceNode(xsltStylesheetPtr style) { - xmlNodePtr node = NULL; + xmlNodePtr node = nullptr; int result = 1; if (style) { - if (style->parent == NULL) - node = xmlNewNode(NULL, (xmlChar *) "source"); + if (!style->parent) + node = xmlNewNode(nullptr, (xmlChar *) "source"); else - node = xmlNewNode(NULL, (xmlChar *) "import"); + node = xmlNewNode(nullptr, (xmlChar *) "import"); if (node) { /* if unable to create any property failed then result will be equal to 0 */ if (style->doc) { - result = result && - (xmlNewProp(node, (xmlChar *) "href", style->doc->URL) - != NULL); + result = result && xmlNewProp(node, (xmlChar *) "href", style->doc->URL); if (style->parent && style->parent->doc) { - result = result && - (xmlNewProp(node, (xmlChar *) "parent", - style->parent->doc->URL) != NULL); + result = result && xmlNewProp(node, (xmlChar *) "parent", style->parent->doc->URL); } if (result) { xmlNodePtr textNode = @@ -1437,30 +1390,24 @@ searchSourceNode(xsltStylesheetPtr style) xmlNodePtr searchIncludeNode(xmlNodePtr include) { - xmlNodePtr node = NULL; + xmlNodePtr node = nullptr; int result = 1; xmlChar *value; if (include) { - node = xmlNewNode(NULL, (xmlChar *) "include"); + node = xmlNewNode(nullptr, (xmlChar *) "include"); if (node) { /* if unable to create any property failed then result will be equal to 0 */ if (include->doc) { value = xmlGetProp(include, (xmlChar *) "href"); if (value) { - result = result - && (xmlNewProp(node, (xmlChar *) "href", value) != - NULL); + result = result && xmlNewProp(node, (xmlChar *) "href", value); xmlFree(value); } if (include->parent && include->parent->doc) { - result = result && - (xmlNewProp(node, (xmlChar *) "url", - include->parent->doc->URL) != NULL); + result = result && xmlNewProp(node, (xmlChar *) "url", include->parent->doc->URL); sprintf((char *) searchBuffer, "%ld", xmlGetLineNo(include)); - result = result - && (xmlNewProp(node, (xmlChar *) "line", - (xmlChar *) searchBuffer) != NULL); + result = result && xmlNewProp(node, (xmlChar *) "line", (xmlChar *) searchBuffer); } if (result) { xmlNodePtr textNode = searchCommentNode(include); @@ -1492,29 +1439,19 @@ searchIncludeNode(xmlNodePtr include) xmlNodePtr searchCallStackNode(callPointPtr callStackItem) { - xmlNodePtr node = NULL; + xmlNodePtr node = nullptr; int result = 1; if (callStackItem) { - node = xmlNewNode(NULL, (xmlChar *) "callstack"); + node = xmlNewNode(nullptr, (xmlChar *) "callstack"); if (node) { /* if unable to create any property failed then result will be equal to 0 */ if (callStackItem->info && callStackItem->info->url) - result = result - && - (xmlNewProp - (node, (xmlChar *) "url", callStackItem->info->url) - != NULL); + result = result && xmlNewProp(node, (xmlChar *) "url", callStackItem->info->url); sprintf((char *) searchBuffer, "%ld", callStackItem->lineNo); - result = result - && - (xmlNewProp(node, (xmlChar *) "line", (xmlChar *) searchBuffer) - != NULL); + result = result && xmlNewProp(node, (xmlChar *) "line", (xmlChar *) searchBuffer); if (callStackItem->info && callStackItem->info->templateName) { - result = result && - (xmlNewProp - (node, (xmlChar *) "template", - callStackItem->info->templateName) != NULL); + result = result && xmlNewProp(node, (xmlChar *) "template", callStackItem->info->templateName); } } else result = 0; @@ -1535,7 +1472,7 @@ static xmlChar *commentText(xmlNodePtr node); xmlChar * commentText(xmlNodePtr node) { - xmlChar *result = NULL; + xmlChar *result = nullptr; if (node) { if (node->type == XML_COMMENT_NODE) @@ -1559,8 +1496,8 @@ commentText(xmlNodePtr node) xmlNodePtr searchCommentNode(xmlNodePtr sourceNode) { - xmlNodePtr node = NULL, textChild = NULL; - xmlChar *text = NULL; + xmlNodePtr node = nullptr, textChild = nullptr; + xmlChar *text = nullptr; int result = 0; if (sourceNode) { @@ -1570,7 +1507,7 @@ searchCommentNode(xmlNodePtr sourceNode) } if (text) { - node = xmlNewNode(NULL, (xmlChar *) "comment"); + node = xmlNewNode(nullptr, (xmlChar *) "comment"); textChild = xmlNewText(text); if (node && textChild && xmlAddChild(node, textChild)) { result = 1; @@ -1578,7 +1515,7 @@ searchCommentNode(xmlNodePtr sourceNode) if (!result) { if (node) { xmlFreeNode(node); - node = NULL; + node = nullptr; } if (textChild) xmlFreeNode(textChild); diff --git a/src/kxsldbgpart/libxsldbg/search_cmds.cpp b/src/kxsldbgpart/libxsldbg/search_cmds.cpp index 1dc6519..f980144 100644 --- a/src/kxsldbgpart/libxsldbg/search_cmds.cpp +++ b/src/kxsldbgpart/libxsldbg/search_cmds.cpp @@ -48,7 +48,7 @@ xslDbgShellSearch(xsltTransformContextPtr styleCtxt, const xmlChar *sortOption = (xmlChar *) "-sort "; int sortOptionLen = xmlStrLen(sortOption); - if (optionsGetStringOption(OPTIONS_DOCS_PATH) == NULL) { + if (!optionsGetStringOption(OPTIONS_DOCS_PATH)) { xsldbgGenericErrorFunc(i18n("Error: No path to documentation; aborting searching.\n")); #ifdef USE_DOCS_MACRO xsldbgGenericErrorFunc(i18n("Error: Error in value of USE_DOCS_MACRO; look at Makefile.am.\n")); @@ -63,7 +63,7 @@ xslDbgShellSearch(xsltTransformContextPtr styleCtxt, return result; } - result = updateSearchData(styleCtxt, style, NULL, DEBUG_ANY_VAR); + result = updateSearchData(styleCtxt, style, nullptr, DEBUG_ANY_VAR); trimString(arg); if (xmlStrLen(arg) == 0) { arg = (xmlChar *) "//search/*"; @@ -75,13 +75,13 @@ xslDbgShellSearch(xsltTransformContextPtr styleCtxt, ((char *) buff, DEBUG_BUFFER_SIZE, "--param dosort 1 --param query \"%s\"", &arg[sortOptionLen])) { - result = result && searchQuery(NULL, NULL, buff); + result = result && searchQuery(nullptr, nullptr, buff); } } else { if (snprintf ((char *) buff, DEBUG_BUFFER_SIZE, "--param dosort 0 --param query \"%s\"", arg)) { - result = result && searchQuery(NULL, NULL, buff); + result = result && searchQuery(nullptr, nullptr, buff); } } return result; diff --git a/src/kxsldbgpart/libxsldbg/template_cmds.cpp b/src/kxsldbgpart/libxsldbg/template_cmds.cpp index bd4e297..ae73f46 100644 --- a/src/kxsldbgpart/libxsldbg/template_cmds.cpp +++ b/src/kxsldbgpart/libxsldbg/template_cmds.cpp @@ -125,7 +125,7 @@ printTemplateHelper(xsltTemplatePtr templ, int verbose, /* search for template name supplied failed */ /* empty */ } else { - xmlChar *modeTemp = NULL; + xmlChar *modeTemp = nullptr; *count = *count + 1; if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListQueue(templ); @@ -175,7 +175,7 @@ xslDbgShellPrintTemplateNames(xsltTransformContextPtr styleCtxt, xsltTemplatePtr templ; if (xmlStrLen(arg) == 0) { - arg = NULL; + arg = nullptr; } else { allFiles = 1; /* make sure we find it if we can */ } @@ -193,7 +193,7 @@ xslDbgShellPrintTemplateNames(xsltTransformContextPtr styleCtxt, if (debugXSLGetTemplate()) curStyle = debugXSLGetTemplate()->style; else - curStyle = NULL; + curStyle = nullptr; } if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { @@ -310,17 +310,17 @@ xslDbgShellPrintStyleSheets(xmlChar * arg) if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_SOURCE_CHANGED); walkStylesheets((xmlHashScanner) xslDbgShellPrintStylesheetsHelper, - NULL, filesGetStylesheet()); + nullptr, filesGetStylesheet()); notifyListSend(); notifyListStart(XSLDBG_MSG_INCLUDED_SOURCE_CHANGED); walkIncludes((xmlHashScanner) xslDbgShellPrintStylesheetsHelper2, - NULL, filesGetStylesheet()); + nullptr, filesGetStylesheet()); notifyListSend(); } else { walkStylesheets((xmlHashScanner) xslDbgShellPrintStylesheetsHelper, - NULL, filesGetStylesheet()); + nullptr, filesGetStylesheet()); walkIncludes((xmlHashScanner) xslDbgShellPrintStylesheetsHelper2, - NULL, filesGetStylesheet()); + nullptr, filesGetStylesheet()); if (printCounter != 0) xsldbgGenericErrorFunc(i18n("\tTotal of %n XSLT stylesheet found.", "\tTotal of %n XSLT stylesheets found.", printCounter) + TQString("\n")); else diff --git a/src/kxsldbgpart/libxsldbg/utils.cpp b/src/kxsldbgpart/libxsldbg/utils.cpp index d1005fd..d7d613b 100644 --- a/src/kxsldbgpart/libxsldbg/utils.cpp +++ b/src/kxsldbgpart/libxsldbg/utils.cpp @@ -168,11 +168,11 @@ lookupName(xmlChar * name, xmlChar ** matchList) xmlChar * fullTQName(const xmlChar* nameURI, const xmlChar * name) { - xmlChar *result = NULL; + xmlChar *result = nullptr; if (!nameURI && !name) result = xmlStrdup((xmlChar*)""); else{ - if (nameURI == NULL){ + if (!nameURI){ result = xmlStrdup(name); }else{ result = (xmlChar*) xmlMalloc(sizeof(char) * ( diff --git a/src/kxsldbgpart/libxsldbg/variable_cmds.cpp b/src/kxsldbgpart/libxsldbg/variable_cmds.cpp index a3a4df5..7787eeb 100644 --- a/src/kxsldbgpart/libxsldbg/variable_cmds.cpp +++ b/src/kxsldbgpart/libxsldbg/variable_cmds.cpp @@ -47,18 +47,18 @@ xslDbgShellSetVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg) if (xmlStrLen(arg) > 1) { if (splitString(arg, 2, opts) == 2) { - nameURI = NULL; + nameURI = nullptr; /* ignore any "$" prefix as user probably didn't mean that "$" is part of variable name*/ if (*opts[0] =='$'){ opts[0] = opts[0] + 1; } name = xmlSplitQName2(opts[0], &nameURI); - if (name == NULL) + if (!name) name = xmlStrdup(opts[0]); selectExpr = xmlStrdup(opts[1]); if (name && selectExpr) { - xsltStackElemPtr def = NULL; + xsltStackElemPtr def = nullptr; if (styleCtxt->varsNr && styleCtxt->varsTab) { /* try finding varaible in stack */ @@ -66,7 +66,7 @@ xslDbgShellSetVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg) xsltStackElemPtr item = styleCtxt->varsTab[i-1]; while (item) { if ((xmlStrCmp(name, item->name) == 0) && - (item->nameURI == NULL + (!item->nameURI || (xmlStrCmp(name, item->nameURI) == 0))) { def = item; break; @@ -76,14 +76,14 @@ xslDbgShellSetVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg) } } - if (def == NULL) + if (!def) def = (xsltStackElemPtr) xmlHashLookup2(styleCtxt->globalVars, name, nameURI); - if (def != NULL) { + if (def) { if (def->select) { def->select = xmlDictLookup(styleCtxt->dict, selectExpr, -1); - def->tree = NULL; /* maybe a memory leak, but play it safe */ + def->tree = nullptr; /* maybe a memory leak, but play it safe */ def->computed = 1; if (def->comp->comp) xmlXPathFreeCompExpr(def->comp->comp); diff --git a/src/kxsldbgpart/libxsldbg/xsldbg.cpp b/src/kxsldbgpart/libxsldbg/xsldbg.cpp index 0d35f89..5a7a16e 100644 --- a/src/kxsldbgpart/libxsldbg/xsldbg.cpp +++ b/src/kxsldbgpart/libxsldbg/xsldbg.cpp @@ -138,12 +138,12 @@ This is required such that we can invoke ourselves for processing search or help messages where our executable does not exist on the current run path */ -char *xsldbgCommand = NULL; +char *xsldbgCommand = nullptr; #endif xmlSAXHandler mySAXhdlr; -FILE *errorFile = NULL; /* we'll set this just before starting debugger */ +FILE *errorFile = nullptr; /* we'll set this just before starting debugger */ xmlParserInputPtr xmlNoNetExternalEntityLoader(const char *URL, const char *ID, @@ -214,7 +214,7 @@ xmlEntityPtr (*oldGetEntity)( void * user_data, const xmlChar * name); static xmlEntityPtr xsldbgGetEntity( void * user_data, const xmlChar * name) { - xmlEntityPtr ent = NULL; + xmlEntityPtr ent = nullptr; if (oldGetEntity){ ent = (oldGetEntity)(user_data, name); if (ent) @@ -242,7 +242,7 @@ static struct timeval begin, end; static void startTimer(void) { - gettimeofday(&begin, NULL); + gettimeofday(&begin, nullptr); } /* @@ -255,7 +255,7 @@ endTimer(const TQString& message) { long msec; - gettimeofday(&end, NULL); + gettimeofday(&end, nullptr); msec = end.tv_sec - begin.tv_sec; msec *= 1000; msec += (end.tv_usec - begin.tv_usec) / 1000; @@ -346,7 +346,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) } } - params[nbparams] = NULL; + params[nbparams] = nullptr; #ifdef LIBXML_XINCLUDE_ENABLED if (optionsGetIntOption(OPTIONS_XINCLUDE)) { @@ -362,7 +362,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) if (optionsGetIntOption(OPTIONS_TIMING) || optionsGetIntOption(OPTIONS_PROFILING)) startTimer(); - if ((optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) == NULL) || + if (!optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) || optionsGetIntOption(OPTIONS_SHELL)) { if (optionsGetIntOption(OPTIONS_REPEAT)) { int j; @@ -374,18 +374,18 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) } } if (optionsGetIntOption(OPTIONS_PROFILING)) { - if (terminalIO != NULL) + if (terminalIO) res = xsltProfileStylesheet(cur, doc, params, terminalIO); - else if ((optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) == - NULL) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) - || (filesTempFileName(1) == NULL)) + else if (!optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) || + getThreadStatus() != XSLDBG_MSG_THREAD_RUN || + !filesTempFileName(1)) res = xsltProfileStylesheet(cur, doc, params, stderr); else { /* We now have to output to using notify using * temp file #1 */ FILE *tempFile = fopen(filesTempFileName(1), "w"); - if (tempFile != NULL) { + if (tempFile) { res = xsltProfileStylesheet(cur, doc, params, tempFile); fclose(tempFile); @@ -408,7 +408,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) /* Display how long it took to apply stylesheet */ endTimer(i18n("Applying stylesheet")); } - if (res == NULL) { + if (!res) { #ifdef WITH_XSLDBG_DEBUG_PROCESS xsltGenericError(xsltGenericErrorContext, "Error: Transformation did not complete writing to file %s\n", optionsGetStringOption @@ -423,11 +423,11 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) #ifdef LIBXML_DEBUG_ENABLED if (optionsGetIntOption(OPTIONS_DEBUG)) { if (xslDebugStatus != DEBUG_RUN_RESTART){ - if (terminalIO != NULL) + if (terminalIO) xmlDebugDumpDocument(terminalIO, res); - else if ((optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) == NULL) - || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) - || (filesTempFileName(1) == NULL)) + else if (!optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) + || getThreadStatus() != XSLDBG_MSG_THREAD_RUN + || !filesTempFileName(1)) xmlDebugDumpDocument(stdout, res); else { FILE *tempFile = fopen(filesTempFileName(1), "w"); @@ -449,13 +449,13 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) } else { #endif if (xslDebugStatus != DEBUG_RUN_RESTART){ - if (cur->methodURI == NULL) { + if (!cur->methodURI) { if (optionsGetIntOption(OPTIONS_TIMING)) startTimer(); if (xslDebugStatus != DEBUG_QUIT) { - if (terminalIO != NULL) + if (terminalIO) bytesWritten = xsltSaveResultToFile(terminalIO, res, cur); - else if (optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) == NULL) + else if (!optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)) bytesWritten = xsltSaveResultToFile(stdout, res, cur); else{ bytesWritten = xsltSaveResultToFilename( @@ -471,9 +471,9 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) xsldbgGenericErrorFunc(i18n("Warning: Generating non-standard output XHTML.\n")); if (optionsGetIntOption(OPTIONS_TIMING)) startTimer(); - if (terminalIO != NULL) + if (terminalIO) bytesWritten = xsltSaveResultToFile(terminalIO, res, cur); - else if (optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) == NULL) + else if (!optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)) bytesWritten = xsltSaveResultToFile(stdout, res, cur); else bytesWritten = xsltSaveResultToFilename( @@ -497,7 +497,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) if (userCtxt){ bytesWritten = xsltRunStylesheetUser(cur, doc, params, (char *)optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME), - NULL, NULL, NULL, userCtxt); + nullptr, nullptr, nullptr, userCtxt); if (optionsGetIntOption(OPTIONS_TIMING)) endTimer(i18n("Running stylesheet and saving result")); xsltFreeTransformContext(userCtxt); @@ -515,7 +515,7 @@ xsldbgMain(int argc, char **argv) Q_UNUSED(argc); Q_UNUSED(argv); int i=0, result = 1, noFilesFound = 0; - xsltStylesheetPtr cur = NULL; + xsltStylesheetPtr cur = nullptr; xmlChar *expandedName; /* contains file name with path expansion if any */ /* in some cases we always want to bring up a command prompt */ @@ -636,7 +636,7 @@ xsldbgMain(int argc, char **argv) if (args){ if (args->isSet("verbose") && result) - xsltSetGenericDebugFunc(stderr, NULL); + xsltSetGenericDebugFunc(stderr, nullptr); TQCString outFile = args->getOption("output"); if (!outFile.isEmpty() && result) @@ -716,8 +716,8 @@ xsldbgMain(int argc, char **argv) xsldbgReachedFirstTemplate = false; /* don't force xsldbg to show command prompt */ showPrompt = 0; - cur = NULL; - doc = NULL; + cur = nullptr; + doc = nullptr; arrayListEmpty(filesEntityList()); xsltSetXIncludeDefault(optionsGetIntOption(OPTIONS_XINCLUDE)); @@ -739,22 +739,22 @@ xsldbgMain(int argc, char **argv) xslDebugStatus = DEBUG_STOP; /* stop as soon as possible */ } - if ((optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME) == NULL) || - (optionsGetStringOption(OPTIONS_DATA_FILE_NAME) == NULL)) { + if (!optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME) || + !optionsGetStringOption(OPTIONS_DATA_FILE_NAME)) { /* at least on file name has not been set */ /*goto a xsldbg command prompt */ showPrompt = 1; - if (optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME) == NULL) + if (!optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)) xsldbgGenericErrorFunc(i18n("Error: No XSLT source file supplied.\n")); - if (optionsGetStringOption(OPTIONS_DATA_FILE_NAME) == NULL) { + if (!optionsGetStringOption(OPTIONS_DATA_FILE_NAME)) { xsldbgGenericErrorFunc(i18n("Error: No XML data file supplied.\n")); } } else { - filesLoadXmlFile(NULL, FILES_SOURCEFILE_TYPE); + filesLoadXmlFile(nullptr, FILES_SOURCEFILE_TYPE); cur = filesGetStylesheet(); - if ((cur == NULL) || (cur->errors != 0)) { + if (!cur || cur->errors != 0) { /*goto a xsldbg command prompt */ showPrompt = 1; if (xslDebugStatus == DEBUG_NONE) { @@ -765,9 +765,9 @@ xsldbgMain(int argc, char **argv) } if (showPrompt == 0) { - filesLoadXmlFile(NULL, FILES_XMLFILE_TYPE); + filesLoadXmlFile(nullptr, FILES_XMLFILE_TYPE); doc = filesGetMainDoc(); - if (doc == NULL) { + if (!doc) { if (xslDebugStatus == DEBUG_NONE) { xslDebugStatus = DEBUG_QUIT; /* panic !! */ result = 0; @@ -819,7 +819,7 @@ xsldbgMain(int argc, char **argv) /* pass control to user they won't be able to do much other than add breakpoints, quit, run, continue */ debugXSLBreak((xmlNodePtr) cur->doc, (xmlNodePtr) doc, - NULL, NULL); + nullptr, nullptr); } } } else { @@ -840,7 +840,7 @@ xsldbgMain(int argc, char **argv) if (showPrompt && optionsGetIntOption(OPTIONS_SHELL)) { xmlDocPtr tempDoc = xmlNewDoc((xmlChar *) "1.0"); xmlNodePtr tempNode = - xmlNewNode(NULL, (xmlChar *) "xsldbg_default_node"); + xmlNewNode(nullptr, (xmlChar *) "xsldbg_default_node"); if (!tempDoc || !tempNode) { xsldbgFree(); return (1); @@ -849,19 +849,19 @@ xsldbgMain(int argc, char **argv) xsldbgGenericErrorFunc(i18n("Going to the command shell; not all xsldbg commands will work as not all needed have been loaded.\n")); xslDebugStatus = DEBUG_STOP; - if ((cur == NULL) && (doc == NULL)) { + if (!cur && !doc) { /*no doc's loaded */ - debugXSLBreak(tempNode, tempNode, NULL, NULL); - } else if ((cur != NULL) && (doc == NULL)) { + debugXSLBreak(tempNode, tempNode, nullptr, nullptr); + } else if (cur && !doc) { /* stylesheet is loaded */ - debugXSLBreak((xmlNodePtr) cur->doc, tempNode, NULL, NULL); - } else if ((cur == NULL) && (doc != NULL)) { + debugXSLBreak((xmlNodePtr) cur->doc, tempNode, nullptr, nullptr); + } else if (!cur && doc) { /* xml doc is loaded */ - debugXSLBreak(tempNode, (xmlNodePtr) doc, NULL, NULL); + debugXSLBreak(tempNode, (xmlNodePtr) doc, nullptr, nullptr); } else { /* unexpected problem, both docs are loaded */ debugXSLBreak((xmlNodePtr) cur->doc, (xmlNodePtr) doc, - NULL, NULL); + nullptr, nullptr); } xmlFreeDoc(tempDoc); } else if (showPrompt && !optionsGetIntOption(OPTIONS_SHELL)) { @@ -897,7 +897,7 @@ xsldbgMain(int argc, char **argv) xsltStylesheetPtr xsldbgLoadStylesheet() { - xsltStylesheetPtr cur = NULL; + xsltStylesheetPtr cur = nullptr; xmlDocPtr style; if (optionsGetIntOption(OPTIONS_TIMING)) @@ -905,9 +905,9 @@ xsldbgLoadStylesheet() style = xmlParseFile((const char *) optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)); if (optionsGetIntOption(OPTIONS_TIMING)) endTimer(i18n("Parsing stylesheet %1").arg((const char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME))); - if (style == NULL) { + if (!style) { xsldbgGenericErrorFunc(i18n("Error: Cannot parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)))); - cur = NULL; + cur = nullptr; if (!optionsGetIntOption(OPTIONS_SHELL)) { xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n")); xslDebugStatus = DEBUG_QUIT; @@ -917,13 +917,13 @@ xsldbgLoadStylesheet() } } else { cur = xsltLoadStylesheetPI(style); - if (cur != NULL) { + if (cur) { /* it is an embedded stylesheet */ xsltProcess(style, cur); xsltFreeStylesheet(cur); } else { cur = xsltParseStylesheetDoc(style); - if (cur != NULL) { + if (cur) { if (cur->indent == 1) xmlIndentTreeOutput = 1; else @@ -949,9 +949,9 @@ xsldbgLoadStylesheet() xmlDocPtr xsldbgLoadXmlData(void) { - xmlDocPtr doc = NULL; + xmlDocPtr doc = nullptr; xmlSAXHandler mySAXHandler; - doc = NULL; + doc = nullptr; xmlSAXVersion(&mySAXHandler,2); oldGetEntity = mySAXHandler.getEntity; @@ -963,7 +963,7 @@ xsldbgLoadXmlData(void) if (optionsGetIntOption(OPTIONS_HTML)) doc = htmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME), - NULL); + nullptr); else #endif #ifdef LIBXML_DOCB_ENABLED @@ -973,7 +973,7 @@ xsldbgLoadXmlData(void) #endif doc = xmlSAXParseFile(&mySAXHandler, (char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME), 0); - if (doc == NULL) { + if (!doc) { xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME)))); if (!optionsGetIntOption(OPTIONS_SHELL)) { xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n")); @@ -1001,14 +1001,14 @@ xsldbgLoadXmlData(void) xmlDocPtr xsldbgLoadXmlTemporary(const xmlChar * path) { - xmlDocPtr doc = NULL; - doc = NULL; + xmlDocPtr doc = nullptr; + doc = nullptr; if (optionsGetIntOption(OPTIONS_TIMING)) startTimer(); #ifdef LIBXML_HTML_ENABLED if (optionsGetIntOption(OPTIONS_HTML)) - doc = htmlParseFile((char *) path, NULL); + doc = htmlParseFile((char *) path, nullptr); else #endif #ifdef LIBXML_DOCB_ENABLED @@ -1017,7 +1017,7 @@ xsldbgLoadXmlTemporary(const xmlChar * path) else #endif doc = xmlSAXParseFile(&mySAXhdlr, (char *) path, 0); - if (doc == NULL) { + if (!doc) { xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(path))); } @@ -1042,7 +1042,7 @@ printTemplates(xsltStylesheetPtr style, xmlDocPtr doc) if (ctxt) { /* don't be verbose when printing out template names */ - xslDbgShellPrintTemplateNames(ctxt, NULL, NULL, 0, 0); + xslDbgShellPrintTemplateNames(ctxt, nullptr, nullptr, 0, 0); } else { xsldbgGenericErrorFunc(i18n("Error: Out of memory.\n")); } @@ -1206,8 +1206,8 @@ xsldbgInit() /* set up the parser */ xmlInitParser(); #if 0 - xmlSetGenericErrorFunc(NULL, NULL); - xmlSetStructuredErrorFunc(NULL , (xmlStructuredErrorFunc)xsldbgStructErrorHandler); + xmlSetGenericErrorFunc(nullptr, nullptr); + xmlSetStructuredErrorFunc(nullptr , (xmlStructuredErrorFunc)xsldbgStructErrorHandler); #else xmlSetGenericErrorFunc(0, xsldbgGenericErrorFunc); xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc); @@ -1288,7 +1288,7 @@ xsldbgGenericErrorFunc(void *ctx, const char *msg, ...) notifyTextXsldbgApp(XSLDBG_MSG_TEXTOUT, msgBuffer); } else { - xmlChar *encodeResult = NULL; + xmlChar *encodeResult = nullptr; vsnprintf(msgBuffer, sizeof(msgBuffer), msg, args); encodeResult = filesEncode((xmlChar *) msgBuffer); diff --git a/src/kxsldbgpart/libxsldbg/xsldbgthread.cpp b/src/kxsldbgpart/libxsldbg/xsldbgthread.cpp index ecb9405..237753d 100644 --- a/src/kxsldbgpart/libxsldbg/xsldbgthread.cpp +++ b/src/kxsldbgpart/libxsldbg/xsldbgthread.cpp @@ -36,7 +36,7 @@ static int appReady = 0; static notifyMessageListPtr notifyList; -arrayListPtr msgList = NULL; +arrayListPtr msgList = nullptr; int getAppReady(void) @@ -133,7 +133,7 @@ notifyListStart(XsldbgMessageEnum type) break; default: - msgList = arrayListNew(10, NULL); + msgList = arrayListNew(10, nullptr); } notifyList = diff --git a/src/xsldbgmain.cpp b/src/xsldbgmain.cpp index ceb275d..bc4aade 100644 --- a/src/xsldbgmain.cpp +++ b/src/xsldbgmain.cpp @@ -204,10 +204,10 @@ xslDbgShellReadlineSimple(xmlChar * prompt) when running in gdb mode.*/ char line_buffer[DEBUG_BUFFER_SIZE]; - if (prompt != NULL) + if (prompt) xsltGenericError(xsltGenericErrorContext, "%s", prompt); if (!fgets(line_buffer, sizeof(line_buffer) - 1, stdin)){ - line_read = NULL; + line_read = nullptr; }else{ line_buffer[DEBUG_BUFFER_SIZE - 1] = 0; if ((strlen(line_buffer) == 0) || (line_buffer[0] == '\n')){ @@ -224,11 +224,11 @@ xslDbgShellReadlineSimple(xmlChar * prompt) #else char line_read[DEBUG_BUFFER_SIZE]; - if (prompt != NULL) + if (prompt) xsltGenericError(xsltGenericErrorContext, "%s", prompt); fflush(stderr); if (!fgets(line_read, DEBUG_BUFFER_SIZE - 1, stdin)) - return (NULL); + return (nullptr); line_read[DEBUG_BUFFER_SIZE - 1] = 0; /* if only is pressed then try last saved command line */ if ((strlen(line_read) == 0) || (line_read[0] == '\n')) { -- cgit v1.2.3