aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/blkid/blkid.h4
-rw-r--r--e2fsprogs/blkid/dev.c6
-rw-r--r--e2fsprogs/blkid/probe.c10
-rw-r--r--e2fsprogs/blkid/read.c2
-rw-r--r--e2fsprogs/blkid/tag.c6
-rw-r--r--e2fsprogs/e2fsck.c2
-rw-r--r--e2fsprogs/e2p/ls.c4
-rw-r--r--e2fsprogs/mke2fs.c2
-rw-r--r--e2fsprogs/util.c2
9 files changed, 19 insertions, 19 deletions
diff --git a/e2fsprogs/blkid/blkid.h b/e2fsprogs/blkid/blkid.h
index 54721b221..4fa9f6fdf 100644
--- a/e2fsprogs/blkid/blkid.h
+++ b/e2fsprogs/blkid/blkid.h
@@ -56,7 +56,7 @@ extern int blkid_get_cache(blkid_cache *cache, const char *filename);
extern const char *blkid_dev_devname(blkid_dev dev);
extern blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache);
-extern int blkid_dev_set_search(blkid_dev_iterate iter,
+extern int blkid_dev_set_search(blkid_dev_iterate iter,
char *search_type, char *search_value);
extern int blkid_dev_next(blkid_dev_iterate iterate, blkid_dev *dev);
extern void blkid_dev_iterate_end(blkid_dev_iterate iterate);
@@ -90,7 +90,7 @@ extern blkid_tag_iterate blkid_tag_iterate_begin(blkid_dev dev);
extern int blkid_tag_next(blkid_tag_iterate iterate,
const char **type, const char **value);
extern void blkid_tag_iterate_end(blkid_tag_iterate iterate);
-extern int blkid_dev_has_tag(blkid_dev dev, const char *type,
+extern int blkid_dev_has_tag(blkid_dev dev, const char *type,
const char *value);
extern blkid_dev blkid_find_dev_with_tag(blkid_cache cache,
const char *type,
diff --git a/e2fsprogs/blkid/dev.c b/e2fsprogs/blkid/dev.c
index 6d99504af..c2b756c81 100644
--- a/e2fsprogs/blkid/dev.c
+++ b/e2fsprogs/blkid/dev.c
@@ -76,8 +76,8 @@ void blkid_debug_dump_dev(blkid_dev dev)
list_for_each(p, &dev->bid_tags) {
blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags);
- if (tag)
- printf(" tag: %s=\"%s\"\n", tag->bit_name,
+ if (tag)
+ printf(" tag: %s=\"%s\"\n", tag->bit_name,
tag->bit_val);
else
printf(" tag: NULL\n");
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
case 'm':
blkid_debug_mask = strtoul (optarg, &tmp, 0);
if (*tmp) {
- fprintf(stderr, "Invalid debug mask: %d\n",
+ fprintf(stderr, "Invalid debug mask: %d\n",
optarg);
exit(1);
}
diff --git a/e2fsprogs/blkid/probe.c b/e2fsprogs/blkid/probe.c
index 211569779..a2165efee 100644
--- a/e2fsprogs/blkid/probe.c
+++ b/e2fsprogs/blkid/probe.c
@@ -99,7 +99,7 @@ static void get_ext2_info(blkid_dev dev, unsigned char *buf)
static int probe_ext3(int fd __BLKID_ATTR((unused)),
blkid_cache cache __BLKID_ATTR((unused)),
blkid_dev dev,
- const struct blkid_magic *id __BLKID_ATTR((unused)),
+ const struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct ext2_super_block *es;
@@ -126,7 +126,7 @@ static int probe_ext3(int fd __BLKID_ATTR((unused)),
static int probe_ext2(int fd __BLKID_ATTR((unused)),
blkid_cache cache __BLKID_ATTR((unused)),
blkid_dev dev,
- const struct blkid_magic *id __BLKID_ATTR((unused)),
+ const struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct ext2_super_block *es;
@@ -305,10 +305,10 @@ static int probe_romfs(int fd __BLKID_ATTR((unused)),
return 0;
}
-static int probe_cramfs(int fd __BLKID_ATTR((unused)),
- blkid_cache cache __BLKID_ATTR((unused)),
+static int probe_cramfs(int fd __BLKID_ATTR((unused)),
+ blkid_cache cache __BLKID_ATTR((unused)),
blkid_dev dev,
- const struct blkid_magic *id __BLKID_ATTR((unused)),
+ const struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct cramfs_super_block *csb;
diff --git a/e2fsprogs/blkid/read.c b/e2fsprogs/blkid/read.c
index e954c6d94..624c907f3 100644
--- a/e2fsprogs/blkid/read.c
+++ b/e2fsprogs/blkid/read.c
@@ -432,7 +432,7 @@ static void debug_dump_dev(blkid_dev dev)
list_for_each(p, &dev->bid_tags) {
blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags);
if (tag)
- printf(" tag: %s=\"%s\"\n", tag->bit_name,
+ printf(" tag: %s=\"%s\"\n", tag->bit_name,
tag->bit_val);
else
printf(" tag: NULL\n");
diff --git a/e2fsprogs/blkid/tag.c b/e2fsprogs/blkid/tag.c
index ff10b28e2..09712bab7 100644
--- a/e2fsprogs/blkid/tag.c
+++ b/e2fsprogs/blkid/tag.c
@@ -355,7 +355,7 @@ extern int optind;
void usage(char *prog)
{
fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask] device "
- "[type value]\n",
+ "[type value]\n",
prog);
fprintf(stderr, "\tList all tags for a device and exit\n", prog);
exit(1);
@@ -383,7 +383,7 @@ int main(int argc, char **argv)
case 'm':
blkid_debug_mask = strtoul (optarg, &tmp, 0);
if (*tmp) {
- fprintf(stderr, "Invalid debug mask: %d\n",
+ fprintf(stderr, "Invalid debug mask: %d\n",
optarg);
exit(1);
}
@@ -414,7 +414,7 @@ int main(int argc, char **argv)
if (search_type) {
found = blkid_dev_has_tag(dev, search_type, search_value);
printf("Device %s: (%s, %s) %s\n", blkid_dev_devname(dev),
- search_type, search_value ? search_value : "NULL",
+ search_type, search_value ? search_value : "NULL",
found ? "FOUND" : "NOT FOUND");
return(!found);
}
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index 985f9fd5c..7ffc0d230 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -3661,7 +3661,7 @@ static void e2fsck_pass1(e2fsck_t ctx)
e2fsck_read_inode(ctx, EXT2_RESIZE_INO, inode,
"recreate inode");
inode->i_mtime = time(0);
- e2fsck_write_inode(ctx, EXT2_RESIZE_INO, inode,
+ e2fsck_write_inode(ctx, EXT2_RESIZE_INO, inode,
"recreate inode");
fs->block_map = save_bmap;
ctx->flags &= ~E2F_FLAG_RESIZE_INODE;
diff --git a/e2fsprogs/e2p/ls.c b/e2fsprogs/e2p/ls.c
index e2a1ccb3d..9d29db6af 100644
--- a/e2fsprogs/e2p/ls.c
+++ b/e2fsprogs/e2p/ls.c
@@ -26,14 +26,14 @@ static void print_user(unsigned short uid, FILE *f)
{
struct passwd *pw = getpwuid(uid);
fprintf(f, "%u (user %s)\n", uid,
- (pw == NULL ? "unknown" : pw->pw_name));
+ (pw == NULL ? "unknown" : pw->pw_name));
}
static void print_group(unsigned short gid, FILE *f)
{
struct group *gr = getgrgid(gid);
fprintf(f, "%u (group %s)\n", gid,
- (gr == NULL ? "unknown" : gr->gr_name));
+ (gr == NULL ? "unknown" : gr->gr_name));
}
#define MONTH_INT (86400 * 30)
diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c
index 687f18567..72ce57458 100644
--- a/e2fsprogs/mke2fs.c
+++ b/e2fsprogs/mke2fs.c
@@ -737,7 +737,7 @@ static void parse_extended_opts(struct ext2_super_block *sb_param,
}
if (resize <= sb_param->s_blocks_count) {
bb_error_msg("The resize maximum must be greater "
- "than the filesystem size");
+ "than the filesystem size");
r_usage++;
continue;
}
diff --git a/e2fsprogs/util.c b/e2fsprogs/util.c
index 113ef9c8f..efb128f59 100644
--- a/e2fsprogs/util.c
+++ b/e2fsprogs/util.c
@@ -99,7 +99,7 @@ force_check:
bb_error_msg_and_die("it's not safe to run badblocks!");
}
- if (mount_flags & EXT2_MF_BUSY) {
+ if (mount_flags & EXT2_MF_BUSY) {
bb_error_msg("%s is apparently in use by the system", device);
goto force_check;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 21:18:31 +0000