* src/main.c (main): call init_window_stuff(). Remove call to init_numbers().

(clean_up): call free_window_stuff(). Remove call to free_numbers().

* src/list.h (free_window_stuff): new prototype
(init_window_stuff): likewise

* src/list.c (rp_window_numset): new global
(init_window_stuff): new function
(free_window_stuff): new function

* src/data.h (rp_window_numset): new extern

* src/number.c (numset_init): new function
(number_is_taken): rename to numset_num_is_taken, callers updated.
(find_empty_cell): rename to numset_find_empty_cell, callers updated.
(add_window_number): rename to numset_add_num, callers updated.
(return_window_number): rename to numset_release, callers updated.
(init_numbers): remove function
(free_numbers): rename to numset_free, callers updated.
(numset_num_is_taken): take struct numset* as an argument.
(numset_find_empty_cell): likewise
(numset_add_num): likewise
(numset_request): likewise
(numset_release): likewise
(numset_free): likewise
(numset_new): new function

1 files changed, 3 insertions, 3 deletions

diff --git a/src/actions.c b/src/actions.c
index 28a583e..e655341 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1175,11 +1175,11 @@ cmd_number (int interactive, void *data)
 	}
       else
 	{
-	  return_window_number (win->number);
+	  numset_release (rp_window_numset, win->number);
 	}
 
       win->number = new_number;
-      add_window_number (new_number);
+      numset_add_num (rp_window_numset, new_number);
 
       /* resort the the window in the list */
       list_del (&win->node);
@@ -2788,7 +2788,7 @@ cmd_tmpwm (int interactive, void *data)
       if (frame == win->scr->rp_current_frame) set_active_frame (frame);
 
       /* put the window in the unmapped list. */
-      return_window_number (win->number);
+      numset_release (rp_window_numset, win->number);
       list_move_tail(&win->node, &rp_unmapped_window);
     }