apply gettext translation to more strings

[thirdparty/xfsprogs-dev.git] / db / fprint.c

diff --git a/db/fprint.c b/db/fprint.c
index fb7fd4e8f81ea69bff97adcc47271f04e3d616f7..1d2f29c59135f042bde4c6c0ff47fc195c636f7c 100644 (file)
--- a/db/fprint.c
+++ b/db/fprint.c
@@ -1,37 +1,22 @@
 /*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
+ * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
-#include <getopt.h>
+#include <xfs/libxfs.h>
 #include <ctype.h>
 #include <time.h>
 #include "type.h"
@@ -39,7 +24,7 @@
 #include "fprint.h"
 #include "field.h"
 #include "inode.h"
-#include "inobt.h"
+#include "btblock.h"
 #include "bit.h"
 #include "print.h"
 #include "output.h"
@@ -68,7 +53,7 @@ fp_charns(
             i++, p++) {
                if (*p == '\\' || *p == '\'' || *p == '"' || *p == '\?')
                        dbprintf("\\%c", *p);
-               else if (isgraph(*p) || *p == ' ')
+               else if (isgraph((int)*p) || *p == ' ')
                        dbprintf("%c", *p);
                else if (*p == '\a' || *p == '\b' || *p == '\f' || *p == '\n' ||
                         *p == '\r' || *p == '\t' || *p == '\v')
@@ -110,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
@@ -153,7 +138,7 @@ fp_time(
        int     bitpos;
        char    *c;
        int     i;
-        time_t  t;
+       time_t  t;
 
        ASSERT(bitoffs(bit) == 0);
        for (i = 0, bitpos = bit;
@@ -161,7 +146,7 @@ fp_time(
             i++, bitpos += size) {
                if (array)
                        dbprintf("%d:", i + base);
-                t=(time_t)getbitval((char *)obj + byteize(bitpos), 0, sizeof(int32_t)*8, 0);
+               t=(time_t)getbitval((char *)obj + byteize(bitpos), 0, sizeof(int32_t)*8, 0);
                c = ctime(&t);
                dbprintf("%24.24s", c);
                if (i < count - 1)
@@ -192,7 +177,7 @@ fp_uuid(
             i++, p++) {
                if (array)
                        dbprintf("%d:", i + base);
-               uuid_unparse(*p, bp);
+               platform_uuid_unparse(p, bp);
                dbprintf("%s", bp);
                if (i < count - 1)
                        dbprintf(" ");