Gitweb:
http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=196a5a39...
Commit: 196a5a3920f9b0434fd7066b8954dbfdbc84a0fd
Parent: 7442ec973039b525b3b643679c82516917b93c05
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Thu Apr 2 16:27:35 2015 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Tue Apr 7 19:36:30 2015 +0100
gfs2-utils: Consolidate some "bad constants" strings
Using the same error string here will reduce the number of strings in
the .pot file.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/convert/gfs2_convert.c | 12 ++++++------
gfs2/fsck/initialize.c | 2 +-
gfs2/mkfs/main_grow.c | 2 +-
gfs2/mkfs/main_jadd.c | 10 +++++-----
gfs2/mkfs/main_mkfs.c | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c
index bb4e3a2..aac4853 100644
--- a/gfs2/convert/gfs2_convert.c
+++ b/gfs2/convert/gfs2_convert.c
@@ -1577,7 +1577,7 @@ static int init(struct gfs2_sbd *sbp, struct gfs2_options *opts)
sbp->bsize = sbp->sd_sb.sb_bsize;
sbp->rgtree.osi_node = NULL;
if (compute_constants(sbp)) {
- log_crit(_("Error: Bad constants (1)\n"));
+ log_crit("%s\n", _("Failed to compute file system constants"));
exit(-1);
}
@@ -1599,13 +1599,13 @@ static int init(struct gfs2_sbd *sbp, struct gfs2_options *opts)
brelse(bh);
if (compute_heightsize(sbp->bsize, sbp->sd_heightsize,
&sbp->sd_max_height,
sbp->bsize, sbp->sd_diptrs, sbp->sd_inptrs)) {
- log_crit(_("Error: Bad constants (1)\n"));
+ log_crit("%s\n", _("Failed to compute file system constants"));
exit(-1);
}
if (compute_heightsize(sbp->bsize, sbp->sd_jheightsize,
&sbp->sd_max_jheight,
sbp->sd_jbsize, sbp->sd_diptrs, sbp->sd_inptrs)) {
- log_crit(_("Error: Bad constants (1)\n"));
+ log_crit("%s\n", _("Failed to compute file system constants"));
exit(-1);
}
/* -------------------------------------------------------- */
@@ -1616,13 +1616,13 @@ static int init(struct gfs2_sbd *sbp, struct gfs2_options *opts)
memset(gfs2_heightsize, 0, sizeof(gfs2_heightsize));
if (compute_heightsize(sbp->bsize, gfs2_heightsize, &gfs2_max_height,
sbp->bsize, sbp->sd_diptrs, gfs2_inptrs)) {
- log_crit(_("Error: Bad constants (1)\n"));
+ log_crit("%s\n", _("Failed to compute file system constants"));
exit(-1);
}
memset(gfs2_jheightsize, 0, sizeof(gfs2_jheightsize));
if (compute_heightsize(sbp->bsize, gfs2_jheightsize, &gfs2_max_jheight,
sbp->sd_jbsize, sbp->sd_diptrs, gfs2_inptrs)) {
- log_crit(_("Error: Bad constants (1)\n"));
+ log_crit("%s\n", _("Failed to compute file system constants"));
exit(-1);
}
@@ -2254,7 +2254,7 @@ int main(int argc, char **argv)
/* Now we've got to treat it as a gfs2 file system */
if (compute_constants(&sb2)) {
- log_crit(_("Error: Bad constants (1)\n"));
+ log_crit("%s\n", _("Failed to compute file system constants"));
exit(-1);
}
diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
index c052205..bb9755c 100644
--- a/gfs2/fsck/initialize.c
+++ b/gfs2/fsck/initialize.c
@@ -1301,7 +1301,7 @@ static int fill_super_block(struct gfs2_sbd *sdp)
}
if (compute_constants(sdp)) {
- log_crit(_("Bad constants (1)\n"));
+ log_crit("%s\n", _("Failed to compute file system constants"));
exit(FSCK_ERROR);
}
ret = read_sb(sdp);
diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c
index 1115e5f..cc32585 100644
--- a/gfs2/mkfs/main_grow.c
+++ b/gfs2/mkfs/main_grow.c
@@ -381,7 +381,7 @@ int main(int argc, char *argv[])
sdp->sd_sb.sb_bsize = GFS2_DEFAULT_BSIZE;
sdp->bsize = sdp->sd_sb.sb_bsize;
if (compute_constants(sdp)) {
- perror(_("Bad constants (1)"));
+ log_crit("%s\n", _("Failed to compute file system constants"));
exit(EXIT_FAILURE);
}
if (read_sb(sdp) < 0) {
diff --git a/gfs2/mkfs/main_jadd.c b/gfs2/mkfs/main_jadd.c
index 739d964..de5d9c5 100644
--- a/gfs2/mkfs/main_jadd.c
+++ b/gfs2/mkfs/main_jadd.c
@@ -115,7 +115,7 @@ static void print_usage(const char *prog_name)
const char *option, *param, *desc;
const char *options[] = {
/* Translators: This is a usage string printed with --help.
- <size> and <number> here are to commandline parameters,
+ <size> and <number> here are the commandline parameters,
e.g. gfs2_jadd -j <number> /dev/sda */
"-c", "<size>", _("Size of quota change file, in
megabytes"),
"-D", NULL, _("Enable debugging code"),
@@ -207,7 +207,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd
*sdp, struc
die( _("Unrecognized argument: %s\n"), argv[optind]);
if (opts->debug) {
- printf( _("Command Line Arguments:\n"));
+ printf( _("Command line arguments:\n"));
printf(" qcsize = %u\n", sdp->qcsize);
printf(" jsize = %u\n", sdp->jsize);
printf(" journals = %u\n", sdp->md.journals);
@@ -234,8 +234,8 @@ static void print_results(struct jadd_opts *opts)
return;
printf( _("Filesystem: %s\n"), opts->path);
- printf( _("Old Journals: %u\n"), opts->orig_journals);
- printf( _("New Journals: %u\n"), opts->journals);
+ printf( _("Old journals: %u\n"), opts->orig_journals);
+ printf( _("New journals: %u\n"), opts->journals);
}
static int create_new_inode(struct jadd_opts *opts)
@@ -531,7 +531,7 @@ int main(int argc, char *argv[])
}
if (compute_constants(sdp)) {
- perror(_("Bad constants (1)"));
+ perror(_("Failed to compute file system constants"));
exit(EXIT_FAILURE);
}
find_current_journals(&opts);
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index 2590ec8..0636f0b 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -35,7 +35,7 @@ static void print_usage(const char *prog_name)
const char *option, *param, *desc;
const char *options[] = {
/* Translators: This is a usage string printed with --help.
- <size> and <number> here are to commandline parameters,
+ <size> and <number> here are the commandline parameters,
e.g. mkfs.gfs2 -b <size> -j <number> /dev/sda */
"-b", _("<size>"), _("File system block size, in
bytes"),
"-c", _("<size>"), _("Size of quota change file, in
megabytes"),