debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into utf8-conversion-2

Browse Source
This commit is contained in:
Jon Trulson
2018-11-07 11:24:00 -07:00
parent cf89ba1a77 cb4075e855
commit 965e5c0384
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cde/lib/DtHelp/Access.c
View File

@@ -2654,7 +2654,6 @@ _DtHelpCeIsTopTopic (
if (_DtHelpCeMapCcdfTargetToId(vol, id, &topicId) == 0 && if (_DtHelpCeMapCcdfTargetToId(vol, id, &topicId) == 0 &&
_DtHelpCeGetCcdfTopTopic(vol, &topId) == 0) _DtHelpCeGetCcdfTopTopic(vol, &topId) == 0)
result = _DtHelpCeStrCaseCmpLatin1(topId, topicId); result = _DtHelpCeStrCaseCmpLatin1(topId, topicId);
free(topicId);
} }
else if (_DtHelpCeMapIdToSdlTopicId(vol, id, &topicId) == 0) else if (_DtHelpCeMapIdToSdlTopicId(vol, id, &topicId) == 0)
{ {

3
cde/lib/DtHelp/GlobSearch.c
View File

@@ -510,9 +510,6 @@ static Boolean GetVolumeInfoCB (
*ret_docId = locDocId ? locDocId : XtNewString(&empty); *ret_docId = locDocId ? locDocId : XtNewString(&empty);
if (ret_timeStamp) if (ret_timeStamp)
*ret_timeStamp = locTimeStamp?locTimeStamp:XtNewString(&empty); *ret_timeStamp = locTimeStamp?locTimeStamp:XtNewString(&empty);
free(locDocId);
free(locTimeStamp);
} }
if (ret_nameKey) if (ret_nameKey)