hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed more issues in pecl-svn/svn.c

Browse Source
This commit is contained in:
hyung-hwan 2020-12-20 10:49:13 +00:00
parent 06f3ca4e81
commit 0e9bb90b89
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codepot/docker/build-ubnt2004.sh
View File

@ -58,6 +58,6 @@ cat <<EOF > /var/www/html/index.html
EOF EOF
apt-get remove --purge -y php-dev libsvn-dev make libfdisk1 && \ apt-get remove --purge -y php-dev libsvn-dev make libfdisk1 && \
apt-get auto-remove -y && rm -rf /var/lib/apt/lists/* apt-get autoremove --purge -y && rm -rf /var/lib/apt/lists/*
rm -rf /root/.subversion rm -rf /root/.subversion

9
codepot/pecl-svn/svn.c
View File

@ -1023,8 +1023,8 @@ cleanup:
#if defined(APR_MAJOR_VERSION) && ((APR_MAJOR_VERSION >= 2) || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 5)) #if defined(APR_MAJOR_VERSION) && ((APR_MAJOR_VERSION >= 2) || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 5))
static int compare_keys(const void *a, const void *b) static int compare_keys(const void *a, const void *b)
{ {
Bucket *f = *((Bucket **) a); Bucket *f = (Bucket*)a;
Bucket *s = *((Bucket **) b); Bucket *s = (Bucket*)b;
/*return strcmp(f->arKey, s->arKey);*/ /*return strcmp(f->arKey, s->arKey);*/
int diff = ZSTR_LEN(f->key) - ZSTR_LEN(s->key); int diff = ZSTR_LEN(f->key) - ZSTR_LEN(s->key);
if (diff) return diff; if (diff) return diff;
@ -1242,9 +1242,8 @@ cleanup:
#if defined(APR_MAJOR_VERSION) && ((APR_MAJOR_VERSION >= 2) || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 5)) #if defined(APR_MAJOR_VERSION) && ((APR_MAJOR_VERSION >= 2) || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 5))
static int compare_keys_as_paths(const void *a, const void *b) static int compare_keys_as_paths(const void *a, const void *b)
{ {
Bucket *f = *((Bucket **) a); Bucket *f = (Bucket*)a;
Bucket *s = *((Bucket **) b); Bucket *s = (Bucket*)b;
/*return svn_sort_compare_paths(&(f->arKey), &(s->arKey));*/
int diff = ZSTR_LEN(f->key) - ZSTR_LEN(s->key); int diff = ZSTR_LEN(f->key) - ZSTR_LEN(s->key);
if (diff) return diff; if (diff) return diff;
return strncmp(ZSTR_VAL(f->key), ZSTR_VAL(s->key), ZSTR_LEN(f->key)); return strncmp(ZSTR_VAL(f->key), ZSTR_VAL(s->key), ZSTR_LEN(f->key));