Mercurial > hg > octave-lyh
changeset 17449:c36d3a4bc42f
__scatter__.m: Use multiple strcmpi instead of strncmpi for accurate input validation.
* scripts/plot/private/__scatter__.m:
Use code 'strcmpi (...,"filled") || strcmpi (...,"fill")'
instead of
strncmpi (..., "filled", 4)
so that stuff like "filler_up" is not allowed.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 19 Sep 2013 10:06:59 -0700 |
| parents | 0fa126e9944e |
| children | 4e86bb1901d6 |
| files | scripts/plot/private/__scatter__.m |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/private/__scatter__.m +++ b/scripts/plot/private/__scatter__.m @@ -75,9 +75,9 @@ if (isvector (c) && columns (c) != 3) c = c(:); endif - ## Compare only first 4 letters of "fill" as that is what Matlab uses. elseif (firstnonnumeric == istart && ischar (varargin{istart}) - && ! strncmpi (varargin{istart}, "filled", 4)) + && ! ( strcmpi (varargin{istart}, "filled") + || strcmpi (varargin{istart}, "fill"))) c = varargin{istart}; firstnonnumeric++; else @@ -91,7 +91,7 @@ iarg = firstnonnumeric; while (iarg <= nargin) arg = varargin{iarg++}; - if (ischar (arg) && strncmpi (arg, "filled", 4)) + if (ischar (arg) && (strcmpi (arg, "filled") || strcmpi (arg, "fill"))) filled = true; elseif ((ischar (arg) || iscell (arg)) && ! have_marker) [linespec, valid] = __pltopt__ (fcn, arg, false);