svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/mac_updater/mac_updater.cpp b/indra/mac_updater/mac_updater.cpp
index 6a799ba45f..52902ea819 100644
--- a/indra/mac_updater/mac_updater.cpp
+++ b/indra/mac_updater/mac_updater.cpp
@@ -362,7 +362,7 @@ int main(int argc, char **argv)
 	llinfos << "Starting " << gProductName << " Updater" << llendl;
 
 	// Build the URL to download the update
-	snprintf(gUpdateURL, sizeof(gUpdateURL), "http://secondlife.com/update-macos.php?userserver=%s", gUserServer);		/* Flawfinder: ignore */
+	snprintf(gUpdateURL, sizeof(gUpdateURL), "http://secondlife.com/update-macos.php?userserver=%s", gUserServer);		
 	
 	// Real UI...
 	OSStatus err;
@@ -371,7 +371,7 @@ int main(int argc, char **argv)
 	err = CreateNibReference(CFSTR("AutoUpdater"), &nib);
 
 	char windowTitle[MAX_PATH];		/* Flawfinder: ignore */
-	snprintf(windowTitle, sizeof(windowTitle), "%s Updater", gProductName);		/* Flawfinder: ignore */
+	snprintf(windowTitle, sizeof(windowTitle), "%s Updater", gProductName);		
 	CFStringRef windowTitleRef = NULL;
 	windowTitleRef = CFStringCreateWithCString(NULL, windowTitle, kCFStringEncodingUTF8);
 	
@@ -545,8 +545,8 @@ int restoreObject(const char* aside, const char* target, const char* path, const
 {
 	char source[PATH_MAX];		/* Flawfinder: ignore */
 	char dest[PATH_MAX];		/* Flawfinder: ignore */
-	snprintf(source, sizeof(source), "%s/%s/%s", aside, path, object);		/* Flawfinder: ignore */
-	snprintf(dest, sizeof(dest), "%s/%s", target, path);		/* Flawfinder: ignore */
+	snprintf(source, sizeof(source), "%s/%s/%s", aside, path, object);		
+	snprintf(dest, sizeof(dest), "%s/%s", target, path);		
 	FSRef sourceRef;
 	FSRef destRef;
 	OSStatus err;
@@ -580,11 +580,11 @@ void filterFile(const char* filename)
 {
 	char temp[PATH_MAX];		/* Flawfinder: ignore */
 	// First copy the target's version, so we can run it through sed.
-	snprintf(temp, sizeof(temp), "cp '%s' '%s.tmp'", filename, filename);		/* Flawfinder: ignore */
+	snprintf(temp, sizeof(temp), "cp '%s' '%s.tmp'", filename, filename);		
 	system(temp);		/* Flawfinder: ignore */
 
 	// Now run it through sed.
-	snprintf(temp, sizeof(temp), 		/* Flawfinder: ignore */
+	snprintf(temp, sizeof(temp), 		
 			"sed 's/Second Life/%s/g' '%s.tmp' > '%s'", gProductName, filename, filename);
 	system(temp);		/* Flawfinder: ignore */
 }
@@ -740,7 +740,7 @@ void *updatethreadproc(void*)
 					throw 0;
 				}
 				
-				snprintf(target, sizeof(target), "/Applications/%s.app", gProductName);		/* Flawfinder: ignore */
+				snprintf(target, sizeof(target), "/Applications/%s.app", gProductName);		
 
 				memset(&targetRef, 0, sizeof(targetRef));
 				err = FSPathMakeRef((UInt8*)target, &targetRef, NULL);
@@ -836,7 +836,7 @@ void *updatethreadproc(void*)
 				
 		chdir(tempDir);
 		
-		snprintf(temp, sizeof(temp), "SecondLife.dmg");		/* Flawfinder: ignore */
+		snprintf(temp, sizeof(temp), "SecondLife.dmg");		
 		
 		downloadFile = fopen(temp, "wb");		/* Flawfinder: ignore */
 		if(downloadFile == NULL)
@@ -934,7 +934,7 @@ void *updatethreadproc(void*)
 		
 		// Get an FSRef to the new application on the disk image
 		FSRef sourceRef;
-		snprintf(temp, sizeof(temp), "%s/mnt/Second Life.app", tempDir);		/* Flawfinder: ignore */
+		snprintf(temp, sizeof(temp), "%s/mnt/Second Life.app", tempDir);		
 
 		llinfos << "Source application is: " << temp << llendl;
 
@@ -967,7 +967,7 @@ void *updatethreadproc(void*)
 		{
 			// Construct the name of the target based on the product name
 			char appName[MAX_PATH];		/* Flawfinder: ignore */
-			snprintf(appName, sizeof(appName), "%s.app", gProductName);		/* Flawfinder: ignore */
+			snprintf(appName, sizeof(appName), "%s.app", gProductName);		
 			utf8str_to_HFSUniStr255( &appNameUniStr, appName );
 		}
 		
@@ -1016,7 +1016,7 @@ void *updatethreadproc(void*)
 			llinfos << "Clearing cache..." << llendl;
 			
 			char mask[LL_MAX_PATH];		/* Flawfinder: ignore */
-			snprintf(mask, LL_MAX_PATH, "%s*.*", gDirUtilp->getDirDelimiter().c_str());		/* Flawfinder: ignore */
+			snprintf(mask, LL_MAX_PATH, "%s*.*", gDirUtilp->getDirDelimiter().c_str());		
 			gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,""),mask);
 			
 			llinfos << "Clear complete." << llendl;
@@ -1048,7 +1048,7 @@ void *updatethreadproc(void*)
 	{
 		llinfos << "Detaching disk image." << llendl;
 
-		snprintf(temp, sizeof(temp), "hdiutil detach '%s'", deviceNode);		/* Flawfinder: ignore */
+		snprintf(temp, sizeof(temp), "hdiutil detach '%s'", deviceNode);		
 		system(temp);		/* Flawfinder: ignore */
 	}
 
@@ -1073,12 +1073,12 @@ void *updatethreadproc(void*)
 	{
 		llinfos << "Touching application bundle." << llendl;
 
-		snprintf(temp, sizeof(temp), "touch '%s'", target);		/* Flawfinder: ignore */
+		snprintf(temp, sizeof(temp), "touch '%s'", target);		
 		system(temp);		/* Flawfinder: ignore */
 
 		llinfos << "Launching updated application." << llendl;
 
-		snprintf(temp, sizeof(temp), "open '%s'", target);		/* Flawfinder: ignore */
+		snprintf(temp, sizeof(temp), "open '%s'", target);		
 		system(temp);		/* Flawfinder: ignore */
 	}