From 3f415ef38aa80258d021b0a2990dc883955212e1 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 2 Aug 2012 06:21:01 +0000
Subject: [PATCH] Factor out XML script result writing.

---
 nse_main.cc |  8 ++++++++
 nse_main.h  |  1 +
 output.cc   | 17 +++++------------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/nse_main.cc b/nse_main.cc
index bbe358ebf..2ccb189b5 100644
--- a/nse_main.cc
+++ b/nse_main.cc
@@ -381,6 +381,14 @@ ScriptResults *get_script_scan_results_obj (void)
   return &script_scan_results;
 }
 
+void ScriptResult::write_xml() const
+{
+  xml_open_start_tag("script");
+  xml_attribute("id", "%s", get_id());
+  xml_attribute("output", "%s", get_output());
+  xml_close_empty_tag();
+}
+
 /* int panic (lua_State *L)
  *
  * Panic function set via lua_atpanic().
diff --git a/nse_main.h b/nse_main.h
index 3a1455d3e..74add8a4a 100644
--- a/nse_main.h
+++ b/nse_main.h
@@ -26,6 +26,7 @@ class ScriptResult
     const char *get_output (void) const;
     void set_id (const char *);
     const char *get_id (void) const;
+    void write_xml() const;
 };
 
 typedef std::list<ScriptResult> ScriptResults;
diff --git a/output.cc b/output.cc
index 4bc1a92a4..bf5d80d40 100644
--- a/output.cc
+++ b/output.cc
@@ -795,10 +795,7 @@ void printportoutput(Target *currenths, PortList *plist) {
           current->scriptResults.sort(comparescriptids);
           for (ssr_iter = current->scriptResults.begin();
                ssr_iter != current->scriptResults.end(); ssr_iter++) {
-            xml_open_start_tag("script");
-            xml_attribute("id", "%s", ssr_iter->get_id());
-            xml_attribute("output", "%s", ssr_iter->get_output());
-            xml_close_empty_tag();
+            ssr_iter->write_xml();
 
             char *script_output = formatScriptOutput((*ssr_iter));
             Tbl->addItem(rowno, 0, true, true, script_output);
@@ -2198,10 +2195,8 @@ void printscriptresults(ScriptResults *scriptResults, stype scantype) {
     for (iter = scriptResults->begin();
          iter != scriptResults->end();
          iter++) {
-      xml_open_start_tag("script");
-      xml_attribute("id", "%s", iter->get_id());
-      xml_attribute("output", "%s", iter->get_output());
-      xml_close_empty_tag();
+      iter->write_xml();
+
       script_output = formatScriptOutput((*iter));
       log_write(LOG_PLAIN, "%s\n", script_output);
       free(script_output);
@@ -2222,10 +2217,8 @@ void printhostscriptresults(Target *currenths) {
     for (iter = currenths->scriptResults.begin();
          iter != currenths->scriptResults.end();
          iter++) {
-      xml_open_start_tag("script");
-      xml_attribute("id", "%s", iter->get_id());
-      xml_attribute("output", "%s", iter->get_output());
-      xml_close_empty_tag();
+      iter->write_xml();
+
       script_output = formatScriptOutput((*iter));
       log_write(LOG_PLAIN, "%s\n", script_output);
       free(script_output);