upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-10 17:32:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #6937 from ThomasWaldmann/fix-warnings-1.2

Browse source 
Fix warnings (1.2-maint)
This commit is contained in:
TW 2022-08-04 18:23:34 +02:00 committed by GitHub
commit 28bc76a916
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
setup.py
View file

@ -11,7 +11,7 @@ except ImportError:
multiprocessing = None
from setuptools.command.build_ext import build_ext
from setuptools import setup, find_packages, Extension, Command
from setuptools import setup, find_namespace_packages, Extension, Command
from setuptools.command.sdist import sdist
try:
@ -292,7 +292,7 @@ setup(
'Topic :: Security :: Cryptography',
'Topic :: System :: Archiving :: Backup',
],
packages=find_packages('src'),
packages=find_namespace_packages('src'),
package_dir={'': 'src'},
zip_safe=False,
entry_points={

10
src/borg/_chunker.c
View file

@ -154,8 +154,6 @@ static int
chunker_fill(Chunker *c)
{
ssize_t n;
off_t offset, length;
int overshoot;
PyObject *data;
PyThreadState *thread_state;
@ -169,7 +167,10 @@ chunker_fill(Chunker *c)
if(c->fh >= 0) {
thread_state = PyEval_SaveThread();
offset = c->bytes_read;
#if ( ( _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L ) && defined(POSIX_FADV_DONTNEED) )
off_t offset = c->bytes_read;
#endif
// if we have a os-level file descriptor, use os-level API
n = read(c->fh, c->data + c->position + c->remaining, n);
if(n > 0) {
@ -186,8 +187,8 @@ chunker_fill(Chunker *c)
PyErr_SetFromErrno(PyExc_OSError);
return 0;
}
length = c->bytes_read - offset;
#if ( ( _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L ) && defined(POSIX_FADV_DONTNEED) )
off_t length = c->bytes_read - offset;
// Only do it once per run.
if (pagemask == 0)
@ -200,6 +201,7 @@ chunker_fill(Chunker *c)
// for the OS or other processes.
// We rollback the initial offset back to the start of the page,
// to avoid it not being truncated as a partial page request.
int overshoot;
if (length > 0) {
// All Linux kernels (at least up to and including 4.6(.0)) have a bug where
// they truncate last partial page of POSIX_FADV_DONTNEED request, so we need