diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2010-07-19 02:37:41 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-07-19 02:37:41 -0400 |
| commit | db0bdb49f49fc3dd14c12439d934a3403a3be9f1 (patch) | |
| tree | ebbdc877184df5896a89d291193029d730aadd85 /tests | |
| parent | efe0b401465a3ee836180614b5b435acbb84fc27 (diff) | |
| parent | 58384b8fa81ce01221414a3603591b63e487609b (diff) | |
| download | e2fsprogs-db0bdb49f49fc3dd14c12439d934a3403a3be9f1.tar.gz | |
Merge branch 'maint' into next
Conflicts:
resize/extent.c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/progs/test_rel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/progs/test_rel.c b/tests/progs/test_rel.c index e6997b65..954a7221 100644 --- a/tests/progs/test_rel.c +++ b/tests/progs/test_rel.c @@ -713,7 +713,7 @@ void main(int argc, char **argv) int retval; int sci_idx; const char *usage = "Usage: test_rel [-R request] [-f cmd_file]"; - char c; + int c; char *request = 0; int exit_status = 0; char *cmd_file = 0; |