1 files changed, 50 insertions, 71 deletions

diff --git a/src/macselect.c b/src/macselect.c
index 066892adce0..fe4a7c8eccc 100644
--- a/src/macselect.c
+++ b/src/macselect.c
@@ -153,7 +153,6 @@ static ScrapFlavorType
 get_flavor_type_from_symbol (sym)
      Lisp_Object sym;
 {
-  ScrapFlavorType val;
   Lisp_Object str = Fget (sym, Qmac_ostype);
 
   if (STRINGP (str) && SBYTES (str) == 4)
@@ -322,17 +321,19 @@ get_scrap_private_timestamp (scrap, timestamp)
 
   err = GetScrapFlavorFlags (scrap, SCRAP_FLAVOR_TYPE_EMACS_TIMESTAMP, &flags);
   if (err == noErr)
-    if (!(flags & kScrapFlavorMaskSenderOnly))
-      err = noTypeErr;
-    else
-      {
-        Size size = sizeof (*timestamp);
+    {
+      if (!(flags & kScrapFlavorMaskSenderOnly))
+        err = noTypeErr;
+      else
+        {
+          Size size = sizeof (*timestamp);
 
-        err = GetScrapFlavorData (scrap, SCRAP_FLAVOR_TYPE_EMACS_TIMESTAMP,
-                                  &size, timestamp);
-        if (err == noErr && size != sizeof (*timestamp))
-          err = noTypeErr;
-      }
+          err = GetScrapFlavorData (scrap, SCRAP_FLAVOR_TYPE_EMACS_TIMESTAMP,
+                                    &size, timestamp);
+          if (err == noErr && size != sizeof (*timestamp))
+            err = noTypeErr;
+        }
+    }
 #else  /* !TARGET_API_MAC_CARBON */
   Handle handle;
   SInt32 size, offset;
@@ -372,14 +373,11 @@ get_scrap_target_type_list (scrap)
   err = GetScrapFlavorCount (scrap, &count);
   if (err == noErr)
     flavor_info = xmalloc (sizeof (ScrapFlavorInfo) * count);
-  if (flavor_info)
+  err = GetScrapFlavorInfoList (scrap, &count, flavor_info);
+  if (err != noErr)
     {
-      err = GetScrapFlavorInfoList (scrap, &count, flavor_info);
-      if (err != noErr)
-        {
-          xfree (flavor_info);
-          flavor_info = NULL;
-        }
+      xfree (flavor_info);
+      flavor_info = NULL;
     }
   if (flavor_info == NULL)
     count = 0;
@@ -683,18 +681,20 @@ x_get_foreign_selection (selection_symbol, target_type, time_stamp)
 
   err = get_scrap_from_symbol (selection_symbol, 0, &scrap);
   if (err == noErr && scrap)
-    if (EQ (target_type, QTARGETS))
-      {
-        result = get_scrap_target_type_list (scrap);
-        result = Fvconcat (1, &result);
-      }
-    else
-      {
-        result = get_scrap_string (scrap, target_type);
-        if (STRINGP (result))
-          Fput_text_property (make_number (0), make_number (SBYTES (result)),
-                              Qforeign_selection, target_type, result);
-      }
+    {
+      if (EQ (target_type, QTARGETS))
+        {
+          result = get_scrap_target_type_list (scrap);
+          result = Fvconcat (1, &result);
+        }
+      else
+        {
+          result = get_scrap_string (scrap, target_type);
+          if (STRINGP (result))
+            Fput_text_property (make_number (0), make_number (SBYTES (result)),
+                                Qforeign_selection, target_type, result);
+        }
+    }
 
   UNBLOCK_INPUT;
 
@@ -1009,7 +1009,7 @@ defer_apple_events (apple_event, reply)
   /* Mac OS 10.3 Xcode manual says AESuspendTheCurrentEvent makes
      copies of the Apple event and the reply, but Mac OS 10.4 Xcode
      manual says it doesn't.  Anyway we create copies of them and save
-     it in `deferred_apple_events'.  */
+     them in `deferred_apple_events'.  */
   if (err == noErr)
     {
       if (deferred_apple_events.buf == NULL)
@@ -1018,20 +1018,13 @@ defer_apple_events (apple_event, reply)
           deferred_apple_events.count = 0;
           deferred_apple_events.buf =
             xmalloc (sizeof (AppleEvent) * deferred_apple_events.size);
-          if (deferred_apple_events.buf == NULL)
-            err = memFullErr;
         }
       else if (deferred_apple_events.count == deferred_apple_events.size)
         {
-          AppleEvent *newbuf;
-
           deferred_apple_events.size *= 2;
-          newbuf = xrealloc (deferred_apple_events.buf,
-                             sizeof (AppleEvent) * deferred_apple_events.size);
-          if (newbuf)
-            deferred_apple_events.buf = newbuf;
-          else
-            err = memFullErr;
+          deferred_apple_events.buf
+            = xrealloc (deferred_apple_events.buf,
+                        sizeof (AppleEvent) * deferred_apple_events.size);
         }
     }
 
@@ -1123,11 +1116,8 @@ DEFUN ("mac-process-deferred-apple-events", Fmac_process_deferred_apple_events,
        doc: /* Process Apple events that are deferred at the startup time.  */)
   ()
 {
-  OSErr err;
   Lisp_Object result = Qnil;
-  long i, count;
-  AppleEvent apple_event, reply;
-  AEKeyword keyword;
+  long i;
 
   if (mac_ready_for_apple_events)
     return Qnil;
@@ -1192,29 +1182,21 @@ copy_scrap_flavor_data (from_scrap, to_scrap, flavor_type)
           buf = NULL;
         }
       else if (size_allocated < size)
-        {
-          char *newbuf = xrealloc (buf, size);
-
-          if (newbuf)
-            buf = newbuf;
-          else
-            {
-              xfree (buf);
-              buf = NULL;
-            }
-        }
+        buf = xrealloc (buf, size);
       else
         break;
     }
   if (err == noErr)
-    if (buf == NULL)
-      err = memFullErr;
-    else
-      {
-        err = PutScrapFlavor (to_scrap, flavor_type, kScrapFlavorMaskNone,
-                              size, buf);
-        xfree (buf);
-      }
+    {
+      if (buf == NULL)
+        err = memFullErr;
+      else
+        {
+          err = PutScrapFlavor (to_scrap, flavor_type, kScrapFlavorMaskNone,
+                                size, buf);
+          xfree (buf);
+        }
+    }
 
   return err;
 }
@@ -1300,14 +1282,11 @@ mac_handle_service_event (call_ref, event, data)
         err = GetScrapFlavorCount (cur_scrap, &count);
         if (err == noErr)
           flavor_info = xmalloc (sizeof (ScrapFlavorInfo) * count);
-        if (flavor_info)
+        err = GetScrapFlavorInfoList (cur_scrap, &count, flavor_info);
+        if (err != noErr)
           {
-            err = GetScrapFlavorInfoList (cur_scrap, &count, flavor_info);
-            if (err != noErr)
-              {
-                xfree (flavor_info);
-                flavor_info = NULL;
-              }
+            xfree (flavor_info);
+            flavor_info = NULL;
           }
         if (flavor_info == NULL)
           break;