diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Src/utils.c | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -1,5 +1,7 @@ 2018-03-30 Oliver Kiddle <okiddle@yahoo.co.uk> + * 42560: Src/utils.c: silence sign-compare compiler warnings + * 42566: Completion/Unix/Command/_strings: new strings completion 2018-03-29 Mikael Magnusson <mikachu@gmail.com> diff --git a/Src/utils.c b/Src/utils.c index eab407eee..3587c3622 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -4396,7 +4396,7 @@ spname(char *oldname) * Rationale for this, if there ever was any, has been forgotten. */ for (;;) { while (*old == '/') { - if ((new - newname) >= (sizeof(newname)-1)) + if (new >= newname + sizeof(newname) - 1) return NULL; *new++ = *old++; } @@ -4427,7 +4427,7 @@ spname(char *oldname) if (bestdist < maxthresh) { struncpy(&new, spnameguess, sizeof(newname) - (new - newname)); struncpy(&new, old, sizeof(newname) - (new - newname)); - return (new - newname) >= (sizeof(newname)-1) ? NULL : newname; + return (new >= newname + sizeof(newname) -1) ? NULL : newname; } else return NULL; } else { @@ -4435,7 +4435,7 @@ spname(char *oldname) bestdist += thisdist; } for (p = spnamebest; (*new = *p++);) { - if ((new - newname) >= (sizeof(newname)-1)) + if (new >= newname + sizeof(newname) - 1) return NULL; new++; } |