Pantyhose-X/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conffile: change [sg]et_int_arg() to return unsigned long int

Browse Source 
This is also the parser regexp for INT in the definition.

Michael
This commit is contained in:
Michael Adam 2009-08-04 22:54:59 +02:00
parent 23b09947c6
commit b4d8c5b9bf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conffile.c
View File

@ -370,17 +370,17 @@ set_bool_arg (unsigned int *var, const char *line, regmatch_t * match)
return 0; return 0;
} }
static inline long int static inline unsigned long int
get_int_arg (const char *line, regmatch_t * match) get_int_arg (const char *line, regmatch_t * match)
{ {
assert (line); assert (line);
assert (match && match->rm_so != -1); assert (match && match->rm_so != -1);
return strtol (line + match->rm_so, NULL, 0); return strtoul (line + match->rm_so, NULL, 0);
} }
static int static int
set_int_arg (int long *var, const char *line, regmatch_t * match) set_int_arg (unsigned long int *var, const char *line, regmatch_t * match)
{ {
assert (var); assert (var);
assert (line); assert (line);
@ -505,7 +505,7 @@ HANDLE_FUNC (handle_bindsame)
static static
HANDLE_FUNC (handle_port) HANDLE_FUNC (handle_port)
{ {
return set_int_arg ((long int *) &conf->port, line, &match[2]); return set_int_arg ((unsigned long int *) &conf->port, line, &match[2]);
} }
static static
@ -546,7 +546,7 @@ HANDLE_FUNC (handle_maxrequestsperchild)
static static
HANDLE_FUNC (handle_timeout) HANDLE_FUNC (handle_timeout)
{ {
return set_int_arg ((long int *) &conf->idletimeout, line, &match[2]); return set_int_arg ((unsigned long int *) &conf->idletimeout, line, &match[2]);
} }
static static
@ -627,7 +627,7 @@ HANDLE_FUNC (handle_errorfile)
* present. This is why the "string" is located at * present. This is why the "string" is located at
* match[4] (rather than the more intuitive match[3]. * match[4] (rather than the more intuitive match[3].
*/ */
long int err = get_int_arg (line, &match[2]); unsigned long int err = get_int_arg (line, &match[2]);
char *page = get_string_arg (line, &match[4]); char *page = get_string_arg (line, &match[4]);
add_new_errorpage (page, err); add_new_errorpage (page, err);
@ -774,7 +774,7 @@ HANDLE_FUNC (handle_upstream)
ip = get_string_arg (line, &match[2]); ip = get_string_arg (line, &match[2]);
if (!ip) if (!ip)
return -1; return -1;
port = get_int_arg (line, &match[7]); port = (int)get_int_arg (line, &match[7]);
if (match[9].rm_so != -1) if (match[9].rm_so != -1)
{ {