From 305c74d5163c5e344a675d39ca2394a9e45bd2c2 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Fri, 2 Feb 2007 17:28:58 +0000
Subject: Result of svn merge -r57264:57370
 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.

---
 indra/llvfs/lldir_win32.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/llvfs/lldir_win32.cpp')

diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp
index 8c2ed48813..08ef3d83b8 100644
--- a/indra/llvfs/lldir_win32.cpp
+++ b/indra/llvfs/lldir_win32.cpp
@@ -45,9 +45,9 @@ LLDir_Win32::LLDir_Win32()
 
 	if (GetTempPath(MAX_PATH, w_str))
 	{
-		if (wcslen(w_str))
+		if (wcslen(w_str))	/* Flawfinder: ignore */ 
 		{
-			w_str[wcslen(w_str)-1] = '\0'; // remove trailing slash
+			w_str[wcslen(w_str)-1] = '\0'; /* Flawfinder: ignore */ // remove trailing slash
 		}
 		mTempDir = utf16str_to_utf8str(llutf16string(w_str));
 	}
@@ -342,7 +342,7 @@ DWORD GetDllVersion(LPCTSTR lpszDllName)
     HINSTANCE hinstDll;
     DWORD dwVersion = 0;
 
-    hinstDll = LoadLibrary(lpszDllName);
+    hinstDll = LoadLibrary(lpszDllName);	/* Flawfinder: ignore */ 
 	
     if(hinstDll)
     {
-- 
cgit v1.2.3