merge

gnustep · Jan 16, 2023 · de5e8f6 · de5e8f6
2 parents 63af855 + 5964418
commit de5e8f6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,12 @@
 	* Framework/PCProjectWindow.m
 	nil the delegates of the split-view, avoid a crash on close window.
 
+2022-01-13 Riccardo Mottola <[email protected]>
+
+	* Framework/PCProjectInspector.m
+	Don't assign nil, it is useless, just destroy it: retaining nil is
+	useless.
+
 2022-01-12 Riccardo Mottola <[email protected]>
 
 	* Modules/Editors/ProjectCenter/PCEditor.h

diff --git a/Framework/PCProjectInspector.m b/Framework/PCProjectInspector.m
@@ -1,7 +1,7 @@
 /*
    GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
 
-   Copyright (C) 2000-2021 Free Software Foundation
+   Copyright (C) 2000-2023 Free Software Foundation
 
    Authors: Philippe C.D. Robert
             Serg Stoyan
@@ -429,7 +429,7 @@ - (void)searchOrderPopupDidChange:(id)sender
     }
   else  
     {
-      ASSIGN(searchItems,nil);
+      DESTROY(searchItems);
     }
 
   [searchOrderList reloadData];

diff --git a/Modules/Editors/ProjectCenter/SyntaxDefinition.m b/Modules/Editors/ProjectCenter/SyntaxDefinition.m
@@ -339,7 +339,7 @@ + (void)initialize
                   NSLog(_(@"Missing keyword pattern declaration "
                           @"in context %i keyword %i. Ignoring all the "
                           @"remaining of the keywords in this context."),
-                          i, j);
+			  (int)i, (int)j);
                   break;
                 }
               pattern = CompileTextPattern(keywordString);

diff --git a/Modules/Editors/ProjectCenter/TextPattern.m b/Modules/Editors/ProjectCenter/TextPattern.m
@@ -67,7 +67,7 @@
                     {
                       NSLog(_(@"Text pattern item parse error in text "
                         @"pattern \"%@\" at index %i: unexpected end of "
-                        @"pattern. Escape sequence expected."), string);
+			      @"pattern. Escape sequence expected."), string, i);
 
                       free (buf);
                       free (newItem);
@@ -126,7 +126,7 @@
           {
             NSLog(_(@"Text pattern item parse error in text pattern "
               @"\"%@\" at index %i: unexpected end of pattern. Escape "
-              @"sequence expected."), string);
+		    @"sequence expected."), string, i);
 
             free (newItem);
             return NULL;
@@ -172,8 +172,8 @@
               if (![scanner scanInt: &value])
                 {
                   NSLog(_(@"Text pattern item parse error in text pattern "
-                    @"\"%@\" at index %i: integer expected."), string,
-                    [scanner scanLocation]);
+                    @"\"%@\" at index %li: integer expected."), string,
+			(long int)[scanner scanLocation]);
 
                   FreeTextPatternItem(newItem);
 
@@ -198,8 +198,8 @@
                   if (![scanner scanInt: &value])
                     {
                       NSLog(_(@"Text pattern item parser error in text "
-                        @"pattern \"%@\" at index %i: integer expected."),
-                        string, [scanner scanLocation]);
+                        @"pattern \"%@\" at index %li: integer expected."),
+			    string, (long int)[scanner scanLocation]);
 
                       FreeTextPatternItem(newItem);
 

diff --git a/Modules/Projects/Framework/PCFrameworkProject.m b/Modules/Projects/Framework/PCFrameworkProject.m
@@ -1,7 +1,7 @@
 /*
    GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
 
-   Copyright (C) 2005-2018 Free Software Foundation
+   Copyright (C) 2005-2023 Free Software Foundation
 
    Authors: Serg Stoyan
             Riccardo Mottola
@@ -319,11 +319,11 @@ - (void)appendGSDoc:(PCMakefileFactory *)mff
   [mff appendString:@"\n#\n# AutoGSDoc\n#\n"];
   [mff appendString: [NSString stringWithFormat:@"DOCUMENT_NAME = %@\n\n", projectName]];
   [mff appendString: [NSString stringWithFormat:@"%@_AGSDOC_FILES = %@.gsdoc \\\n", 
-                              projectName, projectName]];
+			       projectName, projectName]];
   [mff appendString: [NSString stringWithFormat:@"\t$(%@_HEADER_FILES) \\\n", 
-                              projectName, projectName]];
+                              projectName]];
   [mff appendString: [NSString stringWithFormat:@"\t$(%@_OBJC_FILES) \\\n", 
-                              projectName, projectName]];
+                              projectName]];
   [mff appendString: [NSString stringWithFormat:@"\n\n%@_AGSDOC_FLAGS += -MakeFrames YES\n", projectName]];
 }
 

diff --git a/Resources/Info-gnustep.plist b/Resources/Info-gnustep.plist
@@ -72,6 +72,6 @@
     }
   );
   URL = "See http://www.gnustep.org/";
-  Copyright = "Copyright (C) 1999 - 2022 Free Software Foundation";
+  Copyright = "Copyright (C) 1999 - 2023 Free Software Foundation";
   CopyrightDescription = "Released under the GNU General Public License 3.0 or later";
 }