macosx: more optimizations for bookmarks and wizard. no functional changes

(cherry picked from commit 5ab6bfbd95919205b92770293c8046696c5b3ebf)

modules/gui/macosx/bookmarks.m

@@ -283,9 +283,8 @@ clear:
     int i_bookmarks ;
     int i_first = -1;
     int i_second = -1;
-    int x = 0;
     int c = 0;
-    while (c != 2)
+    for (NSUInteger x = 0; c != 2; x++)
     {
         if([o_tbl_dataTable isRowSelected:x])
         {
@@ -300,7 +299,6 @@ clear:
                 c = 2;
             }
         }
-        x = (x + 1);
     }
  
     msg_Dbg( VLCIntf, "got the bookmark-indexes");
@@ -415,17 +413,18 @@ clear:
     }
     else
     {
-        if ([[theTableColumn identifier] isEqualToString: @"description"])
+        NSString * identifier = [theTableColumn identifier];
+        if ([identifier isEqualToString: @"description"])
         {
             toBeReturned = pp_bookmarks[row]->psz_name;
             ret = [NSString stringWithUTF8String: toBeReturned];
         }
-        else if ([[theTableColumn identifier] isEqualToString: @"size_offset"])
+        else if ([identifier isEqualToString: @"size_offset"])
         {
             i_toBeReturned = pp_bookmarks[row]->i_byte_offset;
             ret = [[NSNumber numberWithInt: i_toBeReturned] stringValue];
         }
-        else if ([[theTableColumn identifier] isEqualToString: @"time_offset"])
+        else if ([identifier isEqualToString: @"time_offset"])
         {
             i_toBeReturned = pp_bookmarks[row]->i_time_offset;
             ret = [[NSNumber numberWithInt: (i_toBeReturned / 1000000)]
@@ -435,8 +434,7 @@ clear:
         {
             /* may not happen, just in case */
             msg_Err( VLCIntf, "unknown table column identifier (%s) while "
-                "updating the bookmark table", [[theTableColumn identifier]
-                UTF8String] );
+                "updating the bookmark table", [identifier UTF8String] );
             ret = @"unknown identifier";
         }