bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change signature for lookup_variable to take map instead of connptr

Browse Source
This commit is contained in:
Greg 2016-12-27 12:18:16 -05:00
parent e4ae0d10d2
commit 540069551d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/html-error.c
View File

@ -86,18 +86,18 @@ static char *get_html_file (unsigned int errornum)
/* /*
* Look up the value for a variable. * Look up the value for a variable.
*/ */
static char *lookup_variable (struct conn_s *connptr, const char *varname) static char *lookup_variable (hashmap_t map, const char *varname)
{ {
hashmap_iter result_iter; hashmap_iter result_iter;
char *key; char *key;
char *data; char *data;
result_iter = hashmap_find (connptr->error_variables, varname); result_iter = hashmap_find (map, varname);
if (hashmap_is_end (connptr->error_variables, result_iter)) if (hashmap_is_end (map, result_iter))
return (NULL); return (NULL);
if (hashmap_return_entry (connptr->error_variables, result_iter, if (hashmap_return_entry (map, result_iter,
&key, (void **) &data) < 0) &key, (void **) &data) < 0)
return (NULL); return (NULL);
@ -126,7 +126,7 @@ send_html_file (FILE *infile, struct conn_s *connptr)
if (in_variable) { if (in_variable) {
*p = '\0'; *p = '\0';
varval = (const char *) varval = (const char *)
lookup_variable (connptr, lookup_variable (connptr->error_variables,
varstart); varstart);
if (!varval) if (!varval)
varval = "(unknown)"; varval = "(unknown)";
@ -212,7 +212,7 @@ int send_http_error_message (struct conn_s *connptr)
error_file = get_html_file (connptr->error_number); error_file = get_html_file (connptr->error_number);
if (!(infile = fopen (error_file, "r"))) { if (!(infile = fopen (error_file, "r"))) {
char *detail = lookup_variable (connptr, "detail"); char *detail = lookup_variable (connptr->error_variables, "detail");
return (write_message (connptr->client_fd, fallback_error, return (write_message (connptr->client_fd, fallback_error,
connptr->error_number, connptr->error_number,
connptr->error_string, connptr->error_string,