commit e1c94d9d25db6b0dd7a5028ffee31d1057855d73
author cristy <urban-warrior@git.imagemagick.org> Sun Jun 28 12:16:33 2015 +0000
committer cristy <urban-warrior@git.imagemagick.org> Sun Jun 28 12:16:33 2015 +0000
tree f23e14cc395bc63a40cd8fa6be3f8506ba034ab0
parent c8e4bcc9fa12696b13fdafa8052dc74be5eb208a

MagickCore/string.c

diff --git a/MagickCore/string.c b/MagickCore/string.c
index e1b24c9..0160c04 100644
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -172,7 +172,7 @@
   if (string_info == (StringInfo *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   (void) ResetMagickMemory(string_info,0,sizeof(*string_info));
-  string_info->signature=MagickSignature;
+  string_info->signature=MagickCoreSignature;
   string_info->length=length;
   string_info->datum=(unsigned char *) NULL;
   if (~string_info->length >= (MagickPathExtent-1))
@@ -323,7 +323,7 @@
     *clone_info;
 
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   clone_info=AcquireStringInfo(string_info->length);
   if (string_info->length != 0)
     (void) memcpy(clone_info->datum,string_info->datum,string_info->length+1);
@@ -364,9 +364,9 @@
     status;
 
   assert(target != (StringInfo *) NULL);
-  assert(target->signature == MagickSignature);
+  assert(target->signature == MagickCoreSignature);
   assert(source != (StringInfo *) NULL);
-  assert(source->signature == MagickSignature);
+  assert(source->signature == MagickCoreSignature);
   status=memcmp(target->datum,source->datum,MagickMin(target->length,
     source->length));
   if (status != 0)
@@ -538,7 +538,7 @@
     length;
 
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   assert(source != (const StringInfo *) NULL);
   length=string_info->length;
   if (~length < source->length)
@@ -837,13 +837,13 @@
 MagickExport StringInfo *DestroyStringInfo(StringInfo *string_info)
 {
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   if (string_info->datum != (unsigned char *) NULL)
     string_info->datum=(unsigned char *) RelinquishMagickMemory(
       string_info->datum);
   if (string_info->path != (char *) NULL)
     string_info->path=DestroyString(string_info->path);
-  string_info->signature=(~MagickSignature);
+  string_info->signature=(~MagickCoreSignature);
   string_info=(StringInfo *) RelinquishMagickMemory(string_info);
   return(string_info);
 }
@@ -1271,7 +1271,7 @@
 MagickExport unsigned char *GetStringInfoDatum(const StringInfo *string_info)
 {
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   return(string_info->datum);
 }
 
@@ -1300,7 +1300,7 @@
 MagickExport size_t GetStringInfoLength(const StringInfo *string_info)
 {
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   return(string_info->length);
 }
 
@@ -1329,7 +1329,7 @@
 MagickExport const char *GetStringInfoPath(const StringInfo *string_info)
 {
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   return(string_info->path);
 }
 
@@ -1743,7 +1743,7 @@
 
   assert(id != (const char *) NULL);
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   p=(char *) string_info->datum;
   for (i=0; i < string_info->length; i++)
   {
@@ -1818,7 +1818,7 @@
 MagickExport void ResetStringInfo(StringInfo *string_info)
 {
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   (void) ResetMagickMemory(string_info->datum,0,string_info->length);
 }
 
@@ -1850,9 +1850,9 @@
   const StringInfo *source)
 {
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   assert(source != (StringInfo *) NULL);
-  assert(source->signature == MagickSignature);
+  assert(source->signature == MagickCoreSignature);
   if (string_info->length == 0)
     return;
   (void) ResetMagickMemory(string_info->datum,0,string_info->length);
@@ -1890,7 +1890,7 @@
   const unsigned char *source)
 {
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   if (string_info->length != 0)
     (void) memcpy(string_info->datum,source,string_info->length);
 }
@@ -1923,7 +1923,7 @@
   const size_t length)
 {
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   if (~length < MagickPathExtent)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   string_info->length=length;
@@ -1964,7 +1964,7 @@
 MagickExport void SetStringInfoPath(StringInfo *string_info,const char *path)
 {
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   assert(path != (const char *) NULL);
   string_info->path=ConstantString(path);
 }
@@ -1998,7 +1998,7 @@
     *split_info;
 
   assert(string_info != (StringInfo *) NULL);
-  assert(string_info->signature == MagickSignature);
+  assert(string_info->signature == MagickCoreSignature);
   if (offset > string_info->length)
     return((StringInfo *) NULL);
   split_info=AcquireStringInfo(offset);
@@ -2296,7 +2296,7 @@
     Determine count of values, and check syntax.
   */
   assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickSignature);
+  assert(exception->signature == MagickCoreSignature);
   *count=0;
   i=0;
   p=string;