From 9bf9da36285c017ede08022f833c722ac503aff1 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 27 Sep 2009 16:48:34 +0000 Subject: [PATCH] --- magick/resource.c | 14 +++++++------- magick/string.c | 7 +++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/magick/resource.c b/magick/resource.c index 968691731..1d25b5b7d 100644 --- a/magick/resource.c +++ b/magick/resource.c @@ -851,13 +851,13 @@ MagickExport MagickBooleanType ListMagickResourceInfo(FILE *file, if (resource_info.time_limit != MagickResourceInfinity) (void) FormatMagickString(time_limit,MaxTextExtent,"%lu",(unsigned long) resource_info.time_limit); - (void) fprintf(file,"File Area Memory Map" - " Disk Thread Time\n"); - (void) fprintf(file,"-----------------------------------------------------" - "--------------\n"); - (void) fprintf(file,"%4lu %9s %9s %9s %9s %6lu %9s\n",(unsigned long) - resource_info.file_limit,area_limit,memory_limit,map_limit,disk_limit, - (unsigned long) resource_info.thread_limit,time_limit); + (void) fprintf(file,"File Area Memory Map" + " Disk Thread Time\n"); + (void) fprintf(file,"------------------------------------------------------" + "------------------\n"); + (void) fprintf(file,"%4lu %10s %10s %10s %10s %6lu %10s\n", + (unsigned long) resource_info.file_limit,area_limit,memory_limit,map_limit, + disk_limit,(unsigned long) resource_info.thread_limit,time_limit); (void) fflush(file); RelinquishSemaphoreInfo(resource_semaphore); return(MagickTrue); diff --git a/magick/string.c b/magick/string.c index beca1aab6..b5a3ff69c 100644 --- a/magick/string.c +++ b/magick/string.c @@ -1012,7 +1012,10 @@ MagickExport long FormatMagickSize(const MagickSizeType size,char *format) j; static const char - *units[] = { "b", "kb", "mb", "gb", "tb", "pb", "eb", (char *) NULL }; + *units[] = + { + "b", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", (char *) NULL + }; #if defined(_MSC_VER) && (_MSC_VER == 1200) length=(double) ((MagickOffsetType) size); @@ -1021,7 +1024,7 @@ MagickExport long FormatMagickSize(const MagickSizeType size,char *format) #endif for (i=0; (length >= 1024.0) && (units[i+1] != (const char *) NULL); i++) length/=1024.0; - for (j=2; j < 10; j++) + for (j=2; j < 12; j++) { count=FormatMagickString(format,MaxTextExtent,"%.*g%s",(int) (i+j),length, units[i]); -- 2.40.0