MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-20 01:50:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move safe_ato[il]() to misc.[ch]

Browse Source
This commit is contained in:
Julien BLACHE
2009-04-30 14:25:52 +02:00
parent 91414c10d7
commit 0a1c4545dc
6 changed files with 111 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/httpd_daap.c
View File

@@ -43,6 +43,7 @@
#include "ff-dbstruct.h"
#include "db-generic.h"
#include "conffile.h"
#include "misc.h"
#include "httpd.h"
#include "httpd_daap.h"
@@ -331,42 +332,6 @@ avl_tree_t *dmap_fields_hash;
static int session_id;
static int
safe_atoi(const char *str, int *val)
{
char *end;
long intval;
errno = 0;
intval = strtol(str, &end, 10);
if (((errno == ERANGE) && ((intval == LONG_MAX) || (intval == LONG_MIN)))
|| ((errno != 0) && (intval == 0)))
{
DPRINTF(E_WARN, L_DAAP, "Invalid integer in string (%s): %s\n", str, strerror(errno));
return -1;
}
if (end == str)
{
DPRINTF(E_WARN, L_DAAP, "No integer found in string (%s)\n", str);
return -1;
}
if (intval > INT_MAX)
{
DPRINTF(E_WARN, L_DAAP, "Integer value too large (%s)\n", str);
return -1;
}
*val = (int)intval;
return 0;
}
static int
dmap_field_map_compare(const void *aa, const void *bb)
{