mp[fz]/get_str.c, mpz/out_str.c: Save a string and a branch.

1 files changed, 10 insertions, 13 deletions

diff --git a/mpz/out_str.c b/mpz/out_str.c
index 8dfcb31ec..f79a57d8f 100644
--- a/mpz/out_str.c
+++ b/mpz/out_str.c
@@ -49,26 +49,23 @@ mpz_out_str (FILE *stream, int base, mpz_srcptr x)
   if (stream == 0)
     stream = stdout;
 
-  if (base >= 0)
+  num_to_text = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+  if (base > 1)
     {
-      num_to_text = "0123456789abcdefghijklmnopqrstuvwxyz";
-      if (base <= 1)
-	base = 10;
-      else if (base > 36)
-	{
-	  num_to_text = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-	  if (base > 62)
+      if (base <= 36)
+	num_to_text = "0123456789abcdefghijklmnopqrstuvwxyz";
+      else if (UNLIKELY (base > 62))
 	    return 0;
-	}
+    }
+  else if (base > -2)
+    {
+      base = 10;
     }
   else
     {
       base = -base;
-      if (base <= 1)
-	base = 10;
-      else if (base > 36)
+      if (UNLIKELY (base > 36))
 	return 0;
-      num_to_text = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
     }
 
   written = 0;