diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-06 06:37:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-06 06:37:43 (GMT) |
| commit | 07160023530295009919bcf063e260bfaebe9851 (patch) | |
| tree | 284c5d2aea3f4504edd3da311d2b2dc4f98e90bd /generic/nanosvg.h | |
| parent | 5e7c6982ce66c388008bd5a81fac55fbf5b900da (diff) | |
| parent | caa253fcf5871c9886ed214cfc4d68c5ab45d8f2 (diff) | |
| download | tk-07160023530295009919bcf063e260bfaebe9851.zip tk-07160023530295009919bcf063e260bfaebe9851.tar.gz tk-07160023530295009919bcf063e260bfaebe9851.tar.bz2 | |
Merge 8.6. Fix some more -Wshadow warnings
Diffstat (limited to 'generic/nanosvg.h')
| -rw-r--r-- | generic/nanosvg.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/nanosvg.h b/generic/nanosvg.h index 3f9548b..768dd20 100644 --- a/generic/nanosvg.h +++ b/generic/nanosvg.h @@ -284,7 +284,7 @@ static void nsvg__parseElement(char* s, { const char* attr[NSVG_XML_MAX_ATTRIBS]; int nattr = 0; - char* name; + char* cbname; int start = 0; int end = 0; char quote; @@ -305,7 +305,7 @@ static void nsvg__parseElement(char* s, return; // Get tag name - name = s; + cbname = s; while (*s && !nsvg__isspace(*s)) s++; if (*s) { *s++ = '\0'; } @@ -348,9 +348,9 @@ static void nsvg__parseElement(char* s, // Call callbacks. if (start && startelCb) - (*startelCb)(ud, name, attr); + (*startelCb)(ud, cbname, attr); if (end && endelCb) - (*endelCb)(ud, name); + (*endelCb)(ud, cbname); } NANOSVG_SCOPE |