changeset 2394:e0c63f2cbdbf

Mac: Clean up some code errors reported by LLVM.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 25 Mar 2021 09:02:09 +0000
parents 6669e152e30b
children 2618277de356
files mac/dw.m
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Thu Mar 25 07:48:38 2021 +0000
+++ b/mac/dw.m	Thu Mar 25 09:02:09 2021 +0000
@@ -6832,7 +6832,7 @@
     bool bCanDraw = YES;
 
     if(pixmap)
-        bi = image = (id)pixmap->image;
+        bi = (id)pixmap->image;
     else
     {
 #ifdef BUILDING_FOR_MOJAVE
@@ -6893,7 +6893,7 @@
     bool bCanDraw = YES;
 
     if(pixmap)
-        bi = image = (id)pixmap->image;
+        bi = (id)pixmap->image;
     else
     {
 #ifdef BUILDING_FOR_MOJAVE
@@ -6958,14 +6958,13 @@
 
     if(pixmap)
     {
-        bi = image = (id)pixmap->image;
+        bi = (id)pixmap->image;
         font = pixmap->font;
         render = pixmap->handle;
         if(!font && [render isMemberOfClass:[DWRender class]])
         {
             font = [render font];
         }
-        image = (id)pixmap->image;
     }
     else if(image && [image isMemberOfClass:[DWRender class]])
     {
@@ -7096,7 +7095,7 @@
     int z;
 
     if(pixmap)
-        bi = image = (id)pixmap->image;
+        bi = (id)pixmap->image;
     else
     {
 #ifdef BUILDING_FOR_MOJAVE
@@ -7172,7 +7171,7 @@
     bool bCanDraw = YES;
 
     if(pixmap)
-        bi = image = (id)pixmap->image;
+        bi = (id)pixmap->image;
     else
     {
 #ifdef BUILDING_FOR_MOJAVE
@@ -7243,7 +7242,7 @@
     bool bCanDraw = YES;
 
     if(pixmap)
-        bi = image = (id)pixmap->image;
+        bi = (id)pixmap->image;
     else
     {
 #ifdef BUILDING_FOR_MOJAVE
@@ -12549,7 +12548,7 @@
                         completionHandler:^(BOOL granted, NSError * _Nullable error) {
                             if (granted)
                             {
-                                center.delegate = [[DWUserNotificationCenterDelegate alloc] init];
+                                center.delegate = [[[DWUserNotificationCenterDelegate alloc] init] autorelease];
                             }
                             else
                             {
@@ -12894,6 +12893,7 @@
         /* Attempt to execute the commmand, DW_ERROR_NONE on success */
         if(system(commandline) != -1)
             ret = DW_ERROR_NONE;
+        free(commandline);
     }
     return ret;
 }