[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-167-g4319a8f

[edwin]

The following commit has been merged in the debian/unstable branch:
commit 0e83526042924fabf5a7d02caf132e65fbe05635
Author: edwin <edwin at 77e5149b-7576-45b1-b177-96237e5ba77b>
Date:   Fri May 15 12:11:05 2009 +0000

    fix compiler warning
    
    git-svn-id: http://svn.clamav.net/svn/clamav-devel/trunk@5068 77e5149b-7576-45b1-b177-96237e5ba77b

diff --git a/ChangeLog b/ChangeLog
index ee02056..dfdfb01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri May 15 15:10:59 EEST 2009 (edwin)
+-------------------------------------
+ * libclamav/others.h, libclamav/regex/regex.h: fix compiler warning
+
 Fri May 15 14:29:19 EEST 2009 (edwin)
 -------------------------------------
  * libclamav/others.h, libclamav/others_common.c,
diff --git a/libclamav/others.h b/libclamav/others.h
index 817f8f0..1faa411 100644
--- a/libclamav/others.h
+++ b/libclamav/others.h
@@ -383,7 +383,6 @@ const char* cli_ctime(const time_t *timep, char *buf, const size_t bufsize);
 int cli_checklimits(const char *, cli_ctx *, unsigned long, unsigned long, unsigned long);
 int cli_updatelimits(cli_ctx *, unsigned long);
 unsigned long cli_getsizelimit(cli_ctx *, unsigned long);
-int cli_regcomp(regex_t *preg, const char *pattern, int cflags);
 int cli_matchregex(const char *str, const char *regex);
 
 /* symlink behaviour */
diff --git a/libclamav/regex/regex.h b/libclamav/regex/regex.h
index fef74ec..d4874de 100644
--- a/libclamav/regex/regex.h
+++ b/libclamav/regex/regex.h
@@ -94,6 +94,7 @@ typedef struct {
 #define	REG_BACKR	02000	/* force use of backref code */
 
 int	cli_regcomp_real(regex_t *, const char *, int);
+int	cli_regcomp(regex_t *, const char *, int);
 size_t	cli_regerror(int, const regex_t *, char *, size_t);
 int	cli_regexec(const regex_t *, const char *, size_t, regmatch_t [], int);
 void	cli_regfree(regex_t *);

-- 
Debian repository for ClamAV