From d9432eea04330be051990b87f98ea323ada99133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edvin?= Date: Tue, 30 Jun 2009 16:55:48 +0300 Subject: [PATCH] Fix errors from make distcheck. --- libclamav/Makefile.am | 3 ++- libclamav/Makefile.in | 5 +++-- libclamav/bytecode.c | 6 +++--- libltdl/Makefile.am | 3 +++ libltdl/Makefile.in | 4 +++- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am index 7be9f7943..73e4989a2 100644 --- a/libclamav/Makefile.am +++ b/libclamav/Makefile.am @@ -287,7 +287,8 @@ libclamav_la_SOURCES = \ sha256.h\ bignum.h\ bytecode.c\ - bytecode.h + bytecode.h\ + clambc.h if !LINK_TOMMATH libclamav_la_SOURCES += bignum.c \ diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in index 1f87348c0..ebeb60239 100644 --- a/libclamav/Makefile.in +++ b/libclamav/Makefile.in @@ -121,7 +121,7 @@ am__libclamav_la_SOURCES_DIST = clamav.h matcher-ac.c matcher-ac.h \ textnorm.h dlp.c dlp.h jsparse/js-norm.c jsparse/js-norm.h \ jsparse/lexglobal.h jsparse/textbuf.h uniq.c uniq.h version.c \ version.h mpool.c mpool.h default.h sha256.c sha256.h bignum.h \ - bytecode.c bytecode.h bignum.c bignum_class.h + bytecode.c bytecode.h clambc.h bignum.c bignum_class.h @LINK_TOMMATH_FALSE@am__objects_1 = libclamav_la-bignum.lo am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \ libclamav_la-matcher-bm.lo libclamav_la-matcher.lo \ @@ -529,7 +529,8 @@ libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \ explode.h textnorm.c textnorm.h dlp.c dlp.h jsparse/js-norm.c \ jsparse/js-norm.h jsparse/lexglobal.h jsparse/textbuf.h uniq.c \ uniq.h version.c version.h mpool.c mpool.h default.h sha256.c \ - sha256.h bignum.h bytecode.c bytecode.h $(am__append_7) + sha256.h bignum.h bytecode.c bytecode.h clambc.h \ + $(am__append_7) noinst_LTLIBRARIES = libclamav_internal_utils.la libclamav_internal_utils_nothreads.la COMMON_CLEANFILES = version.h version.h.tmp *.gcda *.gcno lzma/*.gcda lzma/*.gcno @MAINTAINER_MODE_TRUE@BUILT_SOURCES = jsparse/generated/operators.h jsparse/generated/keywords.h jsparse-keywords.gperf diff --git a/libclamav/bytecode.c b/libclamav/bytecode.c index a9da3d3f8..a871af4cb 100644 --- a/libclamav/bytecode.c +++ b/libclamav/bytecode.c @@ -111,7 +111,7 @@ static inline uint64_t readNumber(const unsigned char *p, unsigned *off, unsigne for (i=*off+1;i < newoff; i++) { uint64_t v = p[i]; if (UNLIKELY((v&0xf0) != 0x60)) { - cli_errmsg("Invalid number part: %c\n", v); + cli_errmsg("Invalid number part: %c\n", (char)v); *ok = 0; return 0; } @@ -247,8 +247,8 @@ static int parseHeader(struct cli_bc *bc, unsigned char *buffer) magic1 = readNumber(buffer, &offset, len, &ok); magic2 = readFixedNumber(buffer, &offset, len, &ok, 2); if (!ok || magic1 != 0x53e5493e9f3d1c30ull || magic2 != 42) { - unsigned m0 = magic1 >> 32; - unsigned m1 = magic1; + unsigned long m0 = magic1 >> 32; + unsigned long m1 = magic1; cli_errmsg("Magic numbers don't match: %lx%lx, %u\n", m0, m1, magic2); return CL_EMALFDB; } diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am index a597b1d3e..c33a0a40e 100644 --- a/libltdl/Makefile.am +++ b/libltdl/Makefile.am @@ -28,6 +28,9 @@ ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ##### +# ClamAV: filter -Werror here +CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Werror[^=-]//'` + ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in index 697c52828..872b58a67 100644 --- a/libltdl/Makefile.in +++ b/libltdl/Makefile.in @@ -163,7 +163,9 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFGDIR = @CFGDIR@ -CFLAGS = @CFLAGS@ + +# ClamAV: filter -Werror here +CFLAGS = `echo "@CFLAGS@" | sed -e 's/-Werror[^=-]//'` CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ CHECK_LIBS = @CHECK_LIBS@ CLAMAVGROUP = @CLAMAVGROUP@