send_html_file(): remove a discards qualifyer warning

and untangle assignment from check.

 Michael
This commit is contained in:
Michael Adam 2009-08-07 08:56:46 +02:00
parent 3adec81872
commit 02e7bc7545

View File

@ -115,7 +115,7 @@ int
send_html_file (FILE * infile, struct conn_s *connptr) send_html_file (FILE * infile, struct conn_s *connptr)
{ {
char inbuf[HTML_BUFSIZE], *varstart = NULL, *p; char inbuf[HTML_BUFSIZE], *varstart = NULL, *p;
char *varval; const char *varval;
int in_variable = 0, writeret; int in_variable = 0, writeret;
while (fgets (inbuf, HTML_BUFSIZE, infile) != NULL) while (fgets (inbuf, HTML_BUFSIZE, infile) != NULL)
@ -128,7 +128,8 @@ send_html_file (FILE * infile, struct conn_s *connptr)
if (in_variable) if (in_variable)
{ {
*p = '\0'; *p = '\0';
if (!(varval = lookup_variable (connptr, varstart))) varval = (const char *)lookup_variable (connptr, varstart);
if (!varval)
varval = "(unknown)"; varval = "(unknown)";
writeret = write_message (connptr->client_fd, "%s", varval); writeret = write_message (connptr->client_fd, "%s", varval);
if (writeret) if (writeret)