[oolite] 01/06: Fix error and omissions in eca0beabc3248c3afe3cf8c89d5a3bceeb7a5346.

[Nicolas Boulenguez]

This is an automated email from the git hooks/post-receive script.

nicobou-guest pushed a commit to branch master
in repository oolite.

commit def7b1d716afd1ad614b599362789dbe61a8faf9
Author: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
Date:   Wed Sep 2 23:00:43 2015 +0200

    Fix error and omissions in eca0beabc3248c3afe3cf8c89d5a3bceeb7a5346.
---
 debian/patches/secure-format-log-string.diff | 47 ++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/debian/patches/secure-format-log-string.diff b/debian/patches/secure-format-log-string.diff
index 67e1c0d..f0f5741 100644
--- a/debian/patches/secure-format-log-string.diff
+++ b/debian/patches/secure-format-log-string.diff
@@ -576,6 +576,15 @@ Forwarded: not-needed
  #endif
  	
  	ooliteVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
+@@ -429,7 +429,7 @@
+ 	pListRep = [self dictionaryOfCaches];
+ 	if (ooliteVersion == nil || endianTag == nil || formatVersion == nil || pListRep == nil)
+ 	{
+-		OOLog(@"dataCache.cantWrite", @"Failed to write data cache -- prerequisites not fulfilled. %@",@"This is an internal error, please report it.");
++		OOLog(@"dataCache.cantWrite", @"%@", @"Failed to write data cache -- prerequisites not fulfilled. This is an internal error, please report it.");
+ 		return;
+ 	}
+ 	
 @@ -461,11 +461,11 @@
  	if ([self writeDict:newCache])
  	{
@@ -590,6 +599,20 @@ Forwarded: not-needed
  	}
  #endif
  }
+@@ -733,11 +733,11 @@
+ {
+ 	if ([[OOCacheManager sharedCache] writeDict:_cacheContents])
+ 	{
+-		OOLog(kOOLogDataCacheWriteSuccess, @"Wrote data cache.");
++		OOLog(kOOLogDataCacheWriteSuccess, @"%@", @"Wrote data cache.");
+ 	}
+ 	else
+ 	{
+-		OOLog(kOOLogDataCacheWriteFailed, @"Failed to write data cache.");
++		OOLog(kOOLogDataCacheWriteFailed, @"%@", @"Failed to write data cache.");
+ 	}
+ 	DESTROY(_cacheContents);
+ }
 --- a/src/Core/OOGraphicsResetManager.m
 +++ b/src/Core/OOGraphicsResetManager.m
 @@ -74,7 +74,7 @@
@@ -950,6 +973,15 @@ Forwarded: not-needed
  		upToDate = NO;
  	}
  	
+@@ -1173,7 +1173,7 @@
+ 		
+ 	if (upToDate && ![[cacheMgr objectForKey:kOOCacheKeyModificationDates inCache:kOOCacheSearchPathModDates] isEqual:modDates])
+ 	{
+-		OOLog(kOOLogCacheStaleDates, @"Cache is stale (modification dates have changed). Rebuilding from scratch.");
++		OOLog(kOOLogCacheStaleDates, @"%@", @"Cache is stale (modification dates have changed). Rebuilding from scratch.");
+ 		upToDate = NO;
+ 	}
+ 	
 @@ -1183,7 +1183,7 @@
  		[cacheMgr setObject:searchPaths forKey:kOOCacheKeySearchPaths inCache:kOOCacheSearchPathModDates];
  		[cacheMgr setObject:modDates forKey:kOOCacheKeyModificationDates inCache:kOOCacheSearchPathModDates];
@@ -1051,6 +1083,21 @@ Forwarded: not-needed
  	}
  #endif
  		
+@@ -440,12 +440,12 @@
+ 	if (JS_IsInRequest(gOOJSMainThreadContext))
+ 	{
+ 		// some threads are still pending, this should mean timers are still being removed.
+-		OOLog(@"script.javascript.init.error", @"JavaScript processes still pending. Can't reset JavaScript engine.");
++		OOLog(@"script.javascript.init.error", @"%@", @"JavaScript processes still pending. Can't reset JavaScript engine.");
+ 		return NO;
+ 	}
+ 	else
+ 	{
+-		OOLog(@"script.javascript.init", @"JavaScript reset successful.");
++		OOLog(@"script.javascript.init", @"%@", @"JavaScript reset successful.");
+ 	}
+ #endif
+ 	
 --- a/src/Core/Scripting/OOScript.m
 +++ b/src/Core/Scripting/OOScript.m
 @@ -255,21 +255,21 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/oolite.git