Merge branch 'master' into utf8-conversion-2
This commit is contained in:
commit
965e5c0384
|
|
@ -2654,7 +2654,6 @@ _DtHelpCeIsTopTopic (
|
|||
if (_DtHelpCeMapCcdfTargetToId(vol, id, &topicId) == 0 &&
|
||||
_DtHelpCeGetCcdfTopTopic(vol, &topId) == 0)
|
||||
result = _DtHelpCeStrCaseCmpLatin1(topId, topicId);
|
||||
free(topicId);
|
||||
}
|
||||
else if (_DtHelpCeMapIdToSdlTopicId(vol, id, &topicId) == 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -510,9 +510,6 @@ static Boolean GetVolumeInfoCB (
|
|||
*ret_docId = locDocId ? locDocId : XtNewString(&empty);
|
||||
if (ret_timeStamp)
|
||||
*ret_timeStamp = locTimeStamp?locTimeStamp:XtNewString(&empty);
|
||||
|
||||
free(locDocId);
|
||||
free(locTimeStamp);
|
||||
}
|
||||
|
||||
if (ret_nameKey)
|
||||
|
|
|
|||
Loading…
Reference in New Issue