createMatrixOfWideString(Rhs + 2, nb_diary_filenames, 1, wcdiary_filenames);
LhsVar(2) = Rhs + 2;
- delete [] wcdiary_filenames;
- wcdiary_filenames = NULL;
+ freeInput(wcdiary_filenames, nb_diary_filenames);
nb_diary_filenames = 0;
}
else
LhsVar(2) = Rhs + 2;
if (wcdiary_filenames)
{
- delete [] wcdiary_filenames;
- wcdiary_filenames = NULL;
+ freeInput(wcdiary_filenames, nb_diary_filenames);
nb_diary_filenames = 0;
}
}
wfilenameUsed[0] = getDiaryFilename((int)dID);
createMatrixOfWideString(Rhs + 2, 1, 1, wfilenameUsed);
LhsVar(2) = Rhs + 2;
- if (wfilenameUsed) {delete [] wfilenameUsed; wfilenameUsed = NULL;}
+ freeInput(wfilenameUsed,1);
}
}
else // diary(filename) exists (close diary)
wfilenameUsed[0] = getDiaryFilename((int)dID);
createMatrixOfWideString(Rhs + 2, 1, 1, wfilenameUsed);
LhsVar(2) = Rhs + 2;
- if (wfilenameUsed) {delete [] wfilenameUsed; wfilenameUsed = NULL;}
+ freeInput(wfilenameUsed, 1);
}
C2F(putlhsvar)();
}
wfilenameUsed[0] = getDiaryFilename((int)dID);
createMatrixOfWideString(Rhs + 2, 1, 1, wfilenameUsed);
LhsVar(2) = Rhs + 2;
- if (wfilenameUsed) {delete [] wfilenameUsed; wfilenameUsed = NULL;}
+ freeInput(wfilenameUsed, 1);
}
C2F(putlhsvar)();
}
#include "diary_manager.hxx"
#include "DiaryList.hxx"
#include "diary.h"
+#include "MALLOC.h"
/*--------------------------------------------------------------------------*/
static DiaryList *SCIDIARY = NULL;
/*--------------------------------------------------------------------------*/
{
if (SCIDIARY->getFilename(_Id).compare(L""))
{
- wcFilename = new wchar_t[SCIDIARY->getFilename(_Id).length()];
- wcscpy(wcFilename, SCIDIARY->getFilename(_Id).c_str());
+ wcFilename = (wchar_t*) MALLOC(sizeof(wchar_t) * (SCIDIARY->getFilename(_Id).length() + 1));
+ if (wcFilename) wcscpy(wcFilename, SCIDIARY->getFilename(_Id).c_str());
}
}
return wcFilename;
std::wstring * wstringFilenames = SCIDIARY->getFilenames(array_size);
if (array_size > 0)
{
- wchar_t **wcFilenames = new wchar_t*[*array_size];
+ wchar_t **wcFilenames = (wchar_t **) MALLOC (sizeof(wchar_t*) *(*array_size));
for(int i = 0; i < *array_size; i++)
{
- wcFilenames[i] = new wchar_t[wstringFilenames[i].length()];
+ wcFilenames[i] = (wchar_t*) MALLOC(sizeof(wchar_t) * (wstringFilenames[i].length() + 1));
wcscpy(wcFilenames[i], wstringFilenames[i].c_str());
}
return wcFilenames;