diff options
Diffstat (limited to 'MagickCore/blob.c')
| -rw-r--r-- | MagickCore/blob.c | 85 |
1 files changed, 43 insertions, 42 deletions
diff --git a/MagickCore/blob.c b/MagickCore/blob.c index 1785d6ec8..2a2dc025a 100644 --- a/MagickCore/blob.c +++ b/MagickCore/blob.c @@ -17,7 +17,7 @@ % July 1999 % % % % % -% Copyright 1999-2020 ImageMagick Studio LLC, a non-profit organization % +% Copyright 1999-2021 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -350,7 +350,7 @@ MagickExport MagickBooleanType BlobToFile(char *filename,const void *blob, int file; - register size_t + size_t i; ssize_t @@ -371,7 +371,7 @@ MagickExport MagickBooleanType BlobToFile(char *filename,const void *blob, for (i=0; i < length; i+=count) { count=write(file,(const char *) blob+i,MagickMin(length-i,(size_t) - SSIZE_MAX)); + LONG_MAX)); if (count <= 0) { count=0; @@ -1135,7 +1135,7 @@ MagickExport void DisassociateBlob(Image *image) MagickExport MagickBooleanType DiscardBlobBytes(Image *image, const MagickSizeType length) { - register MagickOffsetType + MagickOffsetType i; size_t @@ -1402,7 +1402,7 @@ MagickExport void *FileToBlob(const char *filename,const size_t extent, MagickOffsetType offset; - register size_t + size_t i; ssize_t @@ -1502,7 +1502,7 @@ MagickExport void *FileToBlob(const char *filename,const size_t extent, return(blob); } *length=(size_t) MagickMin(offset,(MagickOffsetType) - MagickMin(extent,(size_t) SSIZE_MAX)); + MagickMin(extent,(size_t) LONG_MAX)); blob=(unsigned char *) NULL; if (~(*length) >= (MagickPathExtent-1)) blob=(unsigned char *) AcquireQuantumMemory(*length+MagickPathExtent, @@ -1526,7 +1526,7 @@ MagickExport void *FileToBlob(const char *filename,const size_t extent, for (i=0; i < *length; i+=count) { count=read(file,blob+i,(size_t) MagickMin(*length-i,(size_t) - SSIZE_MAX)); + LONG_MAX)); if (count <= 0) { count=0; @@ -1586,7 +1586,7 @@ static inline ssize_t WriteBlobStream(Image *image,const size_t length, MagickSizeType extent; - register unsigned char + unsigned char *magick_restrict q; assert(image->blob != (BlobInfo *) NULL); @@ -2302,10 +2302,10 @@ MagickExport MagickBooleanType ImageToFile(Image *image,char *filename, int file; - register const unsigned char + const unsigned char *p; - register size_t + size_t i; size_t @@ -2730,7 +2730,7 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info, MagickBooleanType status; - register ssize_t + ssize_t i; size_t @@ -3094,7 +3094,7 @@ MagickExport void MSBOrderLong(unsigned char *buffer,const size_t length) int c; - register unsigned char + unsigned char *p, *q; @@ -3144,7 +3144,7 @@ MagickExport void MSBOrderShort(unsigned char *p,const size_t length) int c; - register unsigned char + unsigned char *q; assert(p != (unsigned char *) NULL); @@ -3705,7 +3705,7 @@ MagickExport Image *PingBlob(const ImageInfo *image_info,const void *blob, % % ReadBlob() reads data from the blob or image file and returns it. It % returns the number of bytes read. If length is zero, ReadBlob() returns -% zero and has no other results. If length is greater than SSIZE_MAX, the +% zero and has no other results. If length is greater than LONG_MAX, the % result is unspecified. % % The format of the ReadBlob method is: @@ -3731,7 +3731,7 @@ MagickExport ssize_t ReadBlob(Image *image,const size_t length,void *data) int c; - register unsigned char + unsigned char *q; ssize_t @@ -3812,7 +3812,7 @@ MagickExport ssize_t ReadBlob(Image *image,const size_t length,void *data) { default: { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i+=count) @@ -3869,7 +3869,8 @@ MagickExport ssize_t ReadBlob(Image *image,const size_t length,void *data) if ((count != (ssize_t) length) && (status != Z_OK)) ThrowBlobException(blob_info); if (blob_info->eof == MagickFalse) - blob_info->eof=gzeof(blob_info->file_info.gzfile); + blob_info->eof=gzeof(blob_info->file_info.gzfile) != 0 ? MagickTrue : + MagickFalse; #endif break; } @@ -3879,7 +3880,7 @@ MagickExport ssize_t ReadBlob(Image *image,const size_t length,void *data) int status; - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i+=count) @@ -3905,7 +3906,7 @@ MagickExport ssize_t ReadBlob(Image *image,const size_t length,void *data) break; case BlobStream: { - register const unsigned char + const unsigned char *p; if (blob_info->offset >= (MagickOffsetType) blob_info->length) @@ -3960,7 +3961,7 @@ MagickExport int ReadBlobByte(Image *image) BlobInfo *magick_restrict blob_info; - register const unsigned char + const unsigned char *p; unsigned char @@ -4104,7 +4105,7 @@ MagickExport float ReadBlobFloat(Image *image) */ MagickExport unsigned int ReadBlobLong(Image *image) { - register const unsigned char + const unsigned char *p; ssize_t @@ -4165,7 +4166,7 @@ MagickExport MagickSizeType ReadBlobLongLong(Image *image) MagickSizeType value; - register const unsigned char + const unsigned char *p; ssize_t @@ -4228,10 +4229,10 @@ MagickExport MagickSizeType ReadBlobLongLong(Image *image) */ MagickExport unsigned short ReadBlobShort(Image *image) { - register const unsigned char + const unsigned char *p; - register unsigned short + unsigned short value; ssize_t @@ -4282,10 +4283,10 @@ MagickExport unsigned short ReadBlobShort(Image *image) */ MagickExport unsigned int ReadBlobLSBLong(Image *image) { - register const unsigned char + const unsigned char *p; - register unsigned int + unsigned int value; ssize_t @@ -4370,10 +4371,10 @@ MagickExport signed int ReadBlobLSBSignedLong(Image *image) */ MagickExport unsigned short ReadBlobLSBShort(Image *image) { - register const unsigned char + const unsigned char *p; - register unsigned short + unsigned short value; ssize_t @@ -4456,10 +4457,10 @@ MagickExport signed short ReadBlobLSBSignedShort(Image *image) */ MagickExport unsigned int ReadBlobMSBLong(Image *image) { - register const unsigned char + const unsigned char *p; - register unsigned int + unsigned int value; ssize_t @@ -4506,10 +4507,10 @@ MagickExport unsigned int ReadBlobMSBLong(Image *image) */ MagickExport MagickSizeType ReadBlobMSBLongLong(Image *image) { - register const unsigned char + const unsigned char *p; - register MagickSizeType + MagickSizeType value; ssize_t @@ -4560,10 +4561,10 @@ MagickExport MagickSizeType ReadBlobMSBLongLong(Image *image) */ MagickExport unsigned short ReadBlobMSBShort(Image *image) { - register const unsigned char + const unsigned char *p; - register unsigned short + unsigned short value; ssize_t @@ -4750,7 +4751,7 @@ MagickExport signed short ReadBlobSignedShort(Image *image) % returns a pointer to the data buffer you supply or to the image memory % buffer if its supported (zero-copy). If length is zero, ReadBlobStream() % returns a count of zero and has no other results. If length is greater than -% SSIZE_MAX, the result is unspecified. +% LONG_MAX, the result is unspecified. % % The format of the ReadBlobStream method is: % @@ -4833,7 +4834,7 @@ MagickExport char *ReadBlobString(Image *image,char *string) int c; - register ssize_t + ssize_t i; assert(image != (Image *) NULL); @@ -4983,8 +4984,8 @@ MagickExport MagickOffsetType SeekBlob(Image *image, } case SEEK_CUR: { - if (((offset > 0) && (blob_info->offset > (SSIZE_MAX-offset))) || - ((offset < 0) && (blob_info->offset < (-SSIZE_MAX-offset)))) + if (((offset > 0) && (blob_info->offset > (LONG_MAX-offset))) || + ((offset < 0) && (blob_info->offset < (LONG_MIN-offset)))) { errno=EOVERFLOW; return(-1); @@ -5601,10 +5602,10 @@ MagickExport ssize_t WriteBlob(Image *image,const size_t length, int c; - register const unsigned char + const unsigned char *p; - register unsigned char + unsigned char *q; ssize_t @@ -5683,7 +5684,7 @@ MagickExport ssize_t WriteBlob(Image *image,const size_t length, { default: { - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i+=count) @@ -5744,7 +5745,7 @@ MagickExport ssize_t WriteBlob(Image *image,const size_t length, int status; - register ssize_t + ssize_t i; for (i=0; i < (ssize_t) length; i+=count) |