From 54f8982c61ea8c35bb0aabb6e93d320e4ad64b01 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Wed, 11 Apr 2018 14:46:57 -0600 Subject: [PATCH] dtfile/Help: CID 88598 --- cde/programs/dtfile/Help.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/cde/programs/dtfile/Help.c b/cde/programs/dtfile/Help.c index 774cad57..fb1ea371 100644 --- a/cde/programs/dtfile/Help.c +++ b/cde/programs/dtfile/Help.c @@ -498,22 +498,21 @@ MapFileTypeToHelpString( return(buf); } -#ifdef old - if (miscData) - /* The DtGetActionDescription function must be modified to - accept a non-integral second parameter. (Filetypes are no - longer expressed as integers. */ - desc = DtGetActionDescription(filetype, -1); - else -#endif - desc = DtDtsDataTypeToAttributeValue(filetype, - DtDTS_DA_DESCRIPTION, - NULL); + desc = DtDtsDataTypeToAttributeValue(filetype, + DtDTS_DA_DESCRIPTION, + NULL); isAction = DtDtsDataTypeIsAction(filetype); if (desc) - return(XtNewString(desc)); + { + char *descptr = XtNewString(desc); + XtFree((char *)desc); + if (descptr) + return descptr; + else + return NULL; + } /* No description found for this filetype */ if (isAction) -- 2.25.1