fmapify cab: fix alignment issue on sparc

14 years ago · 8bc8849764
parent 8d9abc9669
commit 8bc8849764
3 changed files with 2 additions and 12 deletions
--- a/libclamav/cab.c
+++ b/libclamav/cab.c
@ -37,8 +37,8 @@
 #include "mspack.h"
 #include "cab.h"

-#define EC32(x) le32_to_host(x) /* Convert little endian to host */
-#define EC16(x) le16_to_host(x)
+#define EC32(x) cli_readint32(&x) /* Convert little endian to host */
+#define EC16(x) cli_readint16(&x)

 /* hard limits */
 #define CAB_FOLDER_LIMIT    5000
--- a/unit_tests/Makefile.am
+++ b/unit_tests/Makefile.am
@ -43,11 +43,6 @@ check_clamd_SOURCES = check_clamav_skip.c
 check_clamav_SOURCES = check_clamav_skip.c
 endif

-check_clamav.c: $(top_builddir)/test/clam.exe clamav.hdb
-
-clamav.hdb: input/clamav.hdb
-	cp $< $@
-
 check_clamav.c: $(top_builddir)/test/clam.exe clamav.hdb
 check_clamd.sh: $(top_builddir)/test/clam.exe check_clamd
 check_clamscan.sh: $(top_builddir)/test/clam.exe
--- a/unit_tests/Makefile.in
+++ b/unit_tests/Makefile.in
@ -1097,11 +1097,6 @@ check10_clamd_hg.sh: $(FILES)
 $(FILES) :
 	cat $(SPLIT_DIR)/split.$@aa $(SPLIT_DIR)/split.$@ab > $@

-check_clamav.c: $(top_builddir)/test/clam.exe clamav.hdb
-
-clamav.hdb: input/clamav.hdb
-	cp $< $@
-
 check_clamav.c: $(top_builddir)/test/clam.exe clamav.hdb
 check_clamd.sh: $(top_builddir)/test/clam.exe check_clamd
 check_clamscan.sh: $(top_builddir)/test/clam.exe