aboutsummaryrefslogtreecommitdiffstats
path: root/debugfs
diff options
context:
space:
mode:
authorEric Whitney <enwlinux@gmail.com>2013-12-24 11:04:42 -0500
committerTheodore Ts'o <tytso@mit.edu>2013-12-24 22:50:23 -0500
commit32541fe4f90e59597f7721967153e9641c5f8dce (patch)
tree0f684b6f4a6bce6dfcd4db808fbf11af0807b723 /debugfs
parenta8263cab57e57fa85ca2c281fe97554eb97441f1 (diff)
downloadandroid_external_e2fsprogs-32541fe4f90e59597f7721967153e9641c5f8dce.tar.gz
android_external_e2fsprogs-32541fe4f90e59597f7721967153e9641c5f8dce.tar.bz2
android_external_e2fsprogs-32541fe4f90e59597f7721967153e9641c5f8dce.zip
debugfs: silence build warning and remove incorrect error message
Commit fe56188b07 modified the code used to check the block number argument to the command line -s switch, adding a call to com_err(). This causes a compile time warning because the third argument to com_err() isn't a string. Also, when the block number argument is bad it outputs an incorrect error message - "Operation not permitted". Fix these minor problems by removing the call to com_err(). Other code provides enough error reporting information in this case. Signed-off-by: Eric Whitney <enwlinux@gmail.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'debugfs')
-rw-r--r--debugfs/debugfs.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 6982ff6a..095741f7 100644
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -2458,10 +2458,8 @@ int main(int argc, char **argv)
break;
case 's':
retval = strtoblk(argv[0], optarg, &superblock);
- if (retval) {
- com_err(argv[0], retval, 0, debug_prog_name);
+ if (retval)
return 1;
- }
break;
case 'c':
catastrophic = 1;