summaryrefslogtreecommitdiff
path: root/src/proxy
diff options
context:
space:
mode:
authorXavier Roche <xroche@users.noreply.github.com>2014-05-04 08:48:23 +0000
committerXavier Roche <xroche@users.noreply.github.com>2014-05-04 08:48:23 +0000
commitb1fa75dfe08461c0f1349093266bcdc852bcd713 (patch)
treef9d3d7950c6e72d1c0d05d6ea4f0a6dff2346ab9 /src/proxy
parent4da59a639962cecf3599f19813b00f2ab065e089 (diff)
Big cleanup in string primitives and abort functions
Diffstat (limited to 'src/proxy')
-rw-r--r--src/proxy/proxytrack.c4
-rw-r--r--src/proxy/store.c3
2 files changed, 2 insertions, 5 deletions
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 <pthread.h>
#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;