aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/e2fs_lib.c2
-rw-r--r--e2fsprogs/e2fs_lib.h2
-rw-r--r--e2fsprogs/lsattr.c4
-rw-r--r--e2fsprogs/old_e2fsprogs/e2p/e2p.h2
-rw-r--r--e2fsprogs/old_e2fsprogs/lsattr.c4
5 files changed, 7 insertions, 7 deletions
diff --git a/e2fsprogs/e2fs_lib.c b/e2fsprogs/e2fs_lib.c
index 89e050051..839109e3f 100644
--- a/e2fsprogs/e2fs_lib.c
+++ b/e2fsprogs/e2fs_lib.c
@@ -192,7 +192,7 @@ static const char e2attr_flags_lname[] =
"Top_of_Directory_Hierarchies" "\0"
/* Another trailing NUL is added by compiler */;
-void print_flags(FILE *f, unsigned long flags, unsigned options)
+void print_e2flags(FILE *f, unsigned long flags, unsigned options)
{
const uint32_t *fv;
const char *fn;
diff --git a/e2fsprogs/e2fs_lib.h b/e2fsprogs/e2fs_lib.h
index 40bbd1c83..e21a0f917 100644
--- a/e2fsprogs/e2fs_lib.h
+++ b/e2fsprogs/e2fs_lib.h
@@ -31,7 +31,7 @@ int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_f
/* Must be 1 for compatibility with `int long_format'. */
#define PFOPT_LONG 1
/* Print file attributes on an ext2 file system */
-void print_flags(FILE *f, unsigned long flags, unsigned options);
+void print_e2flags(FILE *f, unsigned long flags, unsigned options);
extern const uint32_t e2attr_flags_value[];
extern const char e2attr_flags_sname[];
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index 13eeb35f5..066af86c7 100644
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -45,10 +45,10 @@ static void list_attributes(const char *name)
if (option_mask32 & OPT_PF_LONG) {
printf("%-28s ", name);
- print_flags(stdout, fsflags, PFOPT_LONG);
+ print_e2flags(stdout, fsflags, PFOPT_LONG);
bb_putchar('\n');
} else {
- print_flags(stdout, fsflags, 0);
+ print_e2flags(stdout, fsflags, 0);
printf(" %s\n", name);
}
diff --git a/e2fsprogs/old_e2fsprogs/e2p/e2p.h b/e2fsprogs/old_e2fsprogs/e2p/e2p.h
index cae28f115..452470047 100644
--- a/e2fsprogs/old_e2fsprogs/e2p/e2p.h
+++ b/e2fsprogs/old_e2fsprogs/e2p/e2p.h
@@ -13,7 +13,7 @@
#define EXT3_FEATURE_INCOMPAT_EXTENTS 0x0040
#endif
-/* `options' for print_flags() */
+/* `options' for print_e2flags() */
#define PFOPT_LONG 1 /* Must be 1 for compatibility with `int long_format'. */
diff --git a/e2fsprogs/old_e2fsprogs/lsattr.c b/e2fsprogs/old_e2fsprogs/lsattr.c
index 277ec7c2c..294bf2f2e 100644
--- a/e2fsprogs/old_e2fsprogs/lsattr.c
+++ b/e2fsprogs/old_e2fsprogs/lsattr.c
@@ -56,10 +56,10 @@ static void list_attributes(const char *name)
if (flags & OPT_PF_LONG) {
printf("%-28s ", name);
- print_flags(stdout, fsflags, PFOPT_LONG);
+ print_e2flags(stdout, fsflags, PFOPT_LONG);
bb_putchar('\n');
} else {
- print_flags(stdout, fsflags, 0);
+ print_e2flags(stdout, fsflags, 0);
printf(" %s\n", name);
}