mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-20 23:36:38 +00:00
hlsdemux: Use locale-independent int/float parsing functions from GLib
This commit is contained in:
parent
64367f33a6
commit
a5387eb372
1 changed files with 5 additions and 5 deletions
|
@ -109,20 +109,20 @@ static gboolean
|
||||||
int_from_string (gchar * ptr, gchar ** endptr, gint * val)
|
int_from_string (gchar * ptr, gchar ** endptr, gint * val)
|
||||||
{
|
{
|
||||||
gchar *end;
|
gchar *end;
|
||||||
glong ret;
|
gint64 ret;
|
||||||
|
|
||||||
g_return_val_if_fail (ptr != NULL, FALSE);
|
g_return_val_if_fail (ptr != NULL, FALSE);
|
||||||
g_return_val_if_fail (val != NULL, FALSE);
|
g_return_val_if_fail (val != NULL, FALSE);
|
||||||
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
ret = strtol (ptr, &end, 10);
|
ret = g_ascii_strtoll (ptr, &end, 10);
|
||||||
if ((errno == ERANGE && (ret == LONG_MAX || ret == LONG_MIN))
|
if ((errno == ERANGE && (ret == G_MAXINT64 || ret == G_MININT64))
|
||||||
|| (errno != 0 && ret == 0)) {
|
|| (errno != 0 && ret == 0)) {
|
||||||
GST_WARNING ("%s", g_strerror (errno));
|
GST_WARNING ("%s", g_strerror (errno));
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret > G_MAXINT) {
|
if (ret > G_MAXINT || ret < G_MININT) {
|
||||||
GST_WARNING ("%s", g_strerror (ERANGE));
|
GST_WARNING ("%s", g_strerror (ERANGE));
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -145,7 +145,7 @@ double_from_string (gchar * ptr, gchar ** endptr, gdouble * val)
|
||||||
g_return_val_if_fail (val != NULL, FALSE);
|
g_return_val_if_fail (val != NULL, FALSE);
|
||||||
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
ret = strtod (ptr, &end);
|
ret = g_ascii_strtod (ptr, &end);
|
||||||
if ((errno == ERANGE && (ret == HUGE_VAL || ret == -HUGE_VAL))
|
if ((errno == ERANGE && (ret == HUGE_VAL || ret == -HUGE_VAL))
|
||||||
|| (errno != 0 && ret == 0)) {
|
|| (errno != 0 && ret == 0)) {
|
||||||
GST_WARNING ("%s", g_strerror (errno));
|
GST_WARNING ("%s", g_strerror (errno));
|
||||||
|
|
Loading…
Reference in a new issue