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

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit b8f3f028b2f4544abe566be8220cb49b35526896
Author: aCaB <acab at clamav.net>
Date:   Mon Oct 12 23:38:38 2009 +0200

    always pass a NULL *tz to gettimeofday

diff --git a/clamdscan/clamdscan.c b/clamdscan/clamdscan.c
index fb7bc79..8cb119b 100644
--- a/clamdscan/clamdscan.c
+++ b/clamdscan/clamdscan.c
@@ -55,7 +55,6 @@ int main(int argc, char **argv)
 {
 	int ds, dms, ret, infected = 0;
 	struct timeval t1, t2;
-	struct timezone tz;
 	time_t starttime;
         struct optstruct *opts;
         const struct optstruct *opt;
@@ -127,13 +126,13 @@ int main(int argc, char **argv)
     time(&starttime);
     /* ctime() does \n, but I need it once more */
 
-    gettimeofday(&t1, &tz);
+    gettimeofday(&t1, NULL);
 
     ret = client(opts, &infected);
 
     /* TODO: Implement STATUS in clamd */
     if((infected || ret != 2) && !optget(opts, "no-summary")->enabled) {
-	gettimeofday(&t2, &tz);
+	gettimeofday(&t2, NULL);
 	ds = t2.tv_sec - t1.tv_sec;
 	dms = t2.tv_usec - t1.tv_usec;
 	ds -= (dms < 0) ? (1):(0);
diff --git a/clamscan/clamscan.c b/clamscan/clamscan.c
index 91bac14..15b2708 100644
--- a/clamscan/clamscan.c
+++ b/clamscan/clamscan.c
@@ -60,7 +60,6 @@ int main(int argc, char **argv)
 	int ds, dms, ret;
 	double mb, rmb;
 	struct timeval t1, t2;
-	struct timezone tz;
 #ifndef _WIN32
 	sigset_t sigset;
 #endif
@@ -143,12 +142,12 @@ int main(int argc, char **argv)
 
     memset(&info, 0, sizeof(struct s_info));
 
-    gettimeofday(&t1, &tz);
+    gettimeofday(&t1, NULL);
 
     ret = scanmanager(opts);
 
     if(!optget(opts, "no-summary")->enabled) {
-	gettimeofday(&t2, &tz);
+	gettimeofday(&t2, NULL);
 
     ds = t2.tv_sec - t1.tv_sec;
 	dms = t2.tv_usec - t1.tv_usec;

-- 
Debian repository for ClamAV