diff options
Diffstat (limited to 'subversion/libsvn_fs_fs/key-gen.c')
| -rw-r--r-- | subversion/libsvn_fs_fs/key-gen.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/subversion/libsvn_fs_fs/key-gen.c b/subversion/libsvn_fs_fs/key-gen.c index f0f6cce..a65c59d 100644 --- a/subversion/libsvn_fs_fs/key-gen.c +++ b/subversion/libsvn_fs_fs/key-gen.c @@ -41,8 +41,8 @@ void svn_fs_fs__add_keys(const char *key1, const char *key2, char *result) { - int i1 = strlen(key1) - 1; - int i2 = strlen(key2) - 1; + apr_ssize_t i1 = strlen(key1) - 1; + apr_ssize_t i2 = strlen(key2) - 1; int i3 = 0; int val; int carry = 0; @@ -60,7 +60,7 @@ svn_fs_fs__add_keys(const char *key1, const char *key2, char *result) carry = val / 36; val = val % 36; - buf[i3++] = (val <= 9) ? (val + '0') : (val - 10 + 'a'); + buf[i3++] = (char)((val <= 9) ? (val + '0') : (val - 10 + 'a')); if (i1>=0) i1--; @@ -79,7 +79,7 @@ svn_fs_fs__add_keys(const char *key1, const char *key2, char *result) void svn_fs_fs__next_key(const char *this, apr_size_t *len, char *next) { - int i; + apr_ssize_t i; apr_size_t olen = *len; /* remember the first length */ char c; /* current char */ svn_boolean_t carry = TRUE; /* boolean: do we have a carry or not? @@ -115,7 +115,7 @@ svn_fs_fs__next_key(const char *this, apr_size_t *len, char *next) if (c == '9') next[i] = 'a'; else - next[i] = c + 1; + next[i] = ++c; } } else @@ -146,8 +146,8 @@ svn_fs_fs__next_key(const char *this, apr_size_t *len, char *next) int svn_fs_fs__key_compare(const char *a, const char *b) { - int a_len = strlen(a); - int b_len = strlen(b); + apr_size_t a_len = strlen(a); + apr_size_t b_len = strlen(b); int cmp; if (a_len > b_len) |