From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 23 Sep 2012 01:35:46 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2012-09-22~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f2a048b1d2ac1109ccc2cb991a8c62808edd1ed;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next
---

2f2a048b1d2ac1109ccc2cb991a8c62808edd1ed
diff --cc lib/ext2fs/progress.c
index c71d695d5,8c9a6f1d2..83556b1ae
--- a/lib/ext2fs/progress.c
+++ b/lib/ext2fs/progress.c
@@@ -17,13 -17,8 +17,14 @@@
  #include <time.h>
  
  static char spaces[80], backspaces[80];
+ static time_t last_update;
  
 +struct ext2fs_progress_ops ext2fs_numeric_progress_ops = {
 +	.init		= ext2fs_numeric_progress_init,
 +	.update		= ext2fs_numeric_progress_update,
 +	.close		= ext2fs_numeric_progress_close,
 +};
 +
  static int int_log10(unsigned int arg)
  {
  	int	l;