From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 19 Mar 2014 13:20:31 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2564
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d51f83dce1b343587c60aa8e68f4a9e8c904498;p=imagemagick

---

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index b5d6c58d0..61107f396 100644
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -832,7 +832,7 @@ static void *DestroyMagickNode(void *magick_info)
   if (p->name != (char *) NULL)
     p->name=DestroyString(p->name);
   if (p->semaphore != (SemaphoreInfo *) NULL)
-    p->semaphore=RelinquishSemaphoreInfo(&p->semaphore);
+    RelinquishSemaphoreInfo(&p->semaphore);
   return(RelinquishMagickMemory(p));
 }
 
diff --git a/MagickCore/semaphore.c b/MagickCore/semaphore.c
index 901ae5327..0f61ccf42 100644
--- a/MagickCore/semaphore.c
+++ b/MagickCore/semaphore.c
@@ -340,15 +340,14 @@ MagickExport void LockSemaphoreInfo(SemaphoreInfo *semaphore_info)
 %
 %  The format of the RelinquishSemaphoreInfo method is:
 %
-%      SemaphoreInfo *RelinquishSemaphoreInfo(SemaphoreInfo **semaphore_info)
+%      void RelinquishSemaphoreInfo(SemaphoreInfo **semaphore_info)
 %
 %  A description of each parameter follows:
 %
 %    o semaphore_info: Specifies a pointer to an SemaphoreInfo structure.
 %
 */
-MagickExport SemaphoreInfo *RelinquishSemaphoreInfo(
-  SemaphoreInfo **semaphore_info)
+MagickExport void RelinquishSemaphoreInfo(SemaphoreInfo **semaphore_info)
 {
   assert(semaphore_info != (SemaphoreInfo **) NULL);
   assert((*semaphore_info) != (SemaphoreInfo *) NULL);
@@ -376,7 +375,6 @@ MagickExport SemaphoreInfo *RelinquishSemaphoreInfo(
   (*semaphore_info)->signature=(~MagickSignature);
   *semaphore_info=(SemaphoreInfo *) RelinquishSemaphoreMemory(*semaphore_info);
   UnlockMagickMutex();
-  return((SemaphoreInfo *) NULL);
 }
 
 /*
diff --git a/MagickCore/semaphore.h b/MagickCore/semaphore.h
index a2964b618..dcb047f04 100644
--- a/MagickCore/semaphore.h
+++ b/MagickCore/semaphore.h
@@ -26,12 +26,12 @@ typedef struct SemaphoreInfo
   SemaphoreInfo;
 
 extern MagickExport SemaphoreInfo
-  *AcquireSemaphoreInfo(void),
-  *RelinquishSemaphoreInfo(SemaphoreInfo **);
+  *AcquireSemaphoreInfo(void);
 
 extern MagickExport void
   ActivateSemaphoreInfo(SemaphoreInfo **),
   LockSemaphoreInfo(SemaphoreInfo *),
+  RelinquishSemaphoreInfo(SemaphoreInfo **),
   UnlockSemaphoreInfo(SemaphoreInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)