From 783a5926d61c823885009bbf2f16cc5564bfe5b2 Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Sun, 11 Jun 2017 20:23:17 +0200 Subject: [PATCH] cache sync: introduce BORG_NO_PYTHON textshell edition --- scripts/fuzz-cache-sync/main.c | 3 +++ src/borg/_hashindex.c | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/fuzz-cache-sync/main.c b/scripts/fuzz-cache-sync/main.c index b25d925db..c65dd272d 100644 --- a/scripts/fuzz-cache-sync/main.c +++ b/scripts/fuzz-cache-sync/main.c @@ -1,3 +1,6 @@ + +#define BORG_NO_PYTHON + #include "../../src/borg/_hashindex.c" #include "../../src/borg/cache_sync/cache_sync.c" diff --git a/src/borg/_hashindex.c b/src/borg/_hashindex.c index 087dc2730..14206efe1 100644 --- a/src/borg/_hashindex.c +++ b/src/borg/_hashindex.c @@ -56,7 +56,7 @@ typedef struct { int lower_limit; int upper_limit; int min_empty; -#ifdef Py_PYTHON_H +#ifndef BORG_NO_PYTHON /* buckets may be backed by a Python buffer. If buckets_buffer.buf is NULL then this is not used. */ Py_buffer buckets_buffer; #endif @@ -108,7 +108,7 @@ static int hash_sizes[] = { #define EPRINTF(msg, ...) fprintf(stderr, "hashindex: " msg "(%s)\n", ##__VA_ARGS__, strerror(errno)) #define EPRINTF_PATH(path, msg, ...) fprintf(stderr, "hashindex: %s: " msg " (%s)\n", path, ##__VA_ARGS__, strerror(errno)) -#ifdef Py_PYTHON_H +#ifndef BORG_NO_PYTHON static HashIndex *hashindex_read(PyObject *file_py, int permit_compact); static void hashindex_write(HashIndex *index, PyObject *file_py); #endif @@ -126,7 +126,7 @@ static void hashindex_free(HashIndex *index); static void hashindex_free_buckets(HashIndex *index) { -#ifdef Py_PYTHON_H +#ifndef BORG_NO_PYTHON if(index->buckets_buffer.buf) { PyBuffer_Release(&index->buckets_buffer); } else @@ -272,7 +272,7 @@ count_empty(HashIndex *index) /* Public API */ -#ifdef Py_PYTHON_H +#ifndef BORG_NO_PYTHON static HashIndex * hashindex_read(PyObject *file_py, int permit_compact) { @@ -457,7 +457,7 @@ hashindex_init(int capacity, int key_size, int value_size) index->lower_limit = get_lower_limit(index->num_buckets); index->upper_limit = get_upper_limit(index->num_buckets); index->min_empty = get_min_empty(index->num_buckets); -#ifdef Py_PYTHON_H +#ifndef BORG_NO_PYTHON index->buckets_buffer.buf = NULL; #endif for(i = 0; i < capacity; i++) { @@ -473,7 +473,7 @@ hashindex_free(HashIndex *index) free(index); } -#ifdef Py_PYTHON_H +#ifndef BORG_NO_PYTHON static void hashindex_write(HashIndex *index, PyObject *file_py) {