Revision: 13897
http://sourceforge.net/p/skim-app/code/13897
Author: hofman
Date: 2023-12-12 16:02:32 +0000 (Tue, 12 Dec 2023)
Log Message:
-----------
remove some special destroy macros for non-objc variables
Modified Paths:
--------------
trunk/SKConversionProgressController.m
trunk/SKFileUpdateChecker.m
trunk/SKPDFDocument.m
trunk/SKPDFSynchronizer.m
trunk/SKVersionNumber.m
trunk/Skim_Prefix.pch
Modified: trunk/SKConversionProgressController.m
===================================================================
--- trunk/SKConversionProgressController.m 2023-12-12 14:55:12 UTC (rev
13896)
+++ trunk/SKConversionProgressController.m 2023-12-12 16:02:32 UTC (rev
13897)
@@ -117,8 +117,9 @@
}
- (void)dealloc {
+ if (converter) CFRelease(converter);
+ converter = NULL;
SKDESTROY(fileType);
- SKCFDESTROY(converter);
SKDESTROY(outputFileURL);
SKDESTROY(outputData);
SKDESTROY(task);
Modified: trunk/SKFileUpdateChecker.m
===================================================================
--- trunk/SKFileUpdateChecker.m 2023-12-12 14:55:12 UTC (rev 13896)
+++ trunk/SKFileUpdateChecker.m 2023-12-12 16:02:32 UTC (rev 13897)
@@ -93,7 +93,8 @@
// remove file monitor and invalidate timer; maybe we've changed
filesystems
if (source) {
dispatch_source_cancel(source);
- SKDISPATCHDESTROY(source);
+ dispatch_release(source);
+ source = NULL;
}
if (fileUpdateTimer) {
[fileUpdateTimer invalidate];
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2023-12-12 14:55:12 UTC (rev 13896)
+++ trunk/SKPDFDocument.m 2023-12-12 16:02:32 UTC (rev 13897)
@@ -46,8 +46,9 @@
@synthesize containingDocument, detectedWidgets;
- (void)dealloc {
+ if (languageDirectionAngles) NSZoneFree(NULL, languageDirectionAngles);
+ languageDirectionAngles = NULL;
containingDocument = nil;
- SKZONEDESTROY(languageDirectionAngles);
SKDESTROY(detectedWidgets);
[super dealloc];
}
Modified: trunk/SKPDFSynchronizer.m
===================================================================
--- trunk/SKPDFSynchronizer.m 2023-12-12 14:55:12 UTC (rev 13896)
+++ trunk/SKPDFSynchronizer.m 2023-12-12 16:02:32 UTC (rev 13897)
@@ -90,8 +90,10 @@
}
- (void)dealloc {
- SKDISPATCHDESTROY(queue);
- SKDISPATCHDESTROY(lockQueue);
+ dispatch_release(queue);
+ queue = NULL;
+ dispatch_release(lockQueue);
+ lockQueue = NULL;
SKDESTROY(fileManager);
SKDESTROY(pages);
SKDESTROY(lines);
Modified: trunk/SKVersionNumber.m
===================================================================
--- trunk/SKVersionNumber.m 2023-12-12 14:55:12 UTC (rev 13896)
+++ trunk/SKVersionNumber.m 2023-12-12 16:02:32 UTC (rev 13897)
@@ -164,9 +164,10 @@
- (void)dealloc;
{
+ if (components) NSZoneFree(NULL, components);
+ components = NULL;
SKDESTROY(originalVersionString);
SKDESTROY(cleanVersionString);
- SKZONEDESTROY(components);
[super dealloc];
}
Modified: trunk/Skim_Prefix.pch
===================================================================
--- trunk/Skim_Prefix.pch 2023-12-12 14:55:12 UTC (rev 13896)
+++ trunk/Skim_Prefix.pch 2023-12-12 16:02:32 UTC (rev 13897)
@@ -47,10 +47,7 @@
} while (0)
#define SKDESTROY(variable) do { [variable release]; variable = nil; }
while (0)
- #define SKCFDESTROY(variable) do { if (variable) CFRelease(variable);
variable = NULL; } while (0)
- #define SKZONEDESTROY(variable) do { if (variable)
NSZoneFree(NSZoneFromPointer((void*)variable), (void *)variable); variable =
NULL; } while (0)
- #define SKDISPATCHDESTROY(variable) do { if (variable)
dispatch_release(variable); variable = nil; } while (0)
-
+
#define DISPATCH_MAIN_AFTER_SEC(time, block)
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(time *
NSEC_PER_SEC)), dispatch_get_main_queue(), block)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
