Convert allocation calls to XtMallocArray or XtReallocArray where appropriate

Raises minimum libXt requirement to 1.3.0 for these calls

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/toc.c b/toc.c
index a018a7a..2a1d507 100644
--- a/toc.c
+++ b/toc.c
@@ -186,7 +186,7 @@ void TocInit(void)
     else
 	MakeSureFolderExists(&namelist, &numFolders,
 			     app_resources.drafts_folder_name);
-    folderList = (Toc *) XtMalloc((Cardinal)numFolders * sizeof(Toc));
+    folderList = XtMallocArray((Cardinal)numFolders, sizeof(Toc));
     for (i=0 ; i<numFolders ; i++) {
 	toc = folderList[i] = TUMalloc();
 	toc->foldername = XtNewString(namelist[i]);
@@ -210,8 +210,7 @@ Toc TocCreate(const char *foldername)
     Toc		toc = TUMalloc();
 
     toc->foldername = XtNewString(foldername);
-    folderList = (Toc *) XtRealloc((char *) folderList,
-				   (unsigned) ++numFolders * sizeof(Toc));
+    folderList = XtReallocArray(folderList, ++numFolders, sizeof(Toc));
     folderList[numFolders - 1] = toc;
     return toc;
 }
@@ -432,8 +431,7 @@ void TocSetScrn(Toc toc, Scrn scrn)
 	StoreWindowName(scrn, progName);
     } else {
 	toc->num_scrns++;
-	toc->scrn = (Scrn *) XtRealloc((char *) toc->scrn,
-				       (unsigned)toc->num_scrns*sizeof(Scrn));
+	toc->scrn = XtReallocArray(toc->scrn, toc->num_scrns, sizeof(Scrn));
 	toc->scrn[toc->num_scrns - 1] = scrn;
 	TUEnsureScanIsValidAndOpen(toc, True);
 	TUResetTocLabel(scrn);