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

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit 548a7c72130fd8c131165bcf95ac776fcb68b5df
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Mon Jul 13 21:48:13 2009 +0200

    drop duplicate code

diff --git a/libclamav/elf.c b/libclamav/elf.c
index 36f6f72..8d8724a 100644
--- a/libclamav/elf.c
+++ b/libclamav/elf.c
@@ -39,21 +39,8 @@
 #include "execs.h"
 #include "matcher.h"
 
-static inline uint16_t EC16(uint16_t v, uint8_t c)
-{
-    if(!c)
-	return v;
-    else
-	return ((v >> 8) + (v << 8));
-}
-
-static inline uint32_t EC32(uint32_t v, uint8_t c)
-{
-    if(!c)
-	return v;
-    else
-	return ((v >> 24) | ((v & 0x00FF0000) >> 8) | ((v & 0x0000FF00) << 8) | (v << 24));
-}
+#define EC16(v, conv)   (conv ? cbswap16(v) : v)
+#define EC32(v, conv)   (conv ? cbswap32(v) : v)
 
 static uint32_t cli_rawaddr(uint32_t vaddr, struct elf_program_hdr32 *ph, uint16_t phnum, uint8_t conv, uint8_t *err)
 {

-- 
Debian repository for ClamAV