From be05d7b4358d0cc0cb1f5f8e5f04a77222d1cfee Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@illinois.edu>
Date: Thu, 5 Dec 2013 11:15:02 -0600
Subject: [PATCH] FreeBSD build fix addendum: unintended variable shadowing.

---
 src/util.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/util.cc b/src/util.cc
index 8b38246893..ad55e3f75e 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -971,12 +971,12 @@ FILE* open_package(string& path, const string& mode)
 	return 0;
 	}
 
-void SafePathOp::CheckValid(const char* result, const char* path,
+void SafePathOp::CheckValid(const char* op_result, const char* path,
                             bool error_aborts)
 	{
-	if ( result )
+	if ( op_result )
 		{
-		result = result;
+		result = op_result;
 		error = false;
 		}
 	else