summaryrefslogtreecommitdiff
path: root/e2fsprogs/old_e2fsprogs/blkid
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2009-02-02 10:48:06 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2009-02-02 10:48:06 +0000
commit04158e04591efea20f34c8dc83002e19056a5590 (patch)
tree1deace5081207ddefa831e024e5914a11a8aaeeb /e2fsprogs/old_e2fsprogs/blkid
parent512c8ae0537ad2ffcb70db03ca50b532781ae799 (diff)
downloadbusybox-w32-04158e04591efea20f34c8dc83002e19056a5590.tar.gz
busybox-w32-04158e04591efea20f34c8dc83002e19056a5590.tar.bz2
busybox-w32-04158e04591efea20f34c8dc83002e19056a5590.zip
udhcpd: add code which rejects lease files with suspicious or old timestamp.
*: s/time(0)/time(NULL)/g
Diffstat (limited to 'e2fsprogs/old_e2fsprogs/blkid')
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/devname.c4
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/probe.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/e2fsprogs/old_e2fsprogs/blkid/devname.c b/e2fsprogs/old_e2fsprogs/blkid/devname.c
index 5b9e48f13..348e5d42e 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/devname.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/devname.c
@@ -273,7 +273,7 @@ int blkid_probe_all(blkid_cache cache)
273 return -BLKID_ERR_PARAM; 273 return -BLKID_ERR_PARAM;
274 274
275 if (cache->bic_flags & BLKID_BIC_FL_PROBED && 275 if (cache->bic_flags & BLKID_BIC_FL_PROBED &&
276 time(0) - cache->bic_time < BLKID_PROBE_INTERVAL) 276 time(NULL) - cache->bic_time < BLKID_PROBE_INTERVAL)
277 return 0; 277 return 0;
278 278
279 blkid_read_cache(cache); 279 blkid_read_cache(cache);
@@ -335,7 +335,7 @@ int blkid_probe_all(blkid_cache cache)
335 335
336 fclose(proc); 336 fclose(proc);
337 337
338 cache->bic_time = time(0); 338 cache->bic_time = time(NULL);
339 cache->bic_flags |= BLKID_BIC_FL_PROBED; 339 cache->bic_flags |= BLKID_BIC_FL_PROBED;
340 blkid_flush_cache(cache); 340 blkid_flush_cache(cache);
341 return 0; 341 return 0;
diff --git a/e2fsprogs/old_e2fsprogs/blkid/probe.c b/e2fsprogs/old_e2fsprogs/blkid/probe.c
index 48b240e98..1f7188e6d 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/probe.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/probe.c
@@ -562,7 +562,7 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev)
562 if (!dev) 562 if (!dev)
563 return NULL; 563 return NULL;
564 564
565 now = time(0); 565 now = time(NULL);
566 diff = now - dev->bid_time; 566 diff = now - dev->bid_time;
567 567
568 if ((now < dev->bid_time) || 568 if ((now < dev->bid_time) ||
@@ -659,7 +659,7 @@ try_again:
659found_type: 659found_type:
660 if (dev && type) { 660 if (dev && type) {
661 dev->bid_devno = st.st_rdev; 661 dev->bid_devno = st.st_rdev;
662 dev->bid_time = time(0); 662 dev->bid_time = time(NULL);
663 dev->bid_flags |= BLKID_BID_FL_VERIFIED; 663 dev->bid_flags |= BLKID_BID_FL_VERIFIED;
664 cache->bic_flags |= BLKID_BIC_FL_CHANGED; 664 cache->bic_flags |= BLKID_BIC_FL_CHANGED;
665 665