summaryrefslogtreecommitdiff
path: root/lib/e2p
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2008-08-27 23:07:54 -0400
committerTheodore Ts'o <tytso@mit.edu>2008-08-27 23:07:54 -0400
commitefc6f628e15de95bcd13e4f0ee223cb42115d520 (patch)
tree7f486b4bc1a4c8fc47f236f1e95e33feee745f7c /lib/e2p
parent4690e621acd4579dae60b6f55f58284ee805e86d (diff)
downloade2fsprogs-efc6f628e15de95bcd13e4f0ee223cb42115d520.tar.gz
Remove trailing whitespace for the entire source tree
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'lib/e2p')
-rw-r--r--lib/e2p/e2p.h2
-rw-r--r--lib/e2p/feature.c16
-rw-r--r--lib/e2p/fsetflags.c4
-rw-r--r--lib/e2p/getflags.c2
-rw-r--r--lib/e2p/getversion.c2
-rw-r--r--lib/e2p/hashstr.c6
-rw-r--r--lib/e2p/iod.c2
-rw-r--r--lib/e2p/ls.c8
-rw-r--r--lib/e2p/mntopts.c6
-rw-r--r--lib/e2p/ostype.c8
-rw-r--r--lib/e2p/parse_num.c20
-rw-r--r--lib/e2p/percent.c6
-rw-r--r--lib/e2p/pf.c2
-rw-r--r--lib/e2p/setflags.c4
-rw-r--r--lib/e2p/uuid.c2
15 files changed, 45 insertions, 45 deletions
diff --git a/lib/e2p/e2p.h b/lib/e2p/e2p.h
index ad607f68..98c97db4 100644
--- a/lib/e2p/e2p.h
+++ b/lib/e2p/e2p.h
@@ -40,7 +40,7 @@ const char *e2p_feature2string(int compat, unsigned int mask);
int e2p_string2feature(char *string, int *compat, unsigned int *mask);
int e2p_edit_feature(const char *str, __u32 *compat_array, __u32 *ok_array);
int e2p_edit_feature2(const char *str, __u32 *compat_array, __u32 *ok_array,
- __u32 *clear_ok_array, int *type_err,
+ __u32 *clear_ok_array, int *type_err,
unsigned int *mask_err);
int e2p_is_null_uuid(void *uu);
diff --git a/lib/e2p/feature.c b/lib/e2p/feature.c
index e3a72047..1da3c7de 100644
--- a/lib/e2p/feature.c
+++ b/lib/e2p/feature.c
@@ -1,11 +1,11 @@
/*
* feature.c --- convert between features and strings
- *
+ *
* Copyright (C) 1999 Theodore Ts'o <tytso@mit.edu>
- *
+ *
* This file can be redistributed under the terms of the GNU Library General
* Public License
- *
+ *
*/
#include <stdio.h>
@@ -251,11 +251,11 @@ static char *skip_over_word(char *cp)
/*
* Edit a feature set array as requested by the user. The ok_array,
* if set, allows the application to limit what features the user is
- * allowed to set or clear using this function. If clear_ok_array is set,
+ * allowed to set or clear using this function. If clear_ok_array is set,
* then use it tell whether or not it is OK to clear a filesystem feature.
*/
int e2p_edit_feature2(const char *str, __u32 *compat_array, __u32 *ok_array,
- __u32 *clear_ok_array, int *type_err,
+ __u32 *clear_ok_array, int *type_err,
unsigned int *mask_err)
{
char *cp, *buf, *next;
@@ -280,7 +280,7 @@ int e2p_edit_feature2(const char *str, __u32 *compat_array, __u32 *ok_array,
neg = 0;
cp = skip_over_blanks(cp);
next = skip_over_word(cp);
-
+
if (*next == 0)
next = 0;
else
@@ -307,11 +307,11 @@ int e2p_edit_feature2(const char *str, __u32 *compat_array, __u32 *ok_array,
break;
}
if (neg) {
- if (clear_ok_array &&
+ if (clear_ok_array &&
!(clear_ok_array[compat_type] & mask)) {
rc = 1;
if (type_err)
- *type_err = (compat_type |
+ *type_err = (compat_type |
E2P_FEATURE_NEGATE_FLAG);
if (mask_err)
*mask_err = mask;
diff --git a/lib/e2p/fsetflags.c b/lib/e2p/fsetflags.c
index 3a053240..62189c9b 100644
--- a/lib/e2p/fsetflags.c
+++ b/lib/e2p/fsetflags.c
@@ -32,8 +32,8 @@
#include "e2p.h"
-/*
- * Deal with lame glibc's that define this function without actually
+/*
+ * Deal with lame glibc's that define this function without actually
* implementing it. Can you say "attractive nuisance", boys and girls?
* I knew you could!
*/
diff --git a/lib/e2p/getflags.c b/lib/e2p/getflags.c
index acf7a122..7b35246d 100644
--- a/lib/e2p/getflags.c
+++ b/lib/e2p/getflags.c
@@ -51,7 +51,7 @@ int getflags (int fd, unsigned long * flags)
#else
#if HAVE_EXT2_IOCTLS
int r, f;
-
+
if (!fstat(fd, &buf) &&
!S_ISREG(buf.st_mode) && !S_ISDIR(buf.st_mode))
goto notsupp;
diff --git a/lib/e2p/getversion.c b/lib/e2p/getversion.c
index 38b7d0fb..47c588fd 100644
--- a/lib/e2p/getversion.c
+++ b/lib/e2p/getversion.c
@@ -25,7 +25,7 @@ int getversion (int fd, unsigned long * version)
{
#if HAVE_EXT2_IOCTLS
int r, ver;
-
+
r = ioctl (fd, EXT2_IOC_GETVERSION, &ver);
*version = ver;
return 0;
diff --git a/lib/e2p/hashstr.c b/lib/e2p/hashstr.c
index b257eb26..ece4d058 100644
--- a/lib/e2p/hashstr.c
+++ b/lib/e2p/hashstr.c
@@ -1,11 +1,11 @@
/*
* feature.c --- convert between features and strings
- *
+ *
* Copyright (C) 1999 Theodore Ts'o <tytso@mit.edu>
- *
+ *
* This file can be redistributed under the terms of the GNU Library General
* Public License
- *
+ *
*/
#include <stdio.h>
diff --git a/lib/e2p/iod.c b/lib/e2p/iod.c
index 84c97094..2c675b9d 100644
--- a/lib/e2p/iod.c
+++ b/lib/e2p/iod.c
@@ -29,7 +29,7 @@ int iterate_on_dir (const char * dir_name,
struct dirent *de, *dep;
int max_len = -1, len, ret = 0;
-#if HAVE_PATHCONF && defined(_PC_NAME_MAX)
+#if HAVE_PATHCONF && defined(_PC_NAME_MAX)
max_len = pathconf(dir_name, _PC_NAME_MAX);
#endif
if (max_len == -1) {
diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c
index c211dce7..6d2ce70a 100644
--- a/lib/e2p/ls.c
+++ b/lib/e2p/ls.c
@@ -6,7 +6,7 @@
* Universite Pierre et Marie Curie (Paris VI)
*
* Copyright (C) 1995, 1996, 1997 Theodore Ts'o <tytso@mit.edu>
- *
+ *
* This file can be redistributed under the terms of the GNU Library General
* Public License
*/
@@ -227,7 +227,7 @@ void list_super2(struct ext2_super_block * sb, FILE *f)
fprintf(f, "Block size: %u\n", EXT2_BLOCK_SIZE(sb));
fprintf(f, "Fragment size: %u\n", EXT2_FRAG_SIZE(sb));
if (sb->s_reserved_gdt_blocks)
- fprintf(f, "Reserved GDT blocks: %u\n",
+ fprintf(f, "Reserved GDT blocks: %u\n",
sb->s_reserved_gdt_blocks);
fprintf(f, "Blocks per group: %u\n", sb->s_blocks_per_group);
fprintf(f, "Fragments per group: %u\n", sb->s_frags_per_group);
@@ -275,10 +275,10 @@ void list_super2(struct ext2_super_block * sb, FILE *f)
fprintf(f, "First inode: %d\n", sb->s_first_ino);
fprintf(f, "Inode size: %d\n", sb->s_inode_size);
if (sb->s_min_extra_isize)
- fprintf(f, "Required extra isize: %d\n",
+ fprintf(f, "Required extra isize: %d\n",
sb->s_min_extra_isize);
if (sb->s_want_extra_isize)
- fprintf(f, "Desired extra isize: %d\n",
+ fprintf(f, "Desired extra isize: %d\n",
sb->s_want_extra_isize);
}
if (!e2p_is_null_uuid(sb->s_journal_uuid))
diff --git a/lib/e2p/mntopts.c b/lib/e2p/mntopts.c
index 4e50e9f9..51e349dc 100644
--- a/lib/e2p/mntopts.c
+++ b/lib/e2p/mntopts.c
@@ -1,11 +1,11 @@
/*
* mountopts.c --- convert between default mount options and strings
- *
+ *
* Copyright (C) 2002 Theodore Ts'o <tytso@mit.edu>
- *
+ *
* This file can be redistributed under the terms of the GNU Library General
* Public License
- *
+ *
*/
#include <stdio.h>
diff --git a/lib/e2p/ostype.c b/lib/e2p/ostype.c
index 3cd6257c..c477535a 100644
--- a/lib/e2p/ostype.c
+++ b/lib/e2p/ostype.c
@@ -12,10 +12,10 @@
#include <stdlib.h>
static const char *os_tab[] =
- { "Linux",
- "Hurd",
- "Masix",
- "FreeBSD",
+ { "Linux",
+ "Hurd",
+ "Masix",
+ "FreeBSD",
"Lites",
0 };
diff --git a/lib/e2p/parse_num.c b/lib/e2p/parse_num.c
index 7e9ee71a..7f817d60 100644
--- a/lib/e2p/parse_num.c
+++ b/lib/e2p/parse_num.c
@@ -1,8 +1,8 @@
/*
- * parse_num.c - Parse the number of blocks
+ * parse_num.c - Parse the number of blocks
*
* Copyright (C) 2004,2005 Theodore Ts'o <tytso@mit.edu>
- *
+ *
* This file can be redistributed under the terms of the GNU Library General
* Public License
*/
@@ -18,25 +18,25 @@ unsigned long parse_num_blocks(const char *arg, int log_block_size)
num = strtoull(arg, &p, 0);
- if (p[0] && p[1])
+ if (p[0] && p[1])
return 0;
switch (*p) { /* Using fall-through logic */
- case 'T': case 't':
+ case 'T': case 't':
num <<= 10;
- case 'G': case 'g':
+ case 'G': case 'g':
num <<= 10;
- case 'M': case 'm':
+ case 'M': case 'm':
num <<= 10;
- case 'K': case 'k':
- num >>= log_block_size;
+ case 'K': case 'k':
+ num >>= log_block_size;
break;
- case 's':
+ case 's':
num >>= (1+log_block_size);
break;
case '\0':
break;
- default:
+ default:
return 0;
}
return num;
diff --git a/lib/e2p/percent.c b/lib/e2p/percent.c
index b8c936df..94d71e5c 100644
--- a/lib/e2p/percent.c
+++ b/lib/e2p/percent.c
@@ -2,7 +2,7 @@
* percent.c - Take percentage of a number
*
* Copyright (C) 2006 Theodore Ts'o <tytso@mit.edu>
- *
+ *
* This file can be redistributed under the terms of the GNU Library General
* Public License
*/
@@ -23,7 +23,7 @@ unsigned int e2p_percent(int percent, unsigned int base)
return 0;
if (100 % percent == 0)
return base / (100 / percent);
- if (mask & base)
+ if (mask & base)
return (base / 100) * percent;
return base * percent / 100;
}
@@ -49,7 +49,7 @@ main(int argc, char **argv)
fprintf(stderr, "Bad percent: %s\n", argv[1]);
exit(1);
}
-
+
base = strtoul(argv[2], &p, 0);
if (p[0] && p[1]) {
fprintf(stderr, "Bad base: %s\n", argv[2]);
diff --git a/lib/e2p/pf.c b/lib/e2p/pf.c
index 05a961a9..078b82c7 100644
--- a/lib/e2p/pf.c
+++ b/lib/e2p/pf.c
@@ -41,7 +41,7 @@ static struct flags_name flags_array[] = {
{ EXT2_ECOMPR_FL, "E", "Compression_Error" },
#endif
{ EXT3_JOURNAL_DATA_FL, "j", "Journaled_Data" },
- { EXT2_INDEX_FL, "I", "Indexed_direcctory" },
+ { EXT2_INDEX_FL, "I", "Indexed_direcctory" },
{ EXT2_NOTAIL_FL, "t", "No_Tailmerging" },
{ EXT2_TOPDIR_FL, "T", "Top_of_Directory_Hierarchies" },
{ EXT4_EXTENTS_FL, "e", "Extents" },
diff --git a/lib/e2p/setflags.c b/lib/e2p/setflags.c
index 47c52a7a..908f0f19 100644
--- a/lib/e2p/setflags.c
+++ b/lib/e2p/setflags.c
@@ -25,8 +25,8 @@
#include "e2p.h"
-/*
- * Deal with lame glibc's that define this function without actually
+/*
+ * Deal with lame glibc's that define this function without actually
* implementing it. Can you say "attractive nuisance", boys and girls?
* I knew you could!
*/
diff --git a/lib/e2p/uuid.c b/lib/e2p/uuid.c
index 60d42bae..0bf8f829 100644
--- a/lib/e2p/uuid.c
+++ b/lib/e2p/uuid.c
@@ -42,7 +42,7 @@ static void e2p_unpack_uuid(void *in, struct uuid *uu)
tmp = *ptr++;
tmp = (tmp << 8) | *ptr++;
uu->time_mid = tmp;
-
+
tmp = *ptr++;
tmp = (tmp << 8) | *ptr++;
uu->time_hi_and_version = tmp;