Move plain_text guard inside html_head (addresses PR dspinellis#81 review)

Darsh-14 · Darsh-14 · commit bd94ab860e14 · 2026-03-18T00:04:12.000+05:30
diff --git a/src/cscout.cpp b/src/cscout.cpp
@@ -1066,8 +1066,7 @@ xfilequery_page(FILE *of,  void *)
 
 	multiset <Fileid, FileQuery::specified_order> sorted_files;
 
-	if (!plain_text)
-		html_head(of, "xfilequery", (qname && *qname) ? qname : "File Query Results");
+	html_head(of, "xfilequery", (qname && *qname) ? qname : "File Query Results", NULL, plain_text);
 
 	for (vector <Fileid>::iterator i = files.begin(); i != files.end(); i++) {
 		if (query.eval(*i))
@@ -1360,8 +1359,7 @@ xiquery_page(FILE *of,  void *)
 		return 0;
 	}
 
-	if (!plain_text)
-		html_head(of, "xiquery", (qname && *qname) ? qname : "Identifier Query Results");
+	html_head(of, "xiquery", (qname && *qname) ? qname : "Identifier Query Results", NULL, plain_text);
 	if (!quiet)
 		cerr << "Evaluating identifier query" << endl;
 	for (IdProp::iterator i = ids.begin(); i != ids.end(); i++) {
@@ -1421,8 +1419,7 @@ xfunquery_page(FILE *of,  void *)
 	if (!query.is_valid())
 		return 0;
 
-	if (!plain_text)
-		html_head(of, "xfunquery", (qname && *qname) ? qname : "Function Query Results");
+	html_head(of, "xfunquery", (qname && *qname) ? qname : "Function Query Results", NULL, plain_text);
 	if (!quiet)
 		cerr << "Evaluating function query" << endl;
 	for (Call::const_fmap_iterator_type i = Call::fbegin(); i != Call::fend(); i++) {
diff --git a/src/html.cpp b/src/html.cpp
@@ -141,8 +141,10 @@ html_string(FILE *of, string s)
 // Create a new HTML file with a given filename and title
 // The heading, if not given, will be the same as the title
 void
-html_head(FILE *of, const string fname, const string title, const char *heading)
+html_head(FILE *of, const string fname, const string title, const char *heading, bool plain_text)
 {
+	if (plain_text)
+		return;
 	swill_title(title.c_str());
 	if (DP())
 		cerr << "Write to " << fname << endl;
diff --git a/src/html.h b/src/html.h
@@ -36,7 +36,7 @@ class Call;
 const char * html(char c);
 string html(const string &s);
 void html_string(FILE *of, string s);
-void html_head(FILE *of, const string fname, const string title, const char *heading = NULL);
+void html_head(FILE *of, const string fname, const string title, const char *heading = NULL, bool plain_text = false);
 void html_tail(FILE *of);
 void html_perror(FILE *of, const string &user_msg, bool svg = false);
 void html_error(FILE *of, const string &user_msg);
