p
/
xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 10 Wiki Activity

Add a strtoul() wrapper

This commit is contained in:
Přemysl Eric Janouch 2014-07-13 05:56:30 +02:00
parent 51909edc76
commit 03ec980f26
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common.c
View File

@ -1417,6 +1417,15 @@ set_boolean_if_valid (bool *out, const char *s)
return true; return true;
} }
static bool
xstrtoul (unsigned long *out, const char *s, int base)
{
char *end;
errno = 0;
*out = strtoul (s, &end, base);
return errno == 0 && !*end && end != s;
}
static bool static bool
read_line (FILE *fp, struct str *s) read_line (FILE *fp, struct str *s)
{ {

6
src/zyklonb.c
View File

@ -1418,10 +1418,8 @@ irc_try_reconnect (struct bot_context *ctx)
const char *delay_str = str_map_find (&ctx->config, "reconnect_delay"); const char *delay_str = str_map_find (&ctx->config, "reconnect_delay");
hard_assert (delay_str != NULL); // We have a default value for this hard_assert (delay_str != NULL); // We have a default value for this
char *end_ptr; unsigned long delay;
errno = 0; if (!xstrtoul (&delay, delay_str, 10))
long delay = strtol (delay_str, &end_ptr, 10);
if (errno != 0 || end_ptr == delay_str || *end_ptr)
{ {
print_error ("invalid configuration value for `%s'", print_error ("invalid configuration value for `%s'",
"reconnect_delay"); "reconnect_delay");