Changeset 711 for trunk/gsdl/src/mgpp/text/StemBlock.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/StemBlock.cpp (modified) (9 diffs)

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

@@ -45 +45 @@
   int abortvar;
 
-  if (!(sd = (stemmed_dict *) Xmalloc (sizeof (stemmed_dict))))
+  if (!(sd = new stemmed_dict))
     {
       abort(0);
@@ -66 +66 @@
   NTOHUL(sd->sdh.indexed);
 
-  if (!(buffer = (u_char *) Xmalloc (sd->sdh.index_chars)))
+  if (!(buffer = new u_char[sd->sdh.index_chars]))
     {
       abort(1);
@@ -72 +72 @@
   sd->MemForStemDict += sd->sdh.index_chars;
 
-  if (!(sd->index = (u_char **) Xmalloc (sd->sdh.num_blocks * sizeof (*sd->index))))
+  if (!(sd->index = new (u_char *)[sd->sdh.num_blocks]))
     {
       abort(2);
@@ -78 +78 @@
   sd->MemForStemDict += sd->sdh.num_blocks * sizeof (*sd->index);
 
-  if (!(sd->pos = (long unsigned int *) Xmalloc (sd->sdh.num_blocks * sizeof (*sd->pos))))
+  if (!(sd->pos = new (long unsigned int)[sd->sdh.num_blocks]))
     {
       abort(3);
@@ -84 +84 @@
   sd->MemForStemDict += sd->sdh.num_blocks * sizeof (*sd->pos);
 
-  if (!(sd->buffer = (u_char *) Xmalloc (sd->sdh.block_size * sizeof (*sd->buffer))))
+  if (!(sd->buffer = new u_char[sd->sdh.block_size]))
     {
       abort(4);
@@ -95 +95 @@
     {
       register u_char len;
+      // Read an MG string from the blocked dictionary
       sd->index[i] = buffer;
       len = Getc (stem_file);
@@ -100 +101 @@
       Fread (buffer, sizeof (u_char), len, stem_file);
       buffer += len;
+
+      // Read the pointer into the blocks
       Fread (&sd->pos[i], sizeof (*sd->pos), 1, stem_file);
+
       NTOHUL(sd->pos[i]); /* [RPAP - Jan 97: Endian Ordering] */
     }
@@ -114 +118 @@
     {
       case 4:
-        Xfree (sd->buffer);
+        delete sd->pos;
       case 3:
-        Xfree (sd->index);
+        delete sd->index;
       case 2:
-        Xfree (buffer);
+        delete buffer;
       case 1:
-        Xfree (sd);
+        delete sd;
       break;
 
@@ -158 +162 @@
 
       /* [RPAP - Jan 97: Endian Ordering] */
+      // first_word is the word number of the first word in the block
       *first_word = (unsigned long *) (sd->buffer);
       NTOHUL(**first_word);
+
       *last_invf_len = (unsigned long *) ((*first_word) + 1);
       NTOHUL(**last_invf_len);
+
+      // num_words is the number of words in the block
       *num_words = (unsigned short *) ((*last_invf_len) + 1);
       NTOHUS(**num_words);
+
       *index = (*num_words) + 1;
       *num_indexes = (((**num_words) - 1) / sd->sdh.lookback) + 1;