diff options
| -rw-r--r-- | disk-utils/fdisk-menu.c | 4 | ||||
| -rw-r--r-- | libmount/src/monitor.c | 2 | ||||
| -rw-r--r-- | libmount/src/tab.c | 5 | ||||
| -rw-r--r-- | libsmartcols/src/table_print.c | 3 | ||||
| -rw-r--r-- | login-utils/vipw.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c index 84b8fb733..71958442f 100644 --- a/disk-utils/fdisk-menu.c +++ b/disk-utils/fdisk-menu.c @@ -19,7 +19,7 @@ struct menu_entry { but don't print it in help */ enum fdisk_labeltype label; /* only for this label */ - enum fdisk_labeltype exclude; /* all labels except this */ + int exclude; /* all labels except these */ enum fdisk_labeltype parent; /* for nested PT */ }; @@ -28,7 +28,7 @@ struct menu_entry { struct menu { enum fdisk_labeltype label; /* only for this label */ - enum fdisk_labeltype exclude; /* all labels except this */ + int exclude; /* all labels except these */ unsigned int nonested : 1; /* don't make this menu active in nested PT */ diff --git a/libmount/src/monitor.c b/libmount/src/monitor.c index a71f2f503..9f9e2ba81 100644 --- a/libmount/src/monitor.c +++ b/libmount/src/monitor.c @@ -345,7 +345,7 @@ static int userspace_event_verify(struct libmnt_monitor *mn, } } while (1); - DBG(MONITOR, ul_debugobj(mn, status == 1 ? " success" : " nothing")); + DBG(MONITOR, ul_debugobj(mn, "%s", status == 1 ? " success" : " nothing")); return status; } diff --git a/libmount/src/tab.c b/libmount/src/tab.c index 057004436..a7a1b6b1e 100644 --- a/libmount/src/tab.c +++ b/libmount/src/tab.c @@ -1808,7 +1808,7 @@ static int test_is_mounted(struct libmnt_test *ts, int argc, char *argv[]) struct libmnt_fs *fs; struct libmnt_iter *itr = NULL; struct libmnt_cache *mpc = NULL; - int rc, writable = 0; + int writable = 0; const char *path = NULL; if (mnt_has_regular_mtab(&path, &writable) == 1 && writable == 0) @@ -1846,12 +1846,11 @@ static int test_is_mounted(struct libmnt_test *ts, int argc, char *argv[]) mnt_fs_get_target(fs)); } - rc = 0; done: mnt_unref_table(tb); mnt_unref_table(fstab); mnt_free_iter(itr); - return rc; + return 0; } /* returns 0 if @a and @b targets are the same */ diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c index 510386ec8..d86b06841 100644 --- a/libsmartcols/src/table_print.c +++ b/libsmartcols/src/table_print.c @@ -702,7 +702,8 @@ static int print_line(struct libscols_table *tb, static int print_title(struct libscols_table *tb) { - int rc, align; + int rc; + mbs_align_t align; size_t len = 0, width; char *title = NULL, *buf = NULL; diff --git a/login-utils/vipw.c b/login-utils/vipw.c index bb4a8baac..066fee005 100644 --- a/login-utils/vipw.c +++ b/login-utils/vipw.c @@ -343,7 +343,7 @@ int main(int argc, char *argv[]) if (access(orig_file, F_OK) == 0) { char response[80]; - printf((program == VIGR) + printf("%s", (program == VIGR) ? _("You are using shadow groups on this system.\n") : _("You are using shadow passwords on this system.\n")); /* TRANSLATORS: this program uses for y and n rpmatch(3), |