Magellan Linux

Diff of /trunk/mkinitrd-magellan/busybox/e2fsprogs/old_e2fsprogs/blkid/devname.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 983 by niro, Fri Apr 24 18:33:46 2009 UTC revision 984 by niro, Sun May 30 11:32:42 2010 UTC
# Line 273  int blkid_probe_all(blkid_cache cache) Line 273  int blkid_probe_all(blkid_cache cache)
273   return -BLKID_ERR_PARAM;   return -BLKID_ERR_PARAM;
274    
275   if (cache->bic_flags & BLKID_BIC_FL_PROBED &&   if (cache->bic_flags & BLKID_BIC_FL_PROBED &&
276      time(0) - cache->bic_time < BLKID_PROBE_INTERVAL)      time(NULL) - cache->bic_time < BLKID_PROBE_INTERVAL)
277   return 0;   return 0;
278    
279   blkid_read_cache(cache);   blkid_read_cache(cache);
# Line 335  int blkid_probe_all(blkid_cache cache) Line 335  int blkid_probe_all(blkid_cache cache)
335    
336   fclose(proc);   fclose(proc);
337    
338   cache->bic_time = time(0);   cache->bic_time = time(NULL);
339   cache->bic_flags |= BLKID_BIC_FL_PROBED;   cache->bic_flags |= BLKID_BIC_FL_PROBED;
340   blkid_flush_cache(cache);   blkid_flush_cache(cache);
341   return 0;   return 0;

Legend:
Removed from v.983  
changed lines
  Added in v.984