src/fuse/udcFuse/udcFuse.c 1.3
1.3 2009/11/09 18:41:18 angie
Added #ifdef USE_FUSE wrapper so this won't break compiles on machines that don't have fuse installed (thanks Mark!). Also, use appropriately sized int for cache file size, and merge adjacent errCatch wrappers.
Index: src/fuse/udcFuse/udcFuse.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/fuse/udcFuse/udcFuse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -B -U 4 -r1.2 -r1.3
--- src/fuse/udcFuse/udcFuse.c 6 Nov 2009 05:16:01 -0000 1.2
+++ src/fuse/udcFuse/udcFuse.c 9 Nov 2009 18:41:18 -0000 1.3
@@ -1,5 +1,6 @@
/* udcFuse - FUSE (Filesystem in USErspace) filesystem for lib/udc.c (Url Data Cache). */
+#ifdef USE_FUSE
#include "common.h"
#include "portable.h"
#include "errCatch.h"
#include "udc.h"
@@ -109,9 +110,9 @@
// the size is 4096 or however many bytes have been cached so far, and will
// prevent callers from reading past that.
char buf[4096];
char *url = NULL;
- int size = -1;
+ long long size = -1;
ERR_CATCH_START();
url = udcPathToUrl(path, buf, sizeof(buf), NULL);
size = udcSizeFromCache(url, NULL);
ERR_CATCH_END("udcPathToUrl or udcSizeFromCache");
@@ -233,12 +234,10 @@
return -1;
}
ERR_CATCH_START();
udcSeek(udcf, (bits64)offset);
-ERR_CATCH_END("udcSeek");
-ERR_CATCH_START();
size = udcRead(udcf, buf, size);
-ERR_CATCH_END("udcRead");
+ERR_CATCH_END("udcSeek or udcRead");
fprintf(stderr, "...[%d] read %lld bytes finish %ld\n", pid, (long long)size, clock1000());
return size;
}
@@ -393,4 +392,6 @@
return 0;
#endif//def UDC_TEST
}
+
+#endif//def USE_FUSE