mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
Merge branch 'master' into utf8-conversion-2
This commit is contained in:
commit
965e5c0384
2 changed files with 0 additions and 4 deletions
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue