fix warnings related to format strings

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@36234 72102866-910b-0410-8b05-ffd578937521

Apps/EOModelEditor/EOMEDocument.m

@@ -759,7 +759,7 @@ NSString *EOMConsistencyModelObjectKey = @"EOMConsistencyModelObjectKey";
 - (IBAction) directionChanged:(id) sender
 {
   NSMenuItem    * item = [_storedProcDirectionUp selectedItem];
-  NSLog(@"%s:%d", __PRETTY_FUNCTION__, [item tag]);
+  NSLog(@"%s:%"PRIiPTR, __PRETTY_FUNCTION__, [item tag]);
 }
 
 #pragma mark -

ChangeLog

@@ -22,7 +22,13 @@
 	* EOControl/EOKeyValueCoding.m
 	* EOControl/EOFault.h
 	  mark EOFault and GDL2KVCNSObject classes as root classes
-	
+	* Apps/EOModelEditor/EOMEDocument.m
+	* EOAccess/EODatabaseContext.m
+	* EOControl/EODebug.h
+	* EOControl/EOQualifier.m
+	* Tools/gsdoc-model.m
+	  fix warnings related to format strings
+
 2013-03-01: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
 	* EOControl/EODebug.m
 	  do not use redundant stringWithString

EOAccess/EODatabaseContext.m

@@ -176,7 +176,7 @@ static Class _contextClass = Nil;
     model = [[[EOModelGroup defaultGroup] entityNamed:entityName] model];
 
   if (model == nil)
-    NSLog(@"%@ -- %@ 0x%x: No model for entity named %@",
+    NSLog(@"%@ -- %@ %@: No model for entity named %@",
 	  NSStringFromSelector(_cmd), 
 	  NSStringFromClass([self class]),
 	  self,
@@ -474,7 +474,7 @@ static Class _contextClass = Nil;
 {
 //call channel databaseContext
 //test if not exists  _registeredChannels indexOfObjectIdenticalTo:channel
-  NSDebugLog(@"** REGISTER channel ** debug:%d ** total registered:%d",
+  NSDebugLog(@"** REGISTER channel ** debug:%d ** total registered:%"PRIuPTR,
 	     [[channel adaptorChannel] isDebugEnabled],
 	     [_registeredChannels count] + 1);
 
@@ -5385,7 +5385,7 @@ compareUsingEntityNames(id left, id right, void* vpSortOrders)
   else
     {
       NSEmitTODO();
-      NSWarnLog(@"_uniqueStack is empty. May be there's no runing transaction !", "");
+      NSWarnLog(@"_uniqueStack is empty. May be there's no runing transaction !");
 
       [self notImplemented: _cmd]; //TODO
     }

EOControl/EODebug.h

@@ -69,56 +69,56 @@ GDL2CONTROL_EXPORT void EOFLogAssertGood_(const char* file,int line,
   do { if (GSDebugSet(@"EOFFn") == YES) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGObjectFnStartCond(cond)  \
   do { if ((GSDebugSet(@"EOFFn") == YES)  && GSDebugSet(cond) == YES) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGClassFnStartOrCond(cond)  \
   do { if ((GSDebugSet(@"EOFFn") == YES) || (GSDebugSet(cond) == YES)) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGClassFnStartOrCond2(cond1,cond2)  \
   do { if ((GSDebugSet(@"EOFFn") == YES) || (GSDebugSet(cond1) == YES) || (GSDebugSet(cond2) == YES)) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"FNSTART"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGClassFnStop()  \
   do { if (GSDebugSet(@"EOFFn") == YES) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,__FILE__, __LINE__,@"FNSTOP"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGObjectFnStopCond(cond)  \
   do { if ((GSDebugSet(@"EOFFn") == YES) && GSDebugSet(cond) == YES) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGClassFnStopOrCond(cond)  \
   do { if ((GSDebugSet(@"EOFFn") == YES) || (GSDebugSet(cond) == YES)) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,__FILE__, __LINE__,@"FNSTOP"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGClassFnStopOrCond2(cond1,cond2)  \
   do { if ((GSDebugSet(@"EOFFn") == YES) || (GSDebugSet(cond1) == YES) || (GSDebugSet(cond2) == YES)) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__,__FILE__, __LINE__,@"FNSTOP"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGClassLevel(level,format) \
   do { if (GSDebugSet(level) == YES) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugFunctionMsg( \
         __PRETTY_FUNCTION__, __FILE__, __LINE__, format); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGClassLevelArgs(level, format, args...) \
   do { if (GSDebugSet(level) == YES) { \
@@ -131,7 +131,7 @@ GDL2CONTROL_EXPORT void EOFLogAssertGood_(const char* file,int line,
   do { if (GSDebugSet(@"EOFdflt") == YES) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugFunctionMsg(__PRETTY_FUNCTION__, __FILE__, __LINE__,@"NOT IMPLEMENTED"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 
 
@@ -141,56 +141,56 @@ GDL2CONTROL_EXPORT void EOFLogAssertGood_(const char* file,int line,
   do { if (GSDebugSet(@"EOFFn") == YES) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGObjectFnStartOrCond(cond)  \
   do { if ((GSDebugSet(@"EOFFn") == YES) || (GSDebugSet(cond) == YES)) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGObjectFnStartOrCond2(cond1,cond2)  \
   do { if ((GSDebugSet(@"EOFFn") == YES) || (GSDebugSet(cond1) == YES) || (GSDebugSet(cond2) == YES)) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTART"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGObjectFnStop()  \
   do { if (GSDebugSet(@"EOFFn") == YES) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGObjectFnStopOrCond(cond)  \
   do { if ((GSDebugSet(@"EOFFn") == YES) || (GSDebugSet(cond) == YES)) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGObjectFnStopOrCond2(cond1,cond2)  \
   do { if ((GSDebugSet(@"EOFFn") == YES) || (GSDebugSet(cond1) == YES) || (GSDebugSet(cond2) == YES)) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"FNSTOP"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGObjectFnStopPlain(fmt)  \
   do { if (GSDebugSet(@"EOFFn") == YES) { \
-    NSLog(fmt); }} while (0)
+    NSLog(@"%@", fmt); }} while (0)
 
 #define EOFLOGObjectFnStopOrCondPlain(cond,fmt)  \
   do { if ((GSDebugSet(@"EOFFn") == YES) || (GSDebugSet(cond) == YES)) { \
-    NSLog(fmt); }} while (0)
+    NSLog(@"%@", fmt); }} while (0)
 
 #define EOFLOGObjectFnStopOrCond2Plain(cond1,cond2,fmt)  \
   do { if ((GSDebugSet(@"EOFFn") == YES) || (GSDebugSet(cond1) == YES) || (GSDebugSet(cond2) == YES)) { \
-    NSLog(fmt); }} while (0)
+    NSLog(@"%@", fmt); }} while (0)
 
 #define EOFLOGObjectLevel(level,format) \
   do { if (GSDebugSet(level) == YES) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugMethodMsg( \
         self, _cmd, __FILE__, __LINE__, format); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 #define EOFLOGObjectLevelArgs(level, format, args...) \
   do { if (GSDebugSet(level) == YES) { \
@@ -204,7 +204,7 @@ GDL2CONTROL_EXPORT void EOFLogAssertGood_(const char* file,int line,
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugMethodMsg( \
         self, _cmd, __FILE__, __LINE__, format); \
-    NSLog(fmt); [tmpPool release]; } while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; } while (0)
 
 #define EOFLOGObjectArgs(format, args...) \
   do { \
@@ -217,7 +217,7 @@ GDL2CONTROL_EXPORT void EOFLogAssertGood_(const char* file,int line,
   do { if (GSDebugSet(@"EOFdflt") == YES) { \
     NSAutoreleasePool *tmpPool = [NSAutoreleasePool new]; \
     NSString *fmt = GSDebugMethodMsg(self, _cmd, __FILE__, __LINE__,@"NOT IMPLEMENTED"); \
-    NSLog(fmt); [tmpPool release]; }} while (0)
+    NSLog(@"%@", fmt); [tmpPool release]; }} while (0)
 
 
 

EOControl/EOQualifier.m

@@ -182,8 +182,7 @@ static NSString *getOperator(const unichar **cFormat, const unichar **s)
 	     && !spaceCIM(spaceSet, cimSEL, **s)
 	     && **s != '%' && **s != '\'')
         {
-	  NSDebugLog(@"avoid gcc 3.1.1 bug which optimizes to segfault",
+	  NSDebugLog(@"avoid gcc 3.1.1 bug which optimizes to segfault");
-		     @"avoid gcc 3.1.1 bug which optimizes to segfault");
 	  (*s)++;
         }
 

Tools/gsdoc-model.m

@@ -125,7 +125,7 @@ main(int argc, char **argv, char **env)
 {
   NSProcessInfo		*proc;
   NSArray		*args;
-  unsigned		i;
+  NSUInteger		i;
   NSUserDefaults	*defs;
   NSMutableArray *files = nil;		// Files to parse
   NSString *templateFileName = nil;		// makeIndex template file name
@@ -388,7 +388,7 @@ main(int argc, char **argv, char **env)
 
           if (verbose >= 1)
             {
-              NSLog(@"File %d/%d - Processing %@",
+              NSLog(@"File %"PRIuPTR"/%"PRIuPTR" - Processing %@",
                     (i+1),
                     [files count],
                     file);
@@ -415,7 +415,7 @@ main(int argc, char **argv, char **env)
 
                   if (gsdocModelContent == nil)
                     {
-                      NSLog(@"File %d/%d - Error generating doc for %@",
+                      NSLog(@"File %"PRIuPTR"/%"PRIuPTR" - Error generating doc for %@",
                             (i+1),
                             [files count],
                             file);
@@ -497,7 +497,7 @@ main(int argc, char **argv, char **env)
 
                       if (verbose >= 1)
                         {
-                          NSLog(@"File %d/%d - Generating %@ - OK",
+                          NSLog(@"File %"PRIuPTR"/%"PRIuPTR" - Generating %@ - OK",
                                 (i+1),
                                 [files count],
                                 file);
@@ -506,7 +506,7 @@ main(int argc, char **argv, char **env)
                 }
               else
                 {
-                  NSLog(@"File %d/%d - Error parsing '%@'",
+                  NSLog(@"File %"PRIuPTR"/%"PRIuPTR" - Error parsing '%@'",
                         (i+1),
                         [files count],
                         file);
@@ -515,7 +515,7 @@ main(int argc, char **argv, char **env)
             }
           NS_HANDLER
             {
-              NSLog(@"File %d/%d - Parsing '%@' - %@",
+              NSLog(@"File %"PRIuPTR"/%"PRIuPTR" - Parsing '%@' - %@",
                     (i+1),
                     [files count],
                     file,