Skip to contentSkip to conversation

Apply gettext translation to more strings.

PATCH In review Arkadiusz Miśkiewicz 2 participants 2 messages Jan 31, 2009 – Feb 1, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Apply gettext translation to more strings.

---
 db/addr.c                  |   18 +-
 db/agf.c                   |   10 +-
 db/agfl.c                  |   10 +-
 db/agi.c                   |   10 +-
 db/attrset.c               |   32 ++--
 db/block.c                 |   54 ++--
 db/bmap.c                  |   18 +-
 db/check.c                 |  644 ++++++++++++++++++++++----------------------
 db/command.c               |   10 +-
 db/convert.c               |   14 +-
 db/debug.c                 |    6 +-
 db/dquot.c                 |   16 +-
 db/echo.c                  |    4 +-
 db/faddr.c                 |   46 ++--
 db/flist.c                 |   36 ++--
 db/fprint.c                |    2 +-
 db/frag.c                  |   16 +-
 db/freesp.c                |   14 +-
 db/hash.c                  |    8 +-
 db/help.c                  |   10 +-
 db/init.c                  |    6 +-
 db/inode.c                 |    8 +-
 db/input.c                 |    6 +-
 db/io.c                    |   88 +++---
 db/malloc.c                |    2 +-
 db/metadump.c              |    8 +-
 db/output.c                |   16 +-
 db/print.c                 |   14 +-
 db/quit.c                  |    2 +-
 db/sb.c                    |  130 +++++-----
 db/type.c                  |   14 +-
 db/write.c                 |   44 ++--
 logprint/log_copy.c        |   10 +-
 logprint/log_dump.c        |   12 +-
 logprint/log_misc.c        |  222 ++++++++--------
 logprint/log_print_all.c   |  104 ++++----
 logprint/log_print_trans.c |   10 +-
 logprint/logprint.c        |   28 ++-
 repair/avl.c               |   14 +-
 repair/avl64.c             |   14 +-
 repair/dinode.c            |    2 +-
 repair/init.c              |    4 +-
 42 files changed, 872 insertions(+), 864 deletions(-)
db/addr.c +9 -9
index 35b066c..f74dd62 100644
@@ -32,13 +32,13 @@ static int addr_f(int argc, char **argv);
 static void addr_help(void);
 
 static const cmdinfo_t addr_cmd =
-	{ "addr", "a", addr_f, 0, 1, 1, "[field-expression]",
-	  "set current address", addr_help };
+	{ "addr", "a", addr_f, 0, 1, 1, N_("[field-expression]"),
+	  N_("set current address"), addr_help };
 
 static void
 addr_help(void)
 {
-	dbprintf(
+	dbprintf(_(
 "\n"
 " 'addr' uses the given field to set the filesystem address and type\n"
 "\n"
@@ -48,7 +48,7 @@ addr_help(void)
 " a rootino - set the type to inode and set position to the root inode\n"
 " a u.bmx[0].startblock (for inode with blockmap)\n"
 "\n"
-);
+));
 
 }
 
@@ -69,7 +69,7 @@ addr_f(
 		return 0;
 	}
 	if (cur_typ == NULL) {
-		dbprintf("no current type\n");
+		dbprintf(_("no current type\n"));
 		return 0;
 	}
 	fld = cur_typ->fields;
@@ -79,7 +79,7 @@ addr_f(
 		fld = fa->subfld;
 	}
 	if (fld == NULL) {
-		dbprintf("no fields for type %s\n", cur_typ->name);
+		dbprintf(_("no fields for type %s\n"), cur_typ->name);
 		return 0;
 	}
 	fl = flist_scan(argv[1]);
@@ -92,7 +92,7 @@ addr_f(
 	flist_print(fl);
 	for (tfl = fl; tfl->child != NULL; tfl = tfl->child) {
 		if ((tfl->flags & FL_OKLOW) && tfl->low < tfl->high) {
-			dbprintf("array not allowed for addr command\n");
+			dbprintf(_("array not allowed for addr command\n"));
 			flist_free(fl);
 			return 0;
 		}
@@ -102,14 +102,14 @@ addr_f(
 	if (next == TYP_INODATA)
 		next = inode_next_type();
 	if (next == TYP_NONE) {
-		dbprintf("no next type for field %s\n", fld->name);
+		dbprintf(_("no next type for field %s\n"), fld->name);
 		return 0;
 	}
 	fa = &ftattrtab[fld->ftyp];
 	ASSERT(fa->ftyp == fld->ftyp);
 	adf = fa->adfunc;
 	if (adf == NULL) {
-		dbprintf("no addr function for field %s (type %s)\n",
+		dbprintf(_("no addr function for field %s (type %s)\n"),
 			fld->name, fa->name);
 		return 0;
 	}
db/agf.c +5 -5
index 3e4989d..668637a 100644
@@ -32,8 +32,8 @@ static int agf_f(int argc, char **argv);
 static void agf_help(void);
 
 static const cmdinfo_t agf_cmd =
-	{ "agf", NULL, agf_f, 0, 1, 1, "[agno]",
-	  "set address to agf header", agf_help };
+	{ "agf", NULL, agf_f, 0, 1, 1, N_("[agno]"),
+	  N_("set address to agf header"), agf_help };
 
 const field_t	agf_hfld[] = {
 	{ "", FLDT_AGF, OI(0), C1, 0, TYP_NONE },
@@ -75,7 +75,7 @@ const field_t	agf_flds[] = {
 static void
 agf_help(void)
 {
-	dbprintf(
+	dbprintf(_(
 "\n"
 " set allocation group free block list\n"
 "\n"
@@ -87,7 +87,7 @@ agf_help(void)
 " contains the root of two different freespace btrees:\n"
 " The 'cnt' btree keeps track freespace indexed on section size.\n"
 " The 'bno' btree tracks sections of freespace indexed on block number.\n"
-);
+));
 }
 
 static int
@@ -101,7 +101,7 @@ agf_f(
 	if (argc > 1) {
 		agno = (xfs_agnumber_t)strtoul(argv[1], &p, 0);
 		if (*p != '\0' || agno >= mp->m_sb.sb_agcount) {
-			dbprintf("bad allocation group number %s\n", argv[1]);
+			dbprintf(_("bad allocation group number %s\n"), argv[1]);
 			return 0;
 		}
 		cur_agno = agno;
db/agfl.c +5 -5
index 1e793be..72dca23 100644
@@ -33,8 +33,8 @@ static int agfl_f(int argc, char **argv);
 static void agfl_help(void);
 
 static const cmdinfo_t agfl_cmd =
-	{ "agfl", NULL, agfl_f, 0, 1, 1, "[agno]",
-	  "set address to agfl block", agfl_help };
+	{ "agfl", NULL, agfl_f, 0, 1, 1, N_("[agno]"),
+	  N_("set address to agfl block"), agfl_help };
 
 const field_t	agfl_hfld[] = { {
 	"", FLDT_AGFL, OI(0), C1, 0, TYP_NONE, },
@@ -59,7 +59,7 @@ agfl_bno_size(
 static void
 agfl_help(void)
 {
-	dbprintf(
+	dbprintf(_(
 "\n"
 " set allocation group freelist\n"
 "\n"
@@ -72,7 +72,7 @@ agfl_help(void)
 " for each allocation group.  This acts as a reserved pool of space\n"
 " separate from the general filesystem freespace (not used for user data).\n"
 "\n"
-);
+));
 
 }
 
@@ -87,7 +87,7 @@ agfl_f(
 	if (argc > 1) {
 		agno = (xfs_agnumber_t)strtoul(argv[1], &p, 0);
 		if (*p != '\0' || agno >= mp->m_sb.sb_agcount) {
-			dbprintf("bad allocation group number %s\n", argv[1]);
+			dbprintf(_("bad allocation group number %s\n"), argv[1]);
 			return 0;
 		}
 		cur_agno = agno;
db/agi.c +5 -5
index 5486ffa..02d5d30 100644
@@ -32,8 +32,8 @@ static int agi_f(int argc, char **argv);
 static void agi_help(void);
 
 static const cmdinfo_t agi_cmd =
-	{ "agi", NULL, agi_f, 0, 1, 1, "[agno]",
-	  "set address to agi header", agi_help };
+	{ "agi", NULL, agi_f, 0, 1, 1, N_("[agno]"),
+	  N_("set address to agi header"), agi_help };
 
 const field_t	agi_hfld[] = {
 	{ "", FLDT_AGI, OI(0), C1, 0, TYP_NONE },
@@ -60,7 +60,7 @@ const field_t	agi_flds[] = {
 static void
 agi_help(void)
 {
-	dbprintf(
+	dbprintf(_(
 "\n"
 " set allocation group inode btree\n"
 "\n"
@@ -72,7 +72,7 @@ agi_help(void)
 " the agi inode btree tracks all used/free inodes in the allocation group.\n"
 " Inodes are allocated in 16k 'chunks', each btree entry tracks a 'chunk'.\n"
 "\n"
-);
+));
 }
 
 static int
@@ -86,7 +86,7 @@ agi_f(
 	if (argc > 1) {
 		agno = (xfs_agnumber_t)strtoul(argv[1], &p, 0);
 		if (*p != '\0' || agno >= mp->m_sb.sb_agcount) {
-			dbprintf("bad allocation group number %s\n", argv[1]);
+			dbprintf(_("bad allocation group number %s\n"), argv[1]);
 			return 0;
 		}
 		cur_agno = agno;
db/attrset.c +16 -16
index 1936a5c..35fea11 100644
@@ -35,17 +35,17 @@ static void		attrset_help(void);
 
 static const cmdinfo_t	attr_set_cmd =
 	{ "attr_set", "aset", attr_set_f, 1, -1, 0,
-	  "[-r|-s|-p|-u] [-n] [-R|-C] [-v n] name",
-	  "set the named attribute on the current inode", attrset_help };
+	  N_("[-r|-s|-p|-u] [-n] [-R|-C] [-v n] name"),
+	  N_("set the named attribute on the current inode"), attrset_help };
 static const cmdinfo_t	attr_remove_cmd =
 	{ "attr_remove", "aremove", attr_remove_f, 1, -1, 0,
-	  "[-r|-s|-p|-u] [-n] name",
-	  "remove the named attribute from the current inode", attrset_help };
+	  N_("[-r|-s|-p|-u] [-n] name"),
+	  N_("remove the named attribute from the current inode"), attrset_help };
 
 static void
 attrset_help(void)
 {
-	dbprintf(
+	dbprintf(_(
 "\n"
 " The 'attr_set' and 'attr_remove' commands provide interfaces for debugging\n"
 " the extended attribute allocation and removal code.\n"
@@ -60,7 +60,7 @@ attrset_help(void)
 "  -C -- 'create'    - create attribute, fail if it already exists\n"
 "  -R -- 'replace'   - replace attribute, fail if it does not exist\n"
 " The backward compatibility mode 'noattr2' can be emulated (-n) also.\n"
-"\n");
+"\n"));
 }
 
 void
@@ -83,11 +83,11 @@ attr_set_f(
 	int		c, namelen, valuelen = 0, flags = 0;
 
 	if (cur_typ == NULL) {
-		dbprintf("no current type\n");
+		dbprintf(_("no current type\n"));
 		return 0;
 	}
 	if (cur_typ->typnm != TYP_INODE) {
-		dbprintf("current type is not inode\n");
+		dbprintf(_("current type is not inode\n"));
 		return 0;
 	}
 
@@ -122,19 +122,19 @@ attr_set_f(
 		case 'v':
 			valuelen = (int)strtol(optarg, &sp, 0);
 			if (*sp != '\0' || valuelen < 0 || valuelen > 64*1024) {
-				dbprintf("bad attr_set valuelen %s\n", optarg);
+				dbprintf(_("bad attr_set valuelen %s\n"), optarg);
 				return 0;
 			}
 			break;
 
 		default:
-			dbprintf("bad option for attr_set command\n");
+			dbprintf(_("bad option for attr_set command\n"));
 			return 0;
 		}
 	}
 
 	if (optind != argc - 1) {
-		dbprintf("too few options for attr_set (no name given)\n");
+		dbprintf(_("too few options for attr_set (no name given)\n"));
 		return 0;
 	}
 
@@ -144,7 +144,7 @@ attr_set_f(
 	if (valuelen) {
 		value = (char *)memalign(getpagesize(), valuelen);
 		if (!value) {
-			dbprintf("cannot allocate buffer (%d)\n", valuelen);
+			dbprintf(_("cannot allocate buffer (%d)\n"), valuelen);
 			goto out;
 		}
 		memset(value, 0xfeedface, valuelen);
@@ -186,11 +186,11 @@ attr_remove_f(
 	int		c, namelen, flags = 0;
 
 	if (cur_typ == NULL) {
-		dbprintf("no current type\n");
+		dbprintf(_("no current type\n"));
 		return 0;
 	}
 	if (cur_typ->typnm != TYP_INODE) {
-		dbprintf("current type is not inode\n");
+		dbprintf(_("current type is not inode\n"));
 		return 0;
 	}
 
@@ -214,13 +214,13 @@ attr_remove_f(
 			break;
 
 		default:
-			dbprintf("bad option for attr_remove command\n");
+			dbprintf(_("bad option for attr_remove command\n"));
 			return 0;
 		}
 	}
 
 	if (optind != argc - 1) {
-		dbprintf("too few options for attr_remove (no name given)\n");
+		dbprintf(_("too few options for attr_remove (no name given)\n"));
 		return 0;
 	}
 
db/block.c +27 -27

166 lines not on this page · raw message

db/bmap.c +9 -9
index ef06b30..5abad68 100644
@@ -36,8 +36,8 @@ static xfs_fsblock_t	select_child(xfs_dfiloff_t off, xfs_bmbt_key_t *kp,
 				     xfs_bmbt_ptr_t *pp, int nrecs);
 
 static const cmdinfo_t	bmap_cmd =
-	{ "bmap", NULL, bmap_f, 0, 3, 0, "[-ad] [block [len]]",
-	  "show block map for current file", NULL };
+	{ "bmap", NULL, bmap_f, 0, 3, 0, N_("[-ad] [block [len]]"),
+	  N_("show block map for current file"), NULL };
 
 void
 bmap(
@@ -150,7 +150,7 @@ bmap_f(
 	int		whichfork;
 
 	if (iocur_top->ino == NULLFSINO) {
-		dbprintf("no current inode\n");
+		dbprintf(_("no current inode\n"));
 		return 0;
 	}
 	optind = 0;
@@ -163,7 +163,7 @@ bmap_f(
 			dfork = 1;
 			break;
 		default:
-			dbprintf("bad option for bmap command\n");
+			dbprintf(_("bad option for bmap command\n"));
 			return 0;
 		}
 	}
@@ -180,7 +180,7 @@ bmap_f(
 	if (optind < argc) {
 		co = (xfs_dfiloff_t)strtoull(argv[optind], &p, 0);
 		if (*p != '\0') {
-			dbprintf("bad block number for bmap %s\n",
+			dbprintf(_("bad block number for bmap %s\n"),
 				argv[optind]);
 			return 0;
 		}
@@ -188,7 +188,7 @@ bmap_f(
 		if (optind < argc) {
 			len = (xfs_dfilblks_t)strtoull(argv[optind], &p, 0);
 			if (*p != '\0') {
-				dbprintf("bad len for bmap %s\n", argv[optind]);
+				dbprintf(_("bad len for bmap %s\n"), argv[optind]);
 				return 0;
 			}
 			eo = co + len - 1;
@@ -211,9 +211,9 @@ bmap_f(
 			bmap(co, eo - co + 1, whichfork, &nex, &be);
 			if (nex == 0)
 				break;
-			dbprintf("%s offset %lld startblock %llu (%u/%u) count "
-				 "%llu flag %u\n",
-				whichfork == XFS_DATA_FORK ? "data" : "attr",
+			dbprintf(_("%s offset %lld startblock %llu (%u/%u) count "
+				 "%llu flag %u\n"),
+				whichfork == XFS_DATA_FORK ? _("data") : _("attr"),
 				be.startoff, be.startblock,
 				XFS_FSB_TO_AGNO(mp, be.startblock),
 				XFS_FSB_TO_AGBNO(mp, be.startblock),
db/check.c +322 -322

1,863 lines not on this page · raw message

db/command.c +5 -5
index 442fe25..b7e3165 100644
@@ -79,18 +79,18 @@ command(
 	cmd = argv[0];
 	ct = find_command(cmd);
 	if (ct == NULL) {
-		dbprintf("command %s not found\n", cmd);
+		dbprintf(_("command %s not found\n"), cmd);
 		return 0;
 	}
 	if (argc-1 < ct->argmin || (ct->argmax != -1 && argc-1 > ct->argmax)) {
-		dbprintf("bad argument count %d to %s, expected ", argc-1, cmd);
+		dbprintf(_("bad argument count %d to %s, expected "), argc-1, cmd);
 		if (ct->argmax == -1)
-			dbprintf("at least %d", ct->argmin);
+			dbprintf(_("at least %d"), ct->argmin);
 		else if (ct->argmin == ct->argmax)
 			dbprintf("%d", ct->argmin);
 		else
-			dbprintf("between %d and %d", ct->argmin, ct->argmax);
-		dbprintf(" arguments\n");
+			dbprintf(_("between %d and %d"), ct->argmin, ct->argmax);
+		dbprintf(_(" arguments\n"));
 		return 0;
 	}
 	platform_getoptreset();
db/convert.c +7 -7
index 689eb0d..070ac1a 100644
@@ -168,27 +168,27 @@ convert_f(int argc, char **argv)
 	argv++;
 
 	if ((argc % 2) != 1) {
-		dbprintf("bad argument count %d to convert, expected 3,5,7,9 "
-			 "arguments\n", argc);
+		dbprintf(_("bad argument count %d to convert, expected 3,5,7,9 "
+			 "arguments\n"), argc);
 		return 0;
 	}
 	if ((wtype = lookupcty(argv[argc - 1])) == CT_NONE) {
-		dbprintf("unknown conversion type %s\n", argv[argc - 1]);
+		dbprintf(_("unknown conversion type %s\n"), argv[argc - 1]);
 		return 0;
 	}
 
 	for (i = mask = conmask = 0; i < (argc - 1) / 2; i++) {
 		c = lookupcty(argv[i * 2]);
 		if (c == CT_NONE) {
-			dbprintf("unknown conversion type %s\n", argv[i * 2]);
+			dbprintf(_("unknown conversion type %s\n"), argv[i * 2]);
 			return 0;
 		}
 		if (c == wtype) {
-			dbprintf("result type same as argument\n");
+			dbprintf(_("result type same as argument\n"));
 			return 0;
 		}
 		if (conmask & (1 << c)) {
-			dbprintf("conflicting conversion type %s\n",
+			dbprintf(_("conflicting conversion type %s\n"),
 				argv[i * 2]);
 			return 0;
 		}
@@ -267,7 +267,7 @@ getvalue(char *s, ctype_t ctype, cval_t *val)
 
 	v = strtoull(s, &p, 0);
 	if (*p != '\0') {
-		dbprintf("%s is not a number\n", s);
+		dbprintf(_("%s is not a number\n"), s);
 		return 0;
 	}
 	switch (ctype) {
db/debug.c +3 -3
index aacc302..07a2482 100644
@@ -24,8 +24,8 @@
 static int	debug_f(int argc, char **argv);
 
 static const cmdinfo_t	debug_cmd =
-	{ "debug", NULL, debug_f, 0, 1, 0, "[flagbits]",
-	  "set debug option bits", NULL };
+	{ "debug", NULL, debug_f, 0, 1, 0, N_("[flagbits]"),
+	  N_("set debug option bits"), NULL };
 
 long	debug_state;
 
@@ -39,7 +39,7 @@ debug_f(
 	if (argc > 1) {
 		debug_state = strtol(argv[1], &p, 0);
 		if (*p != '\0') {
-			dbprintf("bad value for debug %s\n", argv[1]);
+			dbprintf(_("bad value for debug %s\n"), argv[1]);
 			return 0;
 		}
 	}
db/dquot.c +8 -8
index 283939d..daa47a3 100644
@@ -34,8 +34,8 @@ static int	dquot_f(int argc, char **argv);
 static void	dquot_help(void);
 
 static const cmdinfo_t	dquot_cmd =
-	{ "dquot", NULL, dquot_f, 1, 2, 1, "[projid|gid|uid]",
-	  "set current address to project, group or user quota block", dquot_help };
+	{ "dquot", NULL, dquot_f, 1, 2, 1, N_("[projid|gid|uid]"),
+	  N_("set current address to project, group or user quota block"), dquot_help };
 
 const field_t	dqblk_hfld[] = {
 	{ "", FLDT_DQBLK, OI(0), C1, 0, TYP_NONE },
@@ -121,25 +121,25 @@ dquot_f(
 			dogrp = doprj = 0;
 			break;
 		default:
-			dbprintf("bad option for dquot command\n");
+			dbprintf(_("bad option for dquot command\n"));
 			return 0;
 		}
 	}
-	s = doprj ? "project" : dogrp ? "group" : "user";
+	s = doprj ? _("project") : dogrp ? _("group") : _("user");
 	if (optind != argc - 1) {
-		dbprintf("dquot command requires one %s id argument\n", s);
+		dbprintf(_("dquot command requires one %s id argument\n"), s);
 		return 0;
 	}
 	ino = (dogrp || doprj) ? mp->m_sb.sb_gquotino : mp->m_sb.sb_uquotino;
 	if (ino == 0 || ino == NULLFSINO ||
 	    (dogrp && (mp->m_sb.sb_qflags & XFS_PQUOTA_ACCT)) ||
 	    (doprj && (mp->m_sb.sb_qflags & XFS_GQUOTA_ACCT))) {
-		dbprintf("no %s quota inode present\n", s);
+		dbprintf(_("no %s quota inode present\n"), s);
 		return 0;
 	}
 	id = (xfs_dqid_t)strtol(argv[optind], &p, 0);
 	if (*p != '\0') {
-		dbprintf("bad %s id for dquot %s\n", s, argv[optind]);
+		dbprintf(_("bad %s id for dquot %s\n"), s, argv[optind]);
 		return 0;
 	}
 	perblock = (int)(mp->m_sb.sb_blocksize / sizeof(xfs_dqblk_t));
@@ -151,7 +151,7 @@ dquot_f(
 	bmap(qbno, 1, XFS_DATA_FORK, &nex, &bm);
 	pop_cur();
 	if (nex == 0) {
-		dbprintf("no %s quota data for id %d\n", s, id);
+		dbprintf(_("no %s quota data for id %d\n"), s, id);
 		return 0;
 	}
 	set_cur(&typtab[TYP_DQBLK], XFS_FSB_TO_DADDR(mp, bm.startblock), blkbb,
db/echo.c +2 -2
index 9e62567..813187b 100644
@@ -24,8 +24,8 @@
 static int	echo_f(int argc, char **argv);
 
 static const cmdinfo_t	echo_cmd =
-	{ "echo", NULL, echo_f, 0, -1, 0, "[args]...",
-	  "echo arguments", NULL };
+	{ "echo", NULL, echo_f, 0, -1, 0, N_("[args]..."),
+	  N_("echo arguments"), NULL };
 
 /*ARGSUSED*/
 static int
db/faddr.c +23 -23

177 lines not on this page · raw message

db/flist.c +18 -18
index 9537d75..33f7da7 100644
@@ -146,7 +146,7 @@ flist_parse(
 	while (fl) {
 		f = findfield(fl->name, fields, obj, startoff);
 		if (f == NULL) {
-			dbprintf("field %s not found\n", fl->name);
+			dbprintf(_("field %s not found\n"), fl->name);
 			return 0;
 		}
 		fl->fld = f;
@@ -156,22 +156,22 @@ flist_parse(
 			low = (f->flags & FLD_ABASE1) != 0;
 			high = fcount(f, obj, startoff) + low - 1;
 			if (low > high) {
-				dbprintf("no elements in %s\n", fl->name);
+				dbprintf(_("no elements in %s\n"), fl->name);
 				return 0;
 			}
 			if (fl->flags & FL_OKHIGH) {
 				if (fl->low < low || fl->low > high ||
 				    fl->high < low || fl->high > high) {
-					dbprintf("indices %d-%d for field %s "
-						 "out of range %d-%d\n",
+					dbprintf(_("indices %d-%d for field %s "
+						 "out of range %d-%d\n"),
 						fl->low, fl->high, fl->name,
 						low, high);
 					return 0;
 				}
 			} else if (fl->flags & FL_OKLOW) {
 				if (fl->low < low || fl->low > high) {
-					dbprintf("index %d for field %s out of "
-						 "range %d-%d\n",
+					dbprintf(_("index %d for field %s out of "
+						 "range %d-%d\n"),
 						fl->low, fl->name, low, high);
 					return 0;
 				}
@@ -184,7 +184,7 @@ flist_parse(
 			}
 		} else {
 			if (fl->flags & FL_OKLOW) {
-				dbprintf("field %s is not an array\n",
+				dbprintf(_("field %s is not an array\n"),
 					fl->name);
 				return 0;
 			}
@@ -197,7 +197,7 @@ flist_parse(
 			flist_expand_structs(fl, obj);
 		if (fl->child) {
 			if (fa->subfld == NULL) {
-				dbprintf("field %s has no subfields\n",
+				dbprintf(_("field %s has no subfields\n"),
 					fl->name);
 				return 0;
 			}
@@ -217,17 +217,17 @@ flist_print(
 	if (!(debug_state & DEBUG_FLIST))
 		return;
 	while (fl) {
-		dbprintf("fl@%p:\n", fl);
-		dbprintf("\tname=%s, fld=%p, child=%p, sibling=%p\n",
+		dbprintf(_("fl@%p:\n"), fl);
+		dbprintf(_("\tname=%s, fld=%p, child=%p, sibling=%p\n"),
 			fl->name, fl->fld, fl->child, fl->sibling);
-		dbprintf("\tlow=%d, high=%d, flags=%d (%s%s), offset=%d\n",
+		dbprintf(_("\tlow=%d, high=%d, flags=%d (%s%s), offset=%d\n"),
 			fl->low, fl->high, fl->flags,
-			fl->flags & FL_OKLOW ? "oklow " : "",
-			fl->flags & FL_OKHIGH ? "okhigh" : "", fl->offset);
-		dbprintf("\tfld->name=%s, fld->ftyp=%d (%s)\n",
+			fl->flags & FL_OKLOW ? _("oklow ") : "",
+			fl->flags & FL_OKHIGH ? _("okhigh") : "", fl->offset);
+		dbprintf(_("\tfld->name=%s, fld->ftyp=%d (%s)\n"),
 			fl->fld->name, fl->fld->ftyp,
 			ftattrtab[fl->fld->ftyp].name);
-		dbprintf("\tfld->flags=%d (%s%s%s%s%s)\n", fl->fld->flags,
+		dbprintf(_("\tfld->flags=%d (%s%s%s%s%s)\n"), fl->fld->flags,
 			fl->fld->flags & FLD_ABASE1 ? "abase1 " : "",
 			fl->fld->flags & FLD_SKIPALL ? "skipall " : "",
 			fl->fld->flags & FLD_ARRAY ? "array " : "",
@@ -319,7 +319,7 @@ flist_scan(
 	ftok_free(v);
 	return fl;
 bad:
-	dbprintf("bad syntax in field name %s\n", name);
+	dbprintf(_("bad syntax in field name %s\n"), name);
 	ftok_free(v);
 	if (fl)
 		flist_free(fl);
@@ -375,7 +375,7 @@ flist_split(
 		if (*s == '\"') {
 			s++; /* skip first quote */
 			if ((a = strrchr(s, '\"')) == NULL) {
-				dbprintf("missing closing quote %s\n", s);
+				dbprintf(_("missing closing quote %s\n"), s);
 				ftok_free(v);
 				return NULL;
 			}
@@ -392,7 +392,7 @@ flist_split(
 			l = 1;
 			t = puncttypes[a - punctchars];
 		} else {
-			dbprintf("bad character in field %s\n", s);
+			dbprintf(_("bad character in field %s\n"), s);
 			ftok_free(v);
 			return NULL;
 		}
db/fprint.c +1 -1
index 2e60f93..1d2f29c 100644
@@ -95,7 +95,7 @@ fp_num(
 		if (array)
 			dbprintf("%d:", i + base);
 		if ((arg & FTARG_DONULL) && isnull)
-			dbprintf("null");
+			dbprintf(_("null"));
 		else if (size > 32)
 			dbprintf(fmtstr, val);
 		else
db/frag.c +8 -8
index 04c0567..925863d 100644
@@ -170,7 +170,7 @@ frag_f(
 			 (double)extcount_actual;
 	else
 		answer = 0.0;
-	dbprintf("actual %llu, ideal %llu, fragmentation factor %.2f%%\n",
+	dbprintf(_("actual %llu, ideal %llu, fragmentation factor %.2f%%\n"),
 		extcount_actual, extcount_ideal, answer);
 	return 0;
 }
@@ -211,7 +211,7 @@ init(
 			vflag = 1;
 			break;
 		default:
-			dbprintf("bad option for frag command\n");
+			dbprintf(_("bad option for frag command\n"));
 			return 0;
 		}
 	}
@@ -349,7 +349,7 @@ process_inode(
 	if (!skipa)
 		process_fork(dip, XFS_ATTR_FORK);
 	if (vflag && (!skipd || !skipa))
-		dbprintf("inode %lld actual %lld ideal %lld\n",
+		dbprintf(_("inode %lld actual %lld ideal %lld\n"),
 			ino, extcount_actual - actual, extcount_ideal - ideal);
 }
 
@@ -365,7 +365,7 @@ scan_ag(
 		XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR(mp)),
 		XFS_FSS_TO_BB(mp, 1), DB_RING_IGN, NULL);
 	if ((agf = iocur_top->data) == NULL) {
-		dbprintf("can't read agf block for ag %u\n", agno);
+		dbprintf(_("can't read agf block for ag %u\n"), agno);
 		pop_cur();
 		return;
 	}
@@ -374,7 +374,7 @@ scan_ag(
 		XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),
 		XFS_FSS_TO_BB(mp, 1), DB_RING_IGN, NULL);
 	if ((agi = iocur_top->data) == NULL) {
-		dbprintf("can't read agi block for ag %u\n", agno);
+		dbprintf(_("can't read agi block for ag %u\n"), agno);
 		pop_cur();
 		pop_cur();
 		return;
@@ -397,7 +397,7 @@ scan_lbtree(
 	set_cur(&typtab[btype], XFS_FSB_TO_DADDR(mp, root), blkbb, DB_RING_IGN,
 		NULL);
 	if (iocur_top->data == NULL) {
-		dbprintf("can't read btree block %u/%u\n",
+		dbprintf(_("can't read btree block %u/%u\n"),
 			XFS_FSB_TO_AGNO(mp, root),
 			XFS_FSB_TO_AGBNO(mp, root));
 		return;
@@ -420,7 +420,7 @@ scan_sbtree(
 	set_cur(&typtab[btype], XFS_AGB_TO_DADDR(mp, seqno, root),
 		blkbb, DB_RING_IGN, NULL);
 	if (iocur_top->data == NULL) {
-		dbprintf("can't read btree block %u/%u\n", seqno, root);
+		dbprintf(_("can't read btree block %u/%u\n"), seqno, root);
 		return;
 	}
 	(*func)(iocur_top->data, nlevels - 1, agf);
@@ -476,7 +476,7 @@ scanfunc_ino(
 				XFS_FSB_TO_BB(mp, XFS_IALLOC_BLOCKS(mp)),
 				DB_RING_IGN, NULL);
 			if (iocur_top->data == NULL) {
-				dbprintf("can't read inode block %u/%u\n",
+				dbprintf(_("can't read inode block %u/%u\n"),
 					seqno, XFS_AGINO_TO_AGBNO(mp, agino));
 				continue;
 			}
db/freesp.c +7 -7
index 6f303ad..51ce810 100644
@@ -103,9 +103,9 @@ freesp_f(
 	if (histcount)
 		printhist();
 	if (summaryflag) {
-		dbprintf("total free extents %lld\n", totexts);
-		dbprintf("total free blocks %lld\n", totblocks);
-		dbprintf("average free extent size %g\n",
+		dbprintf(_("total free extents %lld\n"), totexts);
+		dbprintf(_("total free blocks %lld\n"), totblocks);
+		dbprintf(_("average free extent size %g\n"),
 			(double)totblocks / (double)totexts);
 	}
 	if (aglist)
@@ -196,8 +196,8 @@ init(
 static int
 usage(void)
 {
-	dbprintf("freesp arguments: [-bcdfs] [-a agno] [-e binsize] [-h h1]... "
-		 "[-m binmult]\n");
+	dbprintf(_("freesp arguments: [-bcdfs] [-a agno] [-e binsize] [-h h1]... "
+		 "[-m binmult]\n"));
 	return 0;
 }
 
@@ -267,7 +267,7 @@ scan_sbtree(
 	set_cur(&typtab[typ], XFS_AGB_TO_DADDR(mp, seqno, root),
 		blkbb, DB_RING_IGN, NULL);
 	if (iocur_top->data == NULL) {
-		dbprintf("can't read btree block %u/%u\n", seqno, root);
+		dbprintf(_("can't read btree block %u/%u\n"), seqno, root);
 		return;
 	}
 	(*func)(iocur_top->data, typ, nlevels - 1, agf);
@@ -397,7 +397,7 @@ printhist(void)
 	int	i;
 
 	dbprintf("%7s %7s %7s %7s %6s\n",
-		"from", "to", "extents", "blocks", "pct");
+		_("from"), _("to"), _("extents"), _("blocks"), _("pct"));
 	for (i = 0; i < histcount; i++) {
 		if (hist[i].count)
 			dbprintf("%7d %7d %7lld %7lld %6.2f\n", hist[i].low,
db/hash.c +4 -4
index 793e6ae..02376e6 100644
@@ -27,20 +27,20 @@ static int hash_f(int argc, char **argv);
 static void hash_help(void);
 
 static const cmdinfo_t hash_cmd =
-	{ "hash", NULL, hash_f, 1, 1, 0, "string",
-	  "calculate hash value", hash_help };
+	{ "hash", NULL, hash_f, 1, 1, 0, N_("string"),
+	  N_("calculate hash value"), hash_help };
 
 static void
 hash_help(void)
 {
-	dbprintf(
+	dbprintf(_(
 "\n"
 " 'hash' prints out the calculated hash value for a string using the\n"
 "directory/attribute code hash function.\n"
 "\n"
 " Usage:  \"hash <string>\"\n"
 "\n"
-);
+));
 
 }
 
db/help.c +5 -5
index d9caf35..7913100 100644
@@ -27,8 +27,8 @@ static int	help_f(int argc, char **argv);
 static void	help_oneline(const char *cmd, const cmdinfo_t *ct);
 
 static const cmdinfo_t	help_cmd =
-	{ "help", "?", help_f, 0, 1, 0, "[command]",
-	  "help for one or all commands", NULL };
+	{ "help", "?", help_f, 0, 1, 0, N_("[command]"),
+	  N_("help for one or all commands"), NULL };
 
 static void
 help_all(void)
@@ -37,7 +37,7 @@ help_all(void)
 
 	for (ct = cmdtab; ct < &cmdtab[ncmds]; ct++)
 		help_oneline(ct->name, ct);
-	dbprintf("\nUse 'help commandname' for extended help.\n");
+	dbprintf(_("\nUse 'help commandname' for extended help.\n"));
 }
 
 static int
@@ -53,7 +53,7 @@ help_f(
 	}
 	ct = find_command(argv[1]);
 	if (ct == NULL) {
-		dbprintf("command %s not found\n", argv[1]);
+		dbprintf(_("command %s not found\n"), argv[1]);
 		return 0;
 	}
 	help_onecmd(argv[1], ct);
@@ -86,7 +86,7 @@ help_oneline(
 	else {
 		dbprintf("%s ", ct->name);
 		if (ct->altname)
-			dbprintf("(or %s) ", ct->altname);
+			dbprintf(_("(or %s) "), ct->altname);
 	}
 	if (ct->args)
 		dbprintf("%s ", ct->args);
db/init.c +5 -1
index e5f7951..2a5ef2b 100644
@@ -57,6 +57,10 @@ init(
 	void		*bufp = NULL;
 	int		c;
 
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
 	progname = basename(argv[0]);
 	while ((c = getopt(argc, argv, "c:fFip:rxVl:")) != EOF) {
 		switch (c) {
@@ -86,7 +90,7 @@ init(
 			expert_mode = 1;
 			break;
 		case 'V':
-			printf("%s version %s\n", progname, VERSION);
+			printf(_("%s version %s\n"), progname, VERSION);
 			exit(0);
 		case '?':
 			usage();
db/inode.c +4 -4
index 6b93eff..4aa4e1a 100644
@@ -378,14 +378,14 @@ inode_f(
 	if (argc > 1) {
 		ino = strtoull(argv[1], &p, 0);
 		if (*p != '\0') {
-			dbprintf("bad value for inode number %s\n", argv[1]);
+			dbprintf(_("bad value for inode number %s\n"), argv[1]);
 			return 0;
 		}
 		set_cur_inode(ino);
 	} else if (iocur_top->ino == NULLFSINO)
-		dbprintf("no current inode\n");
+		dbprintf(_("no current inode\n"));
 	else
-		dbprintf("current inode number is %lld\n", iocur_top->ino);
+		dbprintf(_("current inode number is %lld\n"), iocur_top->ino);
 	return 0;
 }
 
@@ -593,7 +593,7 @@ set_cur_inode(
 	if (agno >= mp->m_sb.sb_agcount || agbno >= mp->m_sb.sb_agblocks ||
 	    offset >= mp->m_sb.sb_inopblock ||
 	    XFS_AGINO_TO_INO(mp, agno, agino) != ino) {
-		dbprintf("bad inode number %lld\n", ino);
+		dbprintf(_("bad inode number %lld\n"), ino);
 		return;
 	}
 	cur_agno = agno;
db/input.c +3 -3
index bb687c2..b73a1f8 100644
@@ -40,8 +40,8 @@ static void	popfile(void);
 static int	source_f(int argc, char **argv);
 
 static const cmdinfo_t	source_cmd =
-	{ "source", NULL, source_f, 1, 1, 0, "source-file",
-	  "get commands from source-file", NULL };
+	{ "source", NULL, source_f, 1, 1, 0, N_("source-file"),
+	  N_("get commands from source-file"), NULL };
 
 /* our homegrown strtok that understands strings */
 
@@ -317,7 +317,7 @@ source_f(
 
 	f = fopen(argv[1], "r");
 	if (f == NULL)
-		dbprintf("can't open %s\n", argv[0]);
+		dbprintf(_("can't open %s\n"), argv[0]);
 	else
 		pushfile(f);
 	return 0;
db/io.c +44 -44

5 lines not on this page · raw message

db/malloc.c +1 -1
index c4eddc4..fe1eacf 100644

Lines of this file are not shown. View the raw message.

db/metadump.c +4 -4
index ab663f3..19aed4f 100644

Lines of this file are not shown. View the raw message.

db/output.c +8 -8
index f524a4e..36669f4 100644

Lines of this file are not shown. View the raw message.

db/print.c +7 -7
index 9821015..b865d64 100644

Lines of this file are not shown. View the raw message.

db/quit.c +1 -1
index 06ff148..5e4413c 100644

Lines of this file are not shown. View the raw message.

db/sb.c +65 -65

130 lines not on this page · raw message

db/type.c +7 -7
index 9c2b1d7..e5fd9eb 100644

Lines of this file are not shown. View the raw message.

db/write.c +22 -22

44 lines not on this page · raw message

logprint/log_copy.c +5 -5
index e453337..fd36317 100644

Lines of this file are not shown. View the raw message.

logprint/log_dump.c +6 -6
index 8bcd94e..1975b1b 100644

Lines of this file are not shown. View the raw message.

logprint/log_misc.c +111 -111

222 lines not on this page · raw message

logprint/log_print_all.c +52 -52

104 lines not on this page · raw message

logprint/log_print_trans.c +5 -5
index d0f9481..8b21257 100644

Lines of this file are not shown. View the raw message.

logprint/logprint.c +16 -12
index 8af0943..482fd4e 100644

Lines of this file are not shown. View the raw message.

repair/avl.c +7 -7
index 169c859..eabecc3 100644

Lines of this file are not shown. View the raw message.

repair/avl64.c +7 -7
index fc4cab4..c135da3 100644

Lines of this file are not shown. View the raw message.

repair/dinode.c +1 -1
index 28cc450..fdf52db 100644

Lines of this file are not shown. View the raw message.

repair/init.c +2 -2
index 18298b6..8e508c4 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
1.6.1.2

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Part of the diff is not shown here. View the raw message.