From 5eb62f3169c0cc0b3ae0d848378b467fcea321ef Mon Sep 17 00:00:00 2001 From: david Date: Tue, 4 Dec 2012 03:06:18 +0000 Subject: [PATCH] Give comparescriptids static scope. --- output.cc | 28 +++++++++++++--------------- output.h | 4 ---- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/output.cc b/output.cc index d1568093c..1da4f5202 100644 --- a/output.cc +++ b/output.cc @@ -447,6 +447,19 @@ std::string protect_xml(const std::string s) { return escape_for_screen(s); } +/* This is a helper function to determine the ordering of the script results + based on their id. */ +static bool comparescriptids(ScriptResult first, ScriptResult second) { + //Pull the two id fields out for comparison + std::string firstid(first.get_id()); + std::string secondid(second.get_id()); + + if (firstid < secondid) + return true; + else + return false; +} + static char *formatScriptOutput(ScriptResult sr) { std::vector lines; @@ -2612,18 +2625,3 @@ void printdatafilepaths() { } } } - -/*This is a helper function to determine the ordering of the script results - based on their id */ -bool comparescriptids(ScriptResult first, ScriptResult second){ - //Pull the two id fields out for comparison - std::string firstid(first.get_id()); - std::string secondid(second.get_id()); - - if (firstid < secondid) - return true; - else - return false; -} - - diff --git a/output.h b/output.h index 05650bc36..d416f3728 100644 --- a/output.h +++ b/output.h @@ -253,8 +253,4 @@ void printfinaloutput(); were found. */ void printdatafilepaths(); -/*This is a helper function to determine the ordering of the script results - based on their id */ -bool comparescriptids(ScriptResult first, ScriptResult second); - #endif /* OUTPUT_H */