luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set errno to 0 before calling strtol. (#306388, Morten Welinder)

Browse Source 
2005-06-09  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_int): Set errno to 0 before calling
	strtol.  (#306388, Morten Welinder)
This commit is contained in:
Matthias Clasen 2005-06-09 15:39:29 +00:00 committed by Matthias Clasen
parent f15bb122ce
commit e90cd618b1
5 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-06-09 Matthias Clasen <mclasen@redhat.com>
* glib/goption.c (parse_int): Set errno to 0 before calling
strtol. (#306388, Morten Welinder)
2005-06-09 Tor Lillqvist <tml@novell.com> 2005-06-09 Tor Lillqvist <tml@novell.com>
* glib/gstdio.h * glib/gstdio.h

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2005-06-09 Matthias Clasen <mclasen@redhat.com>
* glib/goption.c (parse_int): Set errno to 0 before calling
strtol. (#306388, Morten Welinder)
2005-06-09 Tor Lillqvist <tml@novell.com> 2005-06-09 Tor Lillqvist <tml@novell.com>
* glib/gstdio.h * glib/gstdio.h

5
ChangeLog.pre-2-12
View File

@ -1,3 +1,8 @@
2005-06-09 Matthias Clasen <mclasen@redhat.com>
* glib/goption.c (parse_int): Set errno to 0 before calling
strtol. (#306388, Morten Welinder)
2005-06-09 Tor Lillqvist <tml@novell.com> 2005-06-09 Tor Lillqvist <tml@novell.com>
* glib/gstdio.h * glib/gstdio.h

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2005-06-09 Matthias Clasen <mclasen@redhat.com>
* glib/goption.c (parse_int): Set errno to 0 before calling
strtol. (#306388, Morten Welinder)
2005-06-09 Tor Lillqvist <tml@novell.com> 2005-06-09 Tor Lillqvist <tml@novell.com>
* glib/gstdio.h * glib/gstdio.h

15
glib/goption.c
View File

@ -33,18 +33,22 @@
#define TRANSLATE(group, str) (((group)->translate_func ? (* (group)->translate_func) ((str), (group)->translate_data) : (str))) #define TRANSLATE(group, str) (((group)->translate_func ? (* (group)->translate_func) ((str), (group)->translate_data) : (str)))
typedef struct { typedef struct
{
GOptionArg arg_type; GOptionArg arg_type;
gpointer arg_data; gpointer arg_data;
union { union
{
gboolean bool; gboolean bool;
gint integer; gint integer;
gchar *str; gchar *str;
gchar **array; gchar **array;
} prev; } prev;
union { union
{
gchar *str; gchar *str;
struct { struct
{
gint len; gint len;
gchar **data; gchar **data;
} array; } array;
@ -628,9 +632,10 @@ parse_int (const gchar *arg_name,
GError **error) GError **error)
{ {
gchar *end; gchar *end;
glong tmp = strtol (arg, &end, 0); glong tmp;
errno = 0; errno = 0;
tmp = strtol (arg, &end, 0);
if (*arg == '\0' || *end != '\0') if (*arg == '\0' || *end != '\0')
{ {