gnome-terminal r2691 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:45:37 2008
New Revision: 2691
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2691&view=rev

Log:
Use g_ascii_strto[u]ll.


Modified:
   trunk/src/terminal-app.c
   trunk/src/terminal.c

Modified: trunk/src/terminal-app.c
==============================================================================
--- trunk/src/terminal-app.c	(original)
+++ trunk/src/terminal-app.c	Thu May 29 19:45:37 2008
@@ -278,12 +278,12 @@
       period = strrchr (display_name, '.');
       if (period)
         {
-          unsigned long n;
+          gulong n;
           char *end;
           
           errno = 0;
-          end = (char*) period + 1;
-          n = strtoul (period + 1, &end, 0);
+          end = NULL;
+          n = g_ascii_strtoull (period + 1, &end, 0);
           if (errno == 0 && (period + 1) != end)
             screen_number = n;
         }

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Thu May 29 19:45:37 2008
@@ -657,19 +657,16 @@
        * always save session in C locale format)
        */
       end = NULL;
+      errno = 0;
       val = g_strtod (results->zoom, &end);
       if (end == NULL || *end != '\0')
         {
-          val = g_ascii_strtod (results->zoom, &end);
-          if (end == NULL || *end != '\0')
-            {
-              g_set_error (error,
-                           G_OPTION_ERROR,
-                           G_OPTION_ERROR_BAD_VALUE,
-                           _("\"%s\" is not a valid zoom factor\n"),
-                           results->zoom);
-              return FALSE;
-            }
+          g_set_error (error,
+                        G_OPTION_ERROR,
+                        G_OPTION_ERROR_BAD_VALUE,
+                        _("\"%s\" is not a valid zoom factor\n"),
+                        results->zoom);
+          return FALSE;
         }
 
       if (val < (TERMINAL_SCALE_MINIMUM + 1e-6))
@@ -833,8 +830,8 @@
           g_assert (i+1 < *argc);
           
           errno = 0;
-          end = argv[i+1];
-          n = strtoul (argv[i+1], &end, 0);
+          end = NULL;
+          n = g_ascii_strtoll (argv[i+1], &end, 0);
           if (errno == 0 && argv[i+1] != end)
             results->screen_number = n;