c70f3b8b23
Fix compilation warnings leading to package build failure. OBS-URL: https://build.opensuse.org/request/show/156351 OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=43
34 lines
972 B
Diff
34 lines
972 B
Diff
From fbe898cc01b25a68fa77f8ba9b41b70c9f4e4692 Mon Sep 17 00:00:00 2001
|
|
From: Jan Kara <jack@suse.cz>
|
|
Date: Mon, 25 Feb 2013 15:57:48 +0100
|
|
Subject: [PATCH 1/4] e2p: Fix 's' handling in parse_num_blocks2()
|
|
|
|
parse_num_blocks2() wrongly did:
|
|
num << 1;
|
|
when log_block_size < 0. That is obviously wrong as such statement has
|
|
no effect (and the compiler properly warns about it). Callers expect
|
|
returned value to be in bytes when log_block_size < 0 so fix the
|
|
statement accordingly.
|
|
|
|
Signed-off-by: Jan Kara <jack@suse.cz>
|
|
---
|
|
lib/e2p/parse_num.c | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/lib/e2p/parse_num.c b/lib/e2p/parse_num.c
|
|
index cb0dc5b..e8d6283 100644
|
|
--- a/lib/e2p/parse_num.c
|
|
+++ b/lib/e2p/parse_num.c
|
|
@@ -42,7 +42,7 @@ unsigned long long parse_num_blocks2(const char *arg, int log_block_size)
|
|
break;
|
|
case 's':
|
|
if (log_block_size < 0)
|
|
- num << 1;
|
|
+ num <<= 9;
|
|
else
|
|
num >>= (1+log_block_size);
|
|
break;
|
|
--
|
|
1.7.1
|
|
|