From b1fa75dfe08461c0f1349093266bcdc852bcd713 Mon Sep 17 00:00:00 2001 From: Xavier Roche Date: Sun, 4 May 2014 08:48:23 +0000 Subject: Big cleanup in string primitives and abort functions --- src/proxy/proxytrack.c | 4 +--- src/proxy/store.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/proxy') diff --git a/src/proxy/proxytrack.c b/src/proxy/proxytrack.c index e495f73..dabb761 100644 --- a/src/proxy/proxytrack.c +++ b/src/proxy/proxytrack.c @@ -103,6 +103,7 @@ Remark: If no cache newer than the added one is found, all entries can be added */ /* HTTrack definitions */ +#define HTSSAFE_ABORT_FUNCTION(A,B,C) #include "htsbase.h" #include "htsnet.h" #include "htslib.h" @@ -145,8 +146,6 @@ Remark: If no cache newer than the added one is found, all entries can be added #endif /* External references */ -// htsErrorCallback htsCallbackErr = NULL; -int htsMemoryFastXfr = 1; /* fast xfr by default */ void abortLog__fnc(char *msg, char *file, int line); void abortLog__fnc(char *msg, char *file, int line) { FILE *fp = fopen("CRASH.TXT", "wb"); @@ -166,7 +165,6 @@ void abortLog__fnc(char *msg, char *file, int line) { } } -// HTSEXT_API t_abortLog abortLog__ = abortLog__fnc; /* avoid VC++ inlining */ #define webhttrack_lock(A) do{}while(0) /* Static definitions */ diff --git a/src/proxy/store.c b/src/proxy/store.c index 1702bc8..9d756b7 100644 --- a/src/proxy/store.c +++ b/src/proxy/store.c @@ -41,6 +41,7 @@ static long int timezone = 0; #include #endif +#define HTSSAFE_ABORT_FUNCTION(A,B,C) #include "htsglobal.h" #define HTS_INTERNAL_BYTECODE @@ -253,8 +254,6 @@ int PT_RemoveIndex(PT_Indexes index, int indexId) { return 0; } -#define assertf(exp) - static int binput(char *buff, char *s, int max) { int count = 0; int destCount = 0; -- cgit v1.2.3