* sb.h (sb_list_vector): Move to sb.c.

	* sb.c (free_list): Use type of sb_list_vector directly.
	(sb_build): Fix off-by-one error in assertion about `size'.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3ef40aba499a206296e3f7ae16ccd0efec721d3f..595555bcd0e69f53534626e8d3cbe2acf06289f3 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-02  Ben Elliston  <bje@au.ibm.com>
+
+       * sb.h (sb_list_vector): Move to sb.c.
+       * sb.c (free_list): Use type of sb_list_vector directly.
+       (sb_build): Fix off-by-one error in assertion about `size'.
+
 2006-05-01  Ben Elliston  <bje@au.ibm.com>
 
        * listing.c (listing_listing): Remove useless loop.

diff --git a/gas/sb.c b/gas/sb.c
index ecd772c30c02d4208e806b6fd8b9f2e90b3c8113..f62883576c53f0e7beca4039e39b13ebb2b1b73f 100644 (file)
--- a/gas/sb.c
+++ b/gas/sb.c
@@ -56,7 +56,10 @@ static void sb_check (sb *, int);
 static int string_count[sb_max_power_two];
 
 /* Free list of sb structures.  */
-static sb_list_vector free_list;
+static struct
+{
+  sb_element *size[sb_max_power_two];
+} free_list;
 
 /* Initializes an sb.  */
 
@@ -66,8 +69,7 @@ sb_build (sb *ptr, int size)
   /* See if we can find one to allocate.  */
   sb_element *e;
 
-  if (size > sb_max_power_two)
-    abort ();
+  assert (size < sb_max_power_two);
 
   e = free_list.size[size];
   if (!e)

diff --git a/gas/sb.h b/gas/sb.h
index 5732688315f76c856232279e2619f192d4a3aa72..da787e245ea72cb8407e3f0c52ffa2affc03f039 100644 (file)
--- a/gas/sb.h
+++ b/gas/sb.h
@@ -70,14 +70,6 @@ typedef struct le
 }
 sb_element;
 
-/* The free list.  */
-
-typedef struct
-{
-  sb_element *size[sb_max_power_two];
-}
-sb_list_vector;
-
 extern void sb_new (sb *);
 extern void sb_kill (sb *);
 extern void sb_add_sb (sb *, sb *);