From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 23 Jan 2014 17:27:37 +0000 (-0800)
Subject: Minor cleanup of previous change.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~277
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ed44be700c5acf5ca2ffcf059c1e3a1640e33a5f;p=emacs.git

Minor cleanup of previous change.

* image.c (imagemagick_error, Fimagemagick_types):
Omit some recently-introduced and unnecessary casts and assignments.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5d01b8e9f18..d0d72dd6016 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Minor cleanup of previous change.
+	* image.c (imagemagick_error, Fimagemagick_types):
+	Omit some recently-introduced and unnecessary casts and assignments.
+
 2014-01-23  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	Fix two memory leaks discovered with Valgrind.
diff --git a/src/image.c b/src/image.c
index e4f4c7ec21f..706745fb479 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7908,7 +7908,7 @@ imagemagick_error (MagickWand *wand)
   image_error ("ImageMagick error: %s",
 	       build_string (description),
 	       Qnil);
-  description = (char *) MagickRelinquishMemory (description);
+  MagickRelinquishMemory (description);
 }
 
 /* Possibly give ImageMagick some extra help to determine the image
@@ -8546,10 +8546,10 @@ and `imagemagick-types-inhibit'.  */)
     {
       Qimagemagicktype = intern (imtypes[i]);
       typelist = Fcons (Qimagemagicktype, typelist);
-      imtypes[i] = (char *) MagickRelinquishMemory (imtypes[i]);
+      imtypes[i] = MagickRelinquishMemory (imtypes[i]);
     }
 
-  imtypes = (char **) MagickRelinquishMemory (imtypes);
+  MagickRelinquishMemory (imtypes);
   return Fnreverse (typelist);
 }