* app.c (do_scrub_chars): Simplify string handling.

2 files changed, 7 insertions, 20 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5417f7e021..ac85baef35 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-10  Ben Elliston  <bje@au.ibm.com>
+
+	* app.c (do_scrub_chars): Simplify string handling.
+
 2006-03-07  Richard Sandiford  <richard@codesourcery.com>
 	    Daniel Jacobowitz  <dan@codesourcery.com>
 	    Zack Weinberg  <zack@codesourcery.com>
diff --git a/gas/app.c b/gas/app.c
index 3ff7f61e21..275ad68ebb 100644
--- a/gas/app.c
+++ b/gas/app.c
@@ -1335,26 +1335,9 @@ do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
 	      if (len > 0)
 		{
 		  PUT (ch);
-		  if (len > 8)
-		    {
-		      memcpy (to, from, len);
-		      to += len;
-		      from += len;
-		    }
-		  else
-		    {
-		      switch (len)
-			{
-			case 8: *to++ = *from++;
-			case 7: *to++ = *from++;
-			case 6: *to++ = *from++;
-			case 5: *to++ = *from++;
-			case 4: *to++ = *from++;
-			case 3: *to++ = *from++;
-			case 2: *to++ = *from++;
-			case 1: *to++ = *from++;
-			}
-		    }
+		  memcpy (to, from, len);
+		  to += len;
+		  from += len;
 		  if (to >= toend)
 		    goto tofull;
 		  ch = GET ();