dthelp: Change to ANSI function definitions

[oweals/cde.git] / cde / programs / dtmail / dtmail / AlternatesListUiItem.C

diff --git a/cde/programs/dtmail/dtmail/AlternatesListUiItem.C b/cde/programs/dtmail/dtmail/AlternatesListUiItem.C
index 096b9a992197d8d46ef038942c4ff6972793f577..6828c2836adbfdc1c5c679937b02595d385766b7 100644 (file)
--- a/cde/programs/dtmail/dtmail/AlternatesListUiItem.C
+++ b/cde/programs/dtmail/dtmail/AlternatesListUiItem.C
@@ -1,3 +1,25 @@
+/*
+ * CDE - Common Desktop Environment
+ *
+ * Copyright (c) 1993-2012, The Open Group. All rights reserved.
+ *
+ * These libraries and programs are free software; you can
+ * redistribute them and/or modify them under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * These libraries and programs are distributed in the hope that
+ * they will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with these libraries and programs; if not, write
+ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110-1301 USA
+ */
 /* $XConsortium: AlternatesListUiItem.C /main/3 1995/11/06 16:03:45 rswiston $ */
 /*
  *+SNOTICE
@@ -157,8 +179,10 @@ void AlternatesListUiItem::writeFromSourceToUi()
        list_str = strdup("");
   }
   
-  if ((buf = (char *) malloc(strlen(list_str) + 1)) == NULL)
+  if ((buf = (char *) malloc(strlen(list_str) + 1)) == NULL) {
+    free((void *) list_str);
     return;
+  }
   strcpy(buf, (char *)list_str);
   
   if((token = (char *) strtok(buf, " "))) 
@@ -188,8 +212,7 @@ void AlternatesListUiItem::writeFromSourceToUi()
 
   delete char_list;
 
-  if(list_str != NULL)
-    free((void *)list_str);
+  free((void *)list_str);
 
   if(buf != NULL)
     free((void *)buf);