|
 |
b7f731 |
From efa295309fd2d85133aaf3c224cd5834b689234c Mon Sep 17 00:00:00 2001
|
|
|
b7f731 |
From: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
|
b7f731 |
Date: Wed, 29 Mar 2017 12:05:12 -0400
|
|
|
b7f731 |
Subject: [RHEL7.5 PATCH 035/169] util: Cosmetic changes
|
|
|
b7f731 |
|
|
|
b7f731 |
Fixup a number of indentation and whitespace issues
|
|
|
b7f731 |
|
|
|
b7f731 |
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
|
b7f731 |
---
|
|
|
b7f731 |
util.c | 22 ++++++++++------------
|
|
|
b7f731 |
1 file changed, 10 insertions(+), 12 deletions(-)
|
|
|
b7f731 |
|
|
|
b7f731 |
diff --git a/util.c b/util.c
|
|
|
b7f731 |
index 683c869..374015e 100644
|
|
|
b7f731 |
--- a/util.c
|
|
|
b7f731 |
+++ b/util.c
|
|
|
b7f731 |
@@ -828,14 +828,12 @@ char *human_size(long long bytes)
|
|
|
b7f731 |
long cMiB = (bytes * 200LL / (1LL<<20) + 1) / 2;
|
|
|
b7f731 |
long cMB = (bytes / ( 1000000LL / 200LL ) +1) /2;
|
|
|
b7f731 |
snprintf(buf, sizeof(buf), " (%ld.%02ld MiB %ld.%02ld MB)",
|
|
|
b7f731 |
- cMiB/100 , cMiB % 100,
|
|
|
b7f731 |
- cMB/100, cMB % 100);
|
|
|
b7f731 |
+ cMiB/100, cMiB % 100, cMB/100, cMB % 100);
|
|
|
b7f731 |
} else {
|
|
|
b7f731 |
long cGiB = (bytes * 200LL / (1LL<<30) +1) / 2;
|
|
|
b7f731 |
long cGB = (bytes / (1000000000LL/200LL ) +1) /2;
|
|
|
b7f731 |
snprintf(buf, sizeof(buf), " (%ld.%02ld GiB %ld.%02ld GB)",
|
|
|
b7f731 |
- cGiB/100 , cGiB % 100,
|
|
|
b7f731 |
- cGB/100, cGB % 100);
|
|
|
b7f731 |
+ cGiB/100, cGiB % 100, cGB/100, cGB % 100);
|
|
|
b7f731 |
}
|
|
|
b7f731 |
return buf;
|
|
|
b7f731 |
}
|
|
|
b7f731 |
@@ -862,22 +860,22 @@ char *human_size_brief(long long bytes, int prefix)
|
|
|
b7f731 |
if (bytes < 2*1024LL*1024LL*1024LL) {
|
|
|
b7f731 |
long cMiB = (bytes * 200LL / (1LL<<20) +1) /2;
|
|
|
b7f731 |
snprintf(buf, sizeof(buf), "%ld.%02ldMiB",
|
|
|
b7f731 |
- cMiB/100 , cMiB % 100);
|
|
|
b7f731 |
+ cMiB/100, cMiB % 100);
|
|
|
b7f731 |
} else {
|
|
|
b7f731 |
long cGiB = (bytes * 200LL / (1LL<<30) +1) /2;
|
|
|
b7f731 |
snprintf(buf, sizeof(buf), "%ld.%02ldGiB",
|
|
|
b7f731 |
- cGiB/100 , cGiB % 100);
|
|
|
b7f731 |
+ cGiB/100, cGiB % 100);
|
|
|
b7f731 |
}
|
|
|
b7f731 |
}
|
|
|
b7f731 |
else if (prefix == JEDEC) {
|
|
|
b7f731 |
if (bytes < 2*1024LL*1024LL*1024LL) {
|
|
|
b7f731 |
long cMB = (bytes / ( 1000000LL / 200LL ) +1) /2;
|
|
|
b7f731 |
snprintf(buf, sizeof(buf), "%ld.%02ldMB",
|
|
|
b7f731 |
- cMB/100, cMB % 100);
|
|
|
b7f731 |
+ cMB/100, cMB % 100);
|
|
|
b7f731 |
} else {
|
|
|
b7f731 |
long cGB = (bytes / (1000000000LL/200LL ) +1) /2;
|
|
|
b7f731 |
snprintf(buf, sizeof(buf), "%ld.%02ldGB",
|
|
|
b7f731 |
- cGB/100 , cGB % 100);
|
|
|
b7f731 |
+ cGB/100, cGB % 100);
|
|
|
b7f731 |
}
|
|
|
b7f731 |
}
|
|
|
b7f731 |
else
|
|
|
b7f731 |
@@ -1093,7 +1091,7 @@ int open_dev_excl(char *devnm)
|
|
|
b7f731 |
long delay = 1000;
|
|
|
b7f731 |
|
|
|
b7f731 |
sprintf(buf, "%d:%d", major(devid), minor(devid));
|
|
|
b7f731 |
- for (i = 0 ; i < 25 ; i++) {
|
|
|
b7f731 |
+ for (i = 0; i < 25; i++) {
|
|
|
b7f731 |
int fd = dev_open(buf, flags|O_EXCL);
|
|
|
b7f731 |
if (fd >= 0)
|
|
|
b7f731 |
return fd;
|
|
|
b7f731 |
@@ -1134,7 +1132,7 @@ void wait_for(char *dev, int fd)
|
|
|
b7f731 |
(stb_want.st_mode & S_IFMT) != S_IFBLK)
|
|
|
b7f731 |
return;
|
|
|
b7f731 |
|
|
|
b7f731 |
- for (i = 0 ; i < 25 ; i++) {
|
|
|
b7f731 |
+ for (i = 0; i < 25; i++) {
|
|
|
b7f731 |
struct stat stb;
|
|
|
b7f731 |
if (stat(dev, &stb) == 0 &&
|
|
|
b7f731 |
(stb.st_mode & S_IFMT) == S_IFBLK &&
|
|
|
b7f731 |
@@ -1205,7 +1203,7 @@ struct supertype *super_by_fd(int fd, char **subarrayp)
|
|
|
b7f731 |
verstr = "-no-metadata-";
|
|
|
b7f731 |
}
|
|
|
b7f731 |
|
|
|
b7f731 |
- for (i = 0; st == NULL && superlist[i] ; i++)
|
|
|
b7f731 |
+ for (i = 0; st == NULL && superlist[i]; i++)
|
|
|
b7f731 |
st = superlist[i]->match_metadata_desc(verstr);
|
|
|
b7f731 |
|
|
|
b7f731 |
sysfs_free(sra);
|
|
|
b7f731 |
@@ -1270,7 +1268,7 @@ struct supertype *guess_super_type(int fd, enum guess_types guess_type)
|
|
|
b7f731 |
st = xcalloc(1, sizeof(*st));
|
|
|
b7f731 |
st->container_devnm[0] = 0;
|
|
|
b7f731 |
|
|
|
b7f731 |
- for (i = 0 ; superlist[i]; i++) {
|
|
|
b7f731 |
+ for (i = 0; superlist[i]; i++) {
|
|
|
b7f731 |
int rv;
|
|
|
b7f731 |
ss = superlist[i];
|
|
|
b7f731 |
if (guess_type == guess_array && ss->add_to_super == NULL)
|
|
|
b7f731 |
--
|
|
|
b7f731 |
2.7.4
|
|
|
b7f731 |
|