Change signature for lookup_variable to take map instead of connptr

This commit is contained in:
Greg 2016-12-27 12:18:16 -05:00
parent e4ae0d10d2
commit 540069551d

View File

@ -86,18 +86,18 @@ static char *get_html_file (unsigned int errornum)
/*
* 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;
char *key;
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);
if (hashmap_return_entry (connptr->error_variables, result_iter,
if (hashmap_return_entry (map, result_iter,
&key, (void **) &data) < 0)
return (NULL);
@ -126,7 +126,7 @@ send_html_file (FILE *infile, struct conn_s *connptr)
if (in_variable) {
*p = '\0';
varval = (const char *)
lookup_variable (connptr,
lookup_variable (connptr->error_variables,
varstart);
if (!varval)
varval = "(unknown)";
@ -212,7 +212,7 @@ int send_http_error_message (struct conn_s *connptr)
error_file = get_html_file (connptr->error_number);
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,
connptr->error_number,
connptr->error_string,