Avoid shadowing "message"

Just move the declarations closer to their use, and get rid of some temporaries
altogether.

Author: tautschnig

src/goto-analyzer/taint_parser.cpp

@@ -57,11 +57,6 @@ bool taint_parser(
     taint_parse_treet::rulet rule;
 
     const std::string kind=(*it)["kind"].value;
-    const std::string function=(*it)["function"].value;
-    const std::string where=(*it)["where"].value;
-    const std::string taint=(*it)["taint"].value;
-    const std::string message=(*it)["message"].value;
-    const std::string id=(*it)["id"].value;
 
     if(kind=="source")
       rule.kind=taint_parse_treet::rulet::SOURCE;
@@ -78,6 +73,8 @@ bool taint_parser(
       return true;
     }
 
+    const std::string function = (*it)["function"].value;
+
     if(function.empty())
     {
       messaget message(message_handler);
@@ -88,6 +85,8 @@ bool taint_parser(
     else
       rule.function_identifier=function;
 
+    const std::string where = (*it)["where"].value;
+
     if(where=="return_value")
     {
       rule.where=taint_parse_treet::rulet::RETURN_VALUE;
@@ -112,9 +111,9 @@ bool taint_parser(
       return true;
     }
 
-    rule.taint=taint;
-    rule.message=message;
-    rule.id=id;
+    rule.taint = (*it)["taint"].value;
+    rule.message = (*it)["message"].value;
+    rule.id = (*it)["id"].value;
 
     dest.rules.push_back(rule);
   }