* ratpoison.h (xmalloc, xrealloc, fatal): Prototype.

* main.c (xmalloc): Move here from sbuf.c.
(xrealloc): Likewise.
(fatal): Likewise.

* number.c (find_empty_cell): Use xrealloc, remove error check.
(init_numbers): Likewise.

* manage.c (get_window_name): Likewise.

* main.c (main): Likewise.

* list.c (add_to_window_list): Likewise.
(add_to_window_list): Likewise.

* events.c (handle_key): Likewise.

* input.c (keysym_to_string): Likewise.
(get_more_input): Use xrealloc, remove error check.

* main.c (read_rc_file): Take a file pointer rather than a
filename.
(read_startup_files): If ~/.ratpoisonrc is not readable try
/etc/ratpoisonrc.

1 files changed, 2 insertions, 13 deletions

diff --git a/src/number.c b/src/number.c
index 880245c..0e33e21 100644
--- a/src/number.c
+++ b/src/number.c
@@ -62,12 +62,7 @@ find_empty_cell ()
   if (num_taken >= max_taken)
     {
       max_taken *= 2;
-      numbers_taken = realloc (numbers_taken, sizeof (int) * max_taken);
-      if (numbers_taken == NULL)
-	{
-	  PRINT_ERROR ("Out of memory\n");
-	  exit (EXIT_FAILURE);
-	}
+      numbers_taken = xrealloc (numbers_taken, sizeof (int) * max_taken);
     }
   num_taken++;
 
@@ -122,11 +117,5 @@ init_numbers ()
   max_taken = 10;
   num_taken = 0;
 
-  numbers_taken = malloc (max_taken * sizeof (int));
-  if (numbers_taken == NULL)
-    {
-      PRINT_ERROR ("Cannot allocate memory for numbers_taken.\n");
-      exit (EXIT_FAILURE);
-    }
-
+  numbers_taken = xmalloc (max_taken * sizeof (int));
 }