gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 32bit build warnings (#7926)

Browse Source
This commit is contained in:
Oran Agra 2020-10-20 09:12:24 +03:00 committed by GitHub
parent 04a0af9085
commit a425e1d26d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.c
View File

@ -1610,7 +1610,7 @@ int rewriteConfigOverwriteFile(char *configfile, sds content) {
written_bytes = write(fd, content + offset, sdslen(content) - offset); written_bytes = write(fd, content + offset, sdslen(content) - offset);
if (written_bytes <= 0) { if (written_bytes <= 0) {
if (errno == EINTR) continue; /* FD is blocking, no other retryable errors */ if (errno == EINTR) continue; /* FD is blocking, no other retryable errors */
serverLog(LL_WARNING, "Failed after writing (%ld) bytes to tmp config file (%s)", offset, strerror(errno)); serverLog(LL_WARNING, "Failed after writing (%zd) bytes to tmp config file (%s)", offset, strerror(errno));
goto cleanup; goto cleanup;
} }
offset+=written_bytes; offset+=written_bytes;

4
src/listpack.c
View File

@ -768,10 +768,10 @@ unsigned char *lpSeek(unsigned char *lp, long index) {
if (numele != LP_HDR_NUMELE_UNKNOWN) { if (numele != LP_HDR_NUMELE_UNKNOWN) {
if (index < 0) index = (long)numele+index; if (index < 0) index = (long)numele+index;
if (index < 0) return NULL; /* Index still < 0 means out of range. */ if (index < 0) return NULL; /* Index still < 0 means out of range. */
if ((long)index >= numele) return NULL; /* Out of range the other side. */ if (index >= (long)numele) return NULL; /* Out of range the other side. */
/* We want to scan right-to-left if the element we are looking for /* We want to scan right-to-left if the element we are looking for
* is past the half of the listpack. */ * is past the half of the listpack. */
if ((long)index > numele/2) { if (index > (long)numele/2) {
forward = 0; forward = 0;
/* Right to left scanning always expects a negative index. Convert /* Right to left scanning always expects a negative index. Convert
* our index to negative form. */ * our index to negative form. */