* 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, 0 insertions, 31 deletions

diff --git a/src/sbuf.c b/src/sbuf.c
index 2bc2d03..bd77d7c 100644
--- a/src/sbuf.c
+++ b/src/sbuf.c
@@ -22,37 +22,6 @@
 #include "ratpoison.h"
 #include "sbuf.h"
 
-/* ------------------------------------ move to separate file */
-#include <stdlib.h>
-#include <stdio.h>
-
-void
-fatal (const char *msg)
-{
-  fprintf (stderr, "%s", msg);
-  abort ();
-}
-
-void *
-xmalloc (size_t size)
-{
-  register void *value = malloc (size);
-  if (value == 0)
-    fatal ("virtual memory exhausted");
-  return value;
-}
-
-void *
-xrealloc (void *ptr, size_t size)
-{
-  register void *value = realloc (ptr, size);
-  if (value == 0)
-    fatal ("Virtual memory exhausted");
-  PRINT_DEBUG("realloc: %d\n", size);
-  return value;
-}
-/*------------------------------------------------------------*/
-
 struct sbuf *
 sbuf_new (size_t initsz)
 {