rnd-19981016-2

[rocksndiamonds.git] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index 1ca457c90d8c68abafdced7011cc1cba291efd23..a482d7489ce9d42cf54aee575648088f2a63b675 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -265,7 +265,7 @@ void GetOptions(char *argv[])
     {
       printf("--network\n");
 
-      standalone = FALSE;
+      network = TRUE;
     }
     else if (strncmp(option, "-serveronly", option_len) == 0)
     {
@@ -370,15 +370,14 @@ void Error(int mode, char *format_str, ...)
   }
 }
 
-/* like memcpy, but guaranteed to handle overlap when s <= t */
-void copydown(char *s, char *t, int n)
+void *checked_malloc(unsigned long size)
 {
-  for (; n; n--)
-    *(s++) = *(t++);
-}
+  void *ptr;
 
-void fatal(char *s)
-{
-  fprintf(stderr, "%s.\n", s);
-  exit(1);
+  ptr = malloc(size);
+
+  if (ptr == NULL)
+    Error(ERR_EXIT, "cannot allocate %d bytes -- out of memory", size);
+
+  return ptr;
 }