From: cristy Date: Wed, 10 Sep 2014 12:51:49 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~2028 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1da2063236e8463cc8e908138a50f10b45a684a;p=imagemagick --- diff --git a/MagickCore/option.c b/MagickCore/option.c index 0fb8f49ff..f2ce42da5 100644 --- a/MagickCore/option.c +++ b/MagickCore/option.c @@ -2192,7 +2192,7 @@ MagickExport ssize_t GetCommandOptionFlags(const CommandOption option, % % The format of the GetCommandOptionInfo method is: % -% const char **GetCommandOptions(const CommandOption option) +% const char **GetCommandOptionInfo(const CommandOption option) % % A description of each parameter follows: % @@ -2243,21 +2243,21 @@ MagickExport const OptionInfo *GetCommandOptionInfo(const char *option) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% GetCommandOptions() returns a list of values. +% GetCommandOptions() returns a list of command options. % % The format of the GetCommandOptions method is: % -% const char **GetCommandOptions(const CommandOption value) +% const char **GetCommandOptions(const CommandOption option) % % A description of each parameter follows: % -% o value: the value. +% o option: the option. % */ -MagickExport char **GetCommandOptions(const CommandOption value) +MagickExport char **GetCommandOptions(const CommandOption option) { char - **values; + **options; const OptionInfo *option_info; @@ -2265,17 +2265,17 @@ MagickExport char **GetCommandOptions(const CommandOption value) register ssize_t i; - option_info=GetOptionInfo(value); + option_info=GetOptionInfo(option); if (option_info == (const OptionInfo *) NULL) return((char **) NULL); for (i=0; option_info[i].mnemonic != (const char *) NULL; i++) ; - values=(char **) AcquireQuantumMemory((size_t) i+1UL,sizeof(*values)); - if (values == (char **) NULL) + options=(char **) AcquireQuantumMemory((size_t) i+1UL,sizeof(*options)); + if (options == (char **) NULL) ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); for (i=0; option_info[i].mnemonic != (const char *) NULL; i++) - values[i]=AcquireString(option_info[i].mnemonic); - values[i]=(char *) NULL; - return(values); + options[i]=AcquireString(option_info[i].mnemonic); + options[i]=(char *) NULL; + return(options); } /*