diff options
| -rw-r--r-- | Src/Zle/zle_tricky.c | 4 | ||||
| -rw-r--r-- | Src/pattern.c | 4 | ||||
| -rw-r--r-- | Src/prompt.c | 4 | ||||
| -rw-r--r-- | Src/utils.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index 6f77810cc..135e38f88 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -399,7 +399,7 @@ checkparams(char *p) for (hn = paramtab->nodes[t0]; n < 2 && hn; hn = hn->next) if (pfxlen(p, hn->nam) == l) { n++; - if (strlen(hn->nam) == l) + if ((int)strlen(hn->nam) == l) e = 1; } return (n == 1) ? (getsparam(p) != NULL) : @@ -1472,7 +1472,7 @@ get_comp_string(void) if (!isset(IGNOREBRACES)) { /* Try and deal with foo{xxx etc. */ - char *curs = s + (isset(COMPLETEINWORD) ? offs : strlen(s)); + char *curs = s + (isset(COMPLETEINWORD) ? offs : (int)strlen(s)); char *predup = dupstring(s), *dp = predup; char *bbeg = NULL, *bend = NULL, *dbeg = NULL; char *lastp = NULL, *firsts = NULL; diff --git a/Src/pattern.c b/Src/pattern.c index 264144382..4701522d1 100644 --- a/Src/pattern.c +++ b/Src/pattern.c @@ -425,7 +425,7 @@ patcompile(char *exp, int inflags, char **endexp) len = 0; for (; pscan; pscan = PATNEXT(pscan)) if (P_OP(pscan) == P_EXACTLY && - strlen((char *)P_OPERAND(pscan)) >= len) { + (int)strlen((char *)P_OPERAND(pscan)) >= len) { lng = (char *)P_OPERAND(pscan); len = strlen(lng); } @@ -2023,7 +2023,7 @@ patmatch(Upat prog) int ptlen = strlen(patinput); int oplen = strlen(nextop); /* Are we in the right range? */ - if (oplen > strlen(min ? METANEXT(start) : start) || + if (oplen > (int)strlen(min ? METANEXT(start) : start) || oplen < ptlen) return 0; /* Yes, just position appropriately and test. */ diff --git a/Src/prompt.c b/Src/prompt.c index d83ec9417..a889f7cd3 100644 --- a/Src/prompt.c +++ b/Src/prompt.c @@ -283,11 +283,11 @@ putpromptchar(int doprint, int endchar) test = 1; break; case '#': - if (geteuid() == arg) + if (geteuid() == (uid_t)arg) test = 1; break; case 'g': - if (getegid() == arg) + if (getegid() == (gid_t)arg) test = 1; break; case 'j': diff --git a/Src/utils.c b/Src/utils.c index 67bc28abd..8b3bba5d8 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -515,7 +515,7 @@ finddir(char *s) if(!strcmp(s, finddir_full) && *finddir_full) return finddir_last; - if(strlen(s) >= ffsz) { + if ((int)strlen(s) >= ffsz) { free(finddir_full); finddir_full = zalloc(ffsz = strlen(s) * 2); } @@ -1908,7 +1908,7 @@ colonsplit(char *s, int uniq) for (; *t && *t != ':'; t++); if (uniq) for (p = ret; p < ptr; p++) - if (strlen(*p) == t - s && ! strncmp(*p, s, t - s)) + if ((int)strlen(*p) == t - s && ! strncmp(*p, s, t - s)) goto cont; *ptr = (char *) zalloc((t - s) + 1); ztrncpy(*ptr++, s, t - s); |