From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 14 Sep 2016 18:37:11 +0000 (+0200)
Subject: gallium/util: make use of strtol() in debug_get_num_option()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=be0535b8c7a84659e2829c8d0bfd7f2847e71825;p=mesa.git

gallium/util: make use of strtol() in debug_get_num_option()

This allows to use hexadecimal numbers which are automatically
detected by strtol() when the base is 0.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Tested-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c
index 4619526094c..dd3e16791d6 100644
--- a/src/gallium/auxiliary/util/u_debug.c
+++ b/src/gallium/auxiliary/util/u_debug.c
@@ -203,25 +203,16 @@ debug_get_num_option(const char *name, long dfault)
    const char *str;
 
    str = os_get_option(name);
-   if (!str)
+   if (!str) {
       result = dfault;
-   else {
-      long sign;
-      char c;
-      c = *str++;
-      if (c == '-') {
-	 sign = -1;
-	 c = *str++;
-      }
-      else {
-	 sign = 1;
-      }
-      result = 0;
-      while ('0' <= c && c <= '9') {
-	 result = result*10 + (c - '0');
-	 c = *str++;
+   } else {
+      char *endptr;
+
+      result = strtol(str, &endptr, 0);
+      if (str == endptr) {
+         /* Restore the default value when no digits were found. */
+         result = dfault;
       }
-      result *= sign;
    }
 
    if (debug_get_option_should_print())