Changeset 711 for trunk/gsdl/src/mgpp/text/backend.cpp

Timestamp:

1999-10-18T12:43:31+13:00 (25 years ago)

Author:

cs025

Message:

Changes to eradicate Xmalloc

File:

• trunk/gsdl/src/mgpp/text/backend.cpp (modified) (13 diffs)

trunk/gsdl/src/mgpp/text/backend.cpp

@@ -283 +283 @@
   if (textname == NULL) textname = name; /* [RJM 06/97: text filename] */
 
-  if (!(qd = (query_data *) Xmalloc (sizeof (query_data))))
+  if (!(qd = new query_data))
     {
       abort(0);
@@ -326 +326 @@
     {
       /* [RJM 06/97: text filename] */
-      if (!(qd->pathname = (char *) Xmalloc (strlen (dir) + strlen (name) + 1)) ||
-      !(qd->textpathname = (char *) Xmalloc (strlen (dir) + strlen (textname) + 1)))
+      if (!(qd->pathname = new char[strlen (dir) + strlen (name) + 1]) ||
+      !(qd->textpathname = new char[strlen (dir) + strlen (textname) + 1]))
     {
       abort(1);
@@ -338 +338 @@
     {
       /* [RJM 06/97: text filename] */
-      if (!(qd->pathname = (char *) Xmalloc (strlen (dir) + strlen (name) + 2)) ||
-      !(qd->textpathname = (char *) Xmalloc (strlen (dir) + strlen (textname) + 2)))
+      if (!(qd->pathname = new char[strlen (dir) + strlen (name) + 2]) ||
+      !(qd->textpathname = new char[strlen (dir) + strlen (textname) + 2]))
     {
       abort(1);
@@ -509 +509 @@
 
       fread((void *)&magic, sizeof(magic), 1, paragraph);
-      qd->paragraph = Xmalloc((qd->td->cth.num_of_docs+1)*sizeof(int));
+      qd->paragraph = new int[qd->td->cth.num_of_docs+1];
       qd->paragraph[0] = 0;
       for (i = 1; i <= qd->td->cth.num_of_docs; i++)
@@ -545 +545 @@
     size = ftell (f);
     fseek (f, 0, 0);
-    trec_ids = Xmalloc (size);
+    trec_ids = new char[size];
     if (!trec_ids)
       {
@@ -557 +557 @@
     int i, d;
     unsigned long magic;
-    trec_paras = Xmalloc (qd->sd->sdh.num_of_docs * sizeof (long));
+    trec_paras = new long[qd->sd->sdh.num_of_docs];
     if (!trec_paras)
       {
-        Xfree (trec_ids);
+        delete trec_ids;
         trec_ids = NULL;
         goto error;
@@ -595 +595 @@
   error:
     if (trec_ids)
-      Xfree (trec_ids);
+      delete trec_ids;
     if (trec_paras)
-      Xfree (trec_paras);
+      delete (trec_paras);
     trec_ids = NULL;
     trec_paras = NULL;
@@ -629 +629 @@
       close_all_files (qd);
     case 2:
-      Xfree (qd->textpathname); /* [RJM 06/97: text filename] */
+      delete (qd->textpathname); /* [RJM 06/97: text filename] */
     case 1:
       if (qd->pathname) 
-    Xfree (qd->pathname); /* [RJM 06/97: text filename] */
-      Xfree (qd);
+    delete (qd->pathname); /* [RJM 06/97: text filename] */
+      delete qd;
       break;
     }
@@ -679 +679 @@
 #if defined(PARADOCNUM) || defined(NZDL)
   if (qd->paragraph != NULL) {
-    Xfree (qd->paragraph);
+    delete (qd->paragraph);
     qd->paragraph = NULL;
   }
@@ -696 +696 @@
   FreeStemDict (qd->sd);
   close_all_files (qd);
-  Xfree (qd->textpathname); /* [RJM 06/97: text filename] */
-  Xfree (qd->pathname);
+  delete (qd->textpathname); /* [RJM 06/97: text filename] */
+  delete (qd->pathname);
   QueryData_FreeQueryDocs (qd);
   if (qd->TL != NULL) TermList_destroy(&qd->TL);         /* [RJM 07/98: Memory Leak] */
   if (qd->QTL != NULL) QueryTermList_free(&qd->QTL);  /* [RJM 07/98: Memory Leak] */
-  Xfree (qd);
+  delete qd;
 
   /* other global stuff hanging around */
@@ -777 +777 @@
   if (qd->TextBuffer)
     {
-      Xfree (qd->TextBuffer);
+      delete qd->TextBuffer;
       ChangeMemInUse (qd, -qd->TextBufferLen);
     }
@@ -799 +799 @@
     if (qd->DL->DE[i].CompTextBuffer)
       {
-        Xfree (qd->DL->DE[i].CompTextBuffer);
+        delete qd->DL->DE[i].CompTextBuffer;
         qd->DL->DE[i].CompTextBuffer = NULL;
         ChangeMemInUse (qd, -qd->DL->DE[i].Len);
@@ -903 +903 @@
   qd->TextBufferLen = (int) (qd->td->cth.ratio * 1.01 *
                  DocEntry_length(DE)) + 100;
-  if (!(qd->TextBuffer = (unsigned char *) Xmalloc (qd->TextBufferLen)))
+  if (!(qd->TextBuffer = new unsigned char[qd->TextBufferLen]))
     {
       fprintf (stderr, "No memory for TextBuffer\n");