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

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

@@ -83 +83 @@
 static void memory_error_and_abort ();
 
-char *
-xmalloc (bytes)
-     int bytes;
-{
-  char *temp = (char *) Xmalloc (bytes);
+void *
+xmalloc (size_t bytes)
+{
+  void *temp = Xmalloc (bytes);
 
   if (!temp)
@@ -94 +93 @@
 }
 
-char *
-xrealloc (pointer, bytes)
-     char *pointer;
-     int bytes;
-{
-  char *temp;
+void *
+xrealloc (void *pointer, size_t bytes)
+{
+  void *temp;
 
   if (!pointer)
-    temp = (char *) xmalloc (bytes);
+    temp = xmalloc (bytes);
   else
-    temp = (char *) Xrealloc (pointer, bytes);
+    temp = Xrealloc (pointer, bytes);
 
   if (!temp)
@@ -150 +147 @@
   static char *the_line = NULL;
   if (the_line)
-    Xfree (the_line);
+    delete the_line;
   the_line = NULL;
   rl_instream = InFile;
@@ -194 +191 @@
   char *s;
   if (line)
-    Xfree (line);
+    delete line;
   line = NULL;
+
   if (!(s = GetLine ("> ")))
     return (NULL);
@@ -210 +208 @@
       if (!(s = GetLine ("? ")))
     return (NULL);
-      if (!(newline = (char *) Xmalloc (strlen (line) + strlen (s) + 2)))
+      if (!(newline = new char[strlen (line) + strlen (s) + 2]))
     {
       fprintf (stderr, "Unable to allocate memory for the line\n");
@@ -218 +216 @@
       strcat (newline, "\n");
       strcat (newline, s);
-      Xfree (line);
+      delete line;
       line = newline;
     }