Mercurial > hg
changeset 17701:f7b3518c9cb4
Merge
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Tue, 02 Oct 2012 14:31:14 -0700 |
parents | 0696b1793f4b (diff) 5b1b0e4e6902 (current diff) |
children | 57fe5aca86af |
files | |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/pathencode.c Tue Oct 02 14:27:13 2012 -0700 +++ b/mercurial/pathencode.c Tue Oct 02 14:31:14 2012 -0700 @@ -55,7 +55,7 @@ DDEFAULT, }; -static inline int isset(const uint32_t bitset[], char c) +static inline int inset(const uint32_t bitset[], char c) { return bitset[((uint8_t)c) >> 5] & (1 << (((uint8_t)c) & 31)); } @@ -419,7 +419,7 @@ } break; case DEFAULT: - while (isset(onebyte, src[i])) { + while (inset(onebyte, src[i])) { charcopy(dest, &destlen, destsize, src[i++]); if (i == len) goto done; @@ -439,14 +439,14 @@ i++; break; default: - if (isset(onebyte, src[i])) { + if (inset(onebyte, src[i])) { do { charcopy(dest, &destlen, destsize, src[i++]); } while (i < len && - isset(onebyte, src[i])); + inset(onebyte, src[i])); } - else if (isset(twobytes, src[i])) { + else if (inset(twobytes, src[i])) { char c = src[i++]; charcopy(dest, &destlen, destsize, '_'); charcopy(dest, &destlen, destsize,