From 0bd6744310e0b209f3c5911a4e68d453e867914a Mon Sep 17 00:00:00 2001 From: Mike Wey Date: Sun, 9 Jan 2011 20:52:03 +0100 Subject: change the constness of the return types --- dmagick/c/artifact.d | 2 +- dmagick/c/cache.d | 8 ++++---- dmagick/c/cacheView.d | 6 +++--- dmagick/c/client.d | 8 ++++---- dmagick/c/coder.d | 4 ++-- dmagick/c/color.d | 4 ++-- dmagick/c/configure.d | 4 ++-- dmagick/c/deprecate.d | 16 ++++++++-------- dmagick/c/imageView.d | 4 ++-- dmagick/c/locale.d | 6 +++--- dmagick/c/log.d | 6 +++--- dmagick/c/magic.d | 6 +++--- dmagick/c/magick.d | 6 +++--- dmagick/c/magickDelegate.d | 6 +++--- dmagick/c/magickModule.d | 2 +- dmagick/c/magickString.d | 2 +- dmagick/c/magickVersion.d | 14 +++++++------- dmagick/c/mime.d | 8 ++++---- dmagick/c/option.d | 6 +++--- dmagick/c/policy.d | 2 +- dmagick/c/profile.d | 2 +- dmagick/c/property.d | 4 ++-- dmagick/c/splayTree.d | 6 +++--- dmagick/c/type.d | 6 +++--- dmagick/c/xmlTree.d | 8 ++++---- 25 files changed, 73 insertions(+), 73 deletions(-) (limited to 'dmagick') diff --git a/dmagick/c/artifact.d b/dmagick/c/artifact.d index 0899c3d..2990346 100644 --- a/dmagick/c/artifact.d +++ b/dmagick/c/artifact.d @@ -8,7 +8,7 @@ extern(C) char* GetNextImageArtifact(const Image*); char* RemoveImageArtifact(Image*, const char*); - const(char*) GetImageArtifact(const Image*, const char*); + const(char)* GetImageArtifact(const Image*, const char*); MagickBooleanType CloneImageArtifacts(Image*, const Image*); MagickBooleanType DefineImageArtifact(Image*, const char*); diff --git a/dmagick/c/cache.d b/dmagick/c/cache.d index d696e08..a422a9b 100644 --- a/dmagick/c/cache.d +++ b/dmagick/c/cache.d @@ -10,12 +10,12 @@ import dmagick.c.cacheView; extern(C) { - const(IndexPacket*) GetVirtualIndexQueue(const Image*); + const(IndexPacket)* GetVirtualIndexQueue(const Image*); - const(PixelPacket*) GetVirtualPixels(const Image*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*); - const(PixelPacket*) GetVirtualPixelQueue(const Image*); + const(PixelPacket)* GetVirtualPixels(const Image*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*); + const(PixelPacket)* GetVirtualPixelQueue(const Image*); - const(void*) AcquirePixelCachePixels(const Image*, MagickSizeType*, ExceptionInfo*); + const(void)* AcquirePixelCachePixels(const Image*, MagickSizeType*, ExceptionInfo*); IndexPacket* GetAuthenticIndexQueue(const Image*); diff --git a/dmagick/c/cacheView.d b/dmagick/c/cacheView.d index 7d85a46..53ae290 100644 --- a/dmagick/c/cacheView.d +++ b/dmagick/c/cacheView.d @@ -38,10 +38,10 @@ extern(C) ColorspaceType GetCacheViewColorspace(const CacheView*); - const(IndexPacket*) GetCacheViewVirtualIndexQueue(const CacheView*); + const(IndexPacket)* GetCacheViewVirtualIndexQueue(const CacheView*); - const(PixelPacket*) GetCacheViewVirtualPixels(const CacheView*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*); - const(PixelPacket*) GetCacheViewVirtualPixelQueue(const CacheView*); + const(PixelPacket)* GetCacheViewVirtualPixels(const CacheView*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*); + const(PixelPacket)* GetCacheViewVirtualPixelQueue(const CacheView*); ExceptionInfo* GetCacheViewException(const CacheView*); diff --git a/dmagick/c/client.d b/dmagick/c/client.d index 4404607..49a6861 100644 --- a/dmagick/c/client.d +++ b/dmagick/c/client.d @@ -2,8 +2,8 @@ module dmagick.c.client; extern(C) { - const(char*) GetClientPath(); - const(char*) GetClientName(); - const(char*) SetClientName(const char*); - const(char*) SetClientPath(const char*); + const(char)* GetClientPath(); + const(char)* GetClientName(); + const(char)* SetClientName(const char*); + const(char)* SetClientPath(const char*); } diff --git a/dmagick/c/coder.d b/dmagick/c/coder.d index 52f5d32..f7990b2 100644 --- a/dmagick/c/coder.d +++ b/dmagick/c/coder.d @@ -28,8 +28,8 @@ extern(C) char** GetCoderList(const char*, size_t*, ExceptionInfo*); - const(CoderInfo*) GetCoderInfo(const char*, ExceptionInfo*); - const(CoderInfo**) GetCoderInfoList(const char*, size_t*, ExceptionInfo*); + const(CoderInfo)* GetCoderInfo(const char*, ExceptionInfo*); + const(CoderInfo)** GetCoderInfoList(const char*, size_t*, ExceptionInfo*); MagickBooleanType CoderComponentGenesis(); MagickBooleanType ListCoderInfo(FILE*, ExceptionInfo*); diff --git a/dmagick/c/color.d b/dmagick/c/color.d index be66bef..44be838 100644 --- a/dmagick/c/color.d +++ b/dmagick/c/color.d @@ -54,8 +54,8 @@ extern(C) char** GetColorList(const char*, size_t*, ExceptionInfo*); - const(ColorInfo*) GetColorInfo(const char*, ExceptionInfo*); - const(ColorInfo**) GetColorInfoList(const char*, size_t*, ExceptionInfo*); + const(ColorInfo)* GetColorInfo(const char*, ExceptionInfo*); + const(ColorInfo)** GetColorInfoList(const char*, size_t*, ExceptionInfo*); MagickBooleanType ColorComponentGenesis(); MagickBooleanType IsColorSimilar(const Image*, const PixelPacket*, const PixelPacket*); diff --git a/dmagick/c/configure.d b/dmagick/c/configure.d index ffd7942..cb4a68f 100644 --- a/dmagick/c/configure.d +++ b/dmagick/c/configure.d @@ -32,8 +32,8 @@ extern(C) const(char*) GetConfigureValue(const ConfigureInfo*); - const(ConfigureInfo*) GetConfigureInfo(const char*, ExceptionInfo*); - const(ConfigureInfo**) GetConfigureInfoList(const char*, size_t*, ExceptionInfo*); + const(ConfigureInfo)* GetConfigureInfo(const char*, ExceptionInfo*); + const(ConfigureInfo)** GetConfigureInfoList(const char*, size_t*, ExceptionInfo*); LinkedListInfo* DestroyConfigureOptions(LinkedListInfo *); LinkedListInfo* GetConfigurePaths(const char *,ExceptionInfo *); diff --git a/dmagick/c/deprecate.d b/dmagick/c/deprecate.d index e68cc5e..5060a96 100644 --- a/dmagick/c/deprecate.d +++ b/dmagick/c/deprecate.d @@ -56,16 +56,16 @@ deprecated extern(C) char* PostscriptGeometry(const char*); char* TranslateText(const ImageInfo *,Image *,const char *); - const(ImageAttribute*) GetImageAttribute(const Image*, const char*); - const(ImageAttribute*) GetImageClippingPathAttribute(Image*); - const(ImageAttribute*) GetNextImageAttribute(const Image*); + const(ImageAttribute)* GetImageAttribute(const Image*, const char*); + const(ImageAttribute)* GetImageClippingPathAttribute(Image*); + const(ImageAttribute)* GetNextImageAttribute(const Image*); - const(IndexPacket*) AcquireCacheViewIndexes(const CacheView*); - const(IndexPacket*) AcquireIndexes(const Image*); + const(IndexPacket)* AcquireCacheViewIndexes(const CacheView*); + const(IndexPacket)* AcquireIndexes(const Image*); - const(PixelPacket*) AcquirePixels(const Image*); - const(PixelPacket*) AcquireCacheViewPixels(const CacheView*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*); - const(PixelPacket*) AcquireImagePixels(const Image*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*); + const(PixelPacket)* AcquirePixels(const Image*); + const(PixelPacket)* AcquireCacheViewPixels(const CacheView*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*); + const(PixelPacket)* AcquireImagePixels(const Image*, const ssize_t, const ssize_t, const size_t, const size_t, ExceptionInfo*); Image* AllocateImage(const ImageInfo*); Image* AverageImages(const Image*, ExceptionInfo*); diff --git a/dmagick/c/imageView.d b/dmagick/c/imageView.d index cd3ddb5..327ccac 100644 --- a/dmagick/c/imageView.d +++ b/dmagick/c/imageView.d @@ -20,9 +20,9 @@ extern(C) char* GetImageViewException(const ImageView*, ExceptionType*); - const(IndexPacket*) GetImageViewVirtualIndexes(const ImageView*); + const(IndexPacket)* GetImageViewVirtualIndexes(const ImageView*); - const(PixelPacket*) GetImageViewVirtualPixels(const ImageView*); + const(PixelPacket)* GetImageViewVirtualPixels(const ImageView*); Image* GetImageViewImage(const ImageView*); diff --git a/dmagick/c/locale.d b/dmagick/c/locale.d index 73f1a11..2cb2296 100644 --- a/dmagick/c/locale.d +++ b/dmagick/c/locale.d @@ -28,10 +28,10 @@ extern(C) char** GetLocaleList(const char*, size_t*, ExceptionInfo*); - const(char*) GetLocaleMessage(const char*); + const(char)* GetLocaleMessage(const char*); - const(LocaleInfo*) GetLocaleInfo_(const char*, ExceptionInfo*); - const(LocaleInfo**) GetLocaleInfoList(const char*, size_t*, ExceptionInfo*); + const(LocaleInfo)* GetLocaleInfo_(const char*, ExceptionInfo*); + const(LocaleInfo)** GetLocaleInfoList(const char*, size_t*, ExceptionInfo*); LinkedListInfo* DestroyLocaleOptions(LinkedListInfo*); LinkedListInfo* GetLocaleOptions(const char*, ExceptionInfo*); diff --git a/dmagick/c/log.d b/dmagick/c/log.d index d7db729..abdc0f3 100644 --- a/dmagick/c/log.d +++ b/dmagick/c/log.d @@ -37,10 +37,10 @@ extern(C) char** GetLogList(const char*, size_t*, ExceptionInfo*); - const(char*) GetLogName(); - const(char*) SetLogName(const char*); + const(char)* GetLogName(); + const(char)* SetLogName(const char*); - const(LogInfo**) GetLogInfoList(const char*, size_t*, ExceptionInfo*); + const(LogInfo)** GetLogInfoList(const char*, size_t*, ExceptionInfo*); LogEventType SetLogEventMask(const char*); diff --git a/dmagick/c/magic.d b/dmagick/c/magic.d index 1157633..864a0bc 100644 --- a/dmagick/c/magic.d +++ b/dmagick/c/magic.d @@ -38,13 +38,13 @@ extern(C) char** GetMagicList(const char*, size_t*, ExceptionInfo*); - const(char*) GetMagicName(const MagicInfo*); + const(char)* GetMagicName(const MagicInfo*); MagickBooleanType ListMagicInfo(FILE*, ExceptionInfo*); MagickBooleanType MagicComponentGenesis(); - const(MagicInfo*) GetMagicInfo(const ubyte*, const size_t, ExceptionInfo*); - const(MagicInfo**) GetMagicInfoList(const char*, size_t*, ExceptionInfo*); + const(MagicInfo)* GetMagicInfo(const ubyte*, const size_t, ExceptionInfo*); + const(MagicInfo)** GetMagicInfoList(const char*, size_t*, ExceptionInfo*); void MagicComponentTerminus(); } diff --git a/dmagick/c/magick.d b/dmagick/c/magick.d index d343cd2..7a46675 100644 --- a/dmagick/c/magick.d +++ b/dmagick/c/magick.d @@ -74,7 +74,7 @@ extern(C) char** GetMagickList(const char*, size_t*, ExceptionInfo*); - const(char*) GetMagickDescription(const MagickInfo*); + const(char)* GetMagickDescription(const MagickInfo*); DecodeImageHandler* GetImageDecoder(const MagickInfo*); @@ -93,8 +93,8 @@ extern(C) MagickBooleanType MagickComponentGenesis(); MagickBooleanType UnregisterMagickInfo(const char*); - const(MagickInfo*) GetMagickInfo(const char*, ExceptionInfo*); - const(MagickInfo**) GetMagickInfoList(const char*, size_t*, ExceptionInfo*); + const(MagickInfo)* GetMagickInfo(const char*, ExceptionInfo*); + const(MagickInfo)** GetMagickInfoList(const char*, size_t*, ExceptionInfo*); MagickInfo* RegisterMagickInfo(MagickInfo*); MagickInfo* SetMagickInfo(const char*); diff --git a/dmagick/c/magickDelegate.d b/dmagick/c/magickDelegate.d index e458c33..12c1d55 100644 --- a/dmagick/c/magickDelegate.d +++ b/dmagick/c/magickDelegate.d @@ -36,10 +36,10 @@ extern(C) char* GetDelegateCommand(const ImageInfo*, Image*, const char*, const char*, ExceptionInfo*); char** GetDelegateList(const char *,size_t *,ExceptionInfo *); - const(char*) GetDelegateCommands(const DelegateInfo*); + const(char)* GetDelegateCommands(const DelegateInfo*); - const(DelegateInfo*) GetDelegateInfo(const char*, const char*, ExceptionInfo* exception); - const(DelegateInfo**) GetDelegateInfoList(const char*, size_t*, ExceptionInfo*); + const(DelegateInfo)* GetDelegateInfo(const char*, const char*, ExceptionInfo* exception); + const(DelegateInfo)** GetDelegateInfoList(const char*, size_t*, ExceptionInfo*); ssize_t GetDelegateMode(const DelegateInfo*); diff --git a/dmagick/c/magickModule.d b/dmagick/c/magickModule.d index 6776fde..b6efd41 100644 --- a/dmagick/c/magickModule.d +++ b/dmagick/c/magickModule.d @@ -48,7 +48,7 @@ extern(C) char** GetModuleList(const char*, const MagickModuleType, size_t*, ExceptionInfo*); - const(ModuleInfo**) GetModuleInfoList(const char*, size_t*, ExceptionInfo*); + const(ModuleInfo)** GetModuleInfoList(const char*, size_t*, ExceptionInfo*); MagickBooleanType InitializeModuleList(ExceptionInfo*); MagickBooleanType InvokeDynamicImageFilter(const char*, Image**, const int, const char**, ExceptionInfo*); diff --git a/dmagick/c/magickString.d b/dmagick/c/magickString.d index 8606069..838ae5d 100644 --- a/dmagick/c/magickString.d +++ b/dmagick/c/magickString.d @@ -37,7 +37,7 @@ extern(C) char* StringToken(const char*, char**); char** StringToList(const char*); - const(char*) GetStringInfoPath(const StringInfo*); + const(char)* GetStringInfoPath(const StringInfo*); int CompareStringInfo(const StringInfo*, const StringInfo*); int LocaleCompare(const char*, const char*); diff --git a/dmagick/c/magickVersion.d b/dmagick/c/magickVersion.d index eaed81c..46baaac 100644 --- a/dmagick/c/magickVersion.d +++ b/dmagick/c/magickVersion.d @@ -4,11 +4,11 @@ extern(C) { char* GetMagickHomeURL(); - const(char*) GetMagickCopyright(); - const(char*) GetMagickFeatures(); - const(char*) GetMagickPackageName(); - const(char*) GetMagickQuantumDepth(size_t*); - const(char*) GetMagickQuantumRange(size_t*); - const(char*) GetMagickReleaseDate(); - const(char*) GetMagickVersion(size_t*); + const(char)* GetMagickCopyright(); + const(char)* GetMagickFeatures(); + const(char)* GetMagickPackageName(); + const(char)* GetMagickQuantumDepth(size_t*); + const(char)* GetMagickQuantumRange(size_t*); + const(char)* GetMagickReleaseDate(); + const(char)* GetMagickVersion(size_t*); } diff --git a/dmagick/c/mime.d b/dmagick/c/mime.d index 8e2b337..c28af96 100644 --- a/dmagick/c/mime.d +++ b/dmagick/c/mime.d @@ -12,15 +12,15 @@ extern(C) char** GetMimeList(const char*, size_t*, ExceptionInfo*); char* MagickToMime(const char*); - const(char*) GetMimeDescription(const MimeInfo*); - const(char*) GetMimeType(const MimeInfo*); + const(char)* GetMimeDescription(const MimeInfo*); + const(char)* GetMimeType(const MimeInfo*); MagickBooleanType ListMimeInfo(FILE*, ExceptionInfo*); MagickBooleanType LoadMimeLists(const char*, ExceptionInfo*); MagickBooleanType MimeComponentGenesis(); - const(MimeInfo*) GetMimeInfo(const char*, const ubyte*, const size_t, ExceptionInfo*); - const(MimeInfo**) GetMimeInfoList(const char*, size_t*, ExceptionInfo*); + const(MimeInfo)* GetMimeInfo(const char*, const ubyte*, const size_t, ExceptionInfo*); + const(MimeInfo)** GetMimeInfoList(const char*, size_t*, ExceptionInfo*); void MimeComponentTerminus(); } diff --git a/dmagick/c/option.d b/dmagick/c/option.d index a766a87..88db7e4 100644 --- a/dmagick/c/option.d +++ b/dmagick/c/option.d @@ -99,7 +99,7 @@ extern(C) struct OptionInfo { - const(char*) + const(char)* mnemonic; ssize_t @@ -113,8 +113,8 @@ extern(C) char* GetNextImageOption(const ImageInfo*); char* RemoveImageOption(ImageInfo*, const char*); - const(char*) GetImageOption(const ImageInfo*, const char*); - const(char*) MagickOptionToMnemonic(const MagickOption, const ssize_t); + const(char)* GetImageOption(const ImageInfo*, const char*); + const(char)* MagickOptionToMnemonic(const MagickOption, const ssize_t); MagickBooleanType CloneImageOptions(ImageInfo*, const ImageInfo*); MagickBooleanType DefineImageOption(ImageInfo*, const char*); diff --git a/dmagick/c/policy.d b/dmagick/c/policy.d index 733e116..e5f742b 100644 --- a/dmagick/c/policy.d +++ b/dmagick/c/policy.d @@ -32,7 +32,7 @@ extern(C) char* GetPolicyValue(const char* name); char** GetPolicyList(const char*, size_t*, ExceptionInfo*); - const(PolicyInfo**) GetPolicyInfoList(const char*, size_t*, ExceptionInfo*); + const(PolicyInfo)** GetPolicyInfoList(const char*, size_t*, ExceptionInfo*); MagickBooleanType IsRightsAuthorized(const PolicyDomain, const PolicyRights, const char*); MagickBooleanType ListPolicyInfo(FILE*, ExceptionInfo*); diff --git a/dmagick/c/profile.d b/dmagick/c/profile.d index 44dbbf6..b984b4f 100644 --- a/dmagick/c/profile.d +++ b/dmagick/c/profile.d @@ -32,7 +32,7 @@ extern(C) char* GetNextImageProfile(const Image*); - const(StringInfo) *GetImageProfile(const Image *,const char *); + const(StringInfo)* GetImageProfile(const Image *,const char *); MagickBooleanType CloneImageProfiles(Image*, const Image*); MagickBooleanType DeleteImageProfile(Image*, const char*); diff --git a/dmagick/c/property.d b/dmagick/c/property.d index 1fd6193..7e543fb 100644 --- a/dmagick/c/property.d +++ b/dmagick/c/property.d @@ -11,8 +11,8 @@ extern(C) char* InterpretImageProperties(const ImageInfo*, Image*, const char*); char* RemoveImageProperty(Image*, const char*); - const(char*) GetImageProperty(const Image*, const char*); - const(char*) GetMagickProperty(const ImageInfo*, Image*, const char*); + const(char)* GetImageProperty(const Image*, const char*); + const(char)* GetMagickProperty(const ImageInfo*, Image*, const char*); MagickBooleanType CloneImageProperties(Image*, const Image*); MagickBooleanType DefineImageProperty(Image*, const char*); diff --git a/dmagick/c/splayTree.d b/dmagick/c/splayTree.d index 77c8489..69451bd 100644 --- a/dmagick/c/splayTree.d +++ b/dmagick/c/splayTree.d @@ -10,9 +10,9 @@ extern(C) MagickBooleanType DeleteNodeByValueFromSplayTree(SplayTreeInfo*, const void*); MagickBooleanType DeleteNodeFromSplayTree(SplayTreeInfo*, const void*); - const(void*) GetNextKeyInSplayTree(SplayTreeInfo*); - const(void*) GetNextValueInSplayTree(SplayTreeInfo*); - const(void*) GetValueFromSplayTree(SplayTreeInfo*, const void*); + const(void)* GetNextKeyInSplayTree(SplayTreeInfo*); + const(void)* GetNextValueInSplayTree(SplayTreeInfo*); + const(void)* GetValueFromSplayTree(SplayTreeInfo*, const void*); int CompareSplayTreeString(const void*, const void*); int CompareSplayTreeStringInfo(const void*, const void*); diff --git a/dmagick/c/type.d b/dmagick/c/type.d index 2365443..61c76dd 100644 --- a/dmagick/c/type.d +++ b/dmagick/c/type.d @@ -74,9 +74,9 @@ extern(C) MagickBooleanType ListTypeInfo(FILE*, ExceptionInfo*); MagickBooleanType TypeComponentGenesis(); - const(TypeInfo*) GetTypeInfo(const char*, ExceptionInfo*); - const(TypeInfo*) GetTypeInfoByFamily(const char*, const StyleType, const StretchType, const size_t, ExceptionInfo*); - const(TypeInfo**) GetTypeInfoList(const char*, size_t*, ExceptionInfo*); + const(TypeInfo)* GetTypeInfo(const char*, ExceptionInfo*); + const(TypeInfo)* GetTypeInfoByFamily(const char*, const StyleType, const StretchType, const size_t, ExceptionInfo*); + const(TypeInfo)** GetTypeInfoList(const char*, size_t*, ExceptionInfo*); void TypeComponentTerminus(); } diff --git a/dmagick/c/xmlTree.d b/dmagick/c/xmlTree.d index dc1bbbb..906490d 100644 --- a/dmagick/c/xmlTree.d +++ b/dmagick/c/xmlTree.d @@ -11,10 +11,10 @@ extern(C) char* CanonicalXMLContent(const char*, const MagickBooleanType); char* XMLTreeInfoToXML(XMLTreeInfo*); - const(char*) GetXMLTreeAttribute(XMLTreeInfo*, const char*); - const(char*) GetXMLTreeContent(XMLTreeInfo*); - const(char**) GetXMLTreeProcessingInstructions(XMLTreeInfo*, const char*); - const(char*) GetXMLTreeTag(XMLTreeInfo*); + const(char)* GetXMLTreeAttribute(XMLTreeInfo*, const char*); + const(char)* GetXMLTreeContent(XMLTreeInfo*); + const(char)** GetXMLTreeProcessingInstructions(XMLTreeInfo*, const char*); + const(char)* GetXMLTreeTag(XMLTreeInfo*); MagickBooleanType GetXMLTreeAttributes(const XMLTreeInfo*, SplayTreeInfo*); -- cgit v1.2.3