[PATCH 0/2] xfsdump: fix build issues

[PATCH 0/2] xfsdump: fix build issues

[Dave Chinner]

Hi folks,

it's clearly been a while since I built xfsdump, because it didn't
compile in my current dev environment. These patches are needed to
make it compile again. Once there are reviewed and merged, I'll do a
point release for the xfsdump package....

I also noticed that 'make deb' issues a huge number of
set-but-not-used variable warnings, which means that the debian
package is building with different compiler flags to the normal
build. We should fix that at some point.

Cheers,

Dave.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 1/2] dump: don't redefine min() or max()

[Dave Chinner]

From: Dave Chinner <dchinner@redhat.com>

They are included from other header files.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 common/util.h     | 3 ---
 restore/dirattr.c | 2 --
 restore/namreg.c  | 2 --
 restore/node.c    | 3 ---
 4 files changed, 10 deletions(-)

diff --git a/common/util.h b/common/util.h
index 529c319..86ea8d2 100644
--- a/common/util.h
+++ b/common/util.h
@@ -67,9 +67,6 @@ extern intgen_t read_buf( char *bufp,
 			  intgen_t *statp );
 
 
-#define min( a, b )	( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
-#define max( a, b )	( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
-
 
 /* strncpyterm - like strncpy, but guarantees the destination is null-terminated
  */
diff --git a/restore/dirattr.c b/restore/dirattr.c
index 8a1fb06..fcfa0c8 100644
--- a/restore/dirattr.c
+++ b/restore/dirattr.c
@@ -51,8 +51,6 @@
 
 /* structure definitions used locally ****************************************/
 
-#define max( a, b )	( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
-
 /* node handle limits
  */
 #ifdef DIRATTRCHK
diff --git a/restore/namreg.c b/restore/namreg.c
index 80d558a..41362d1 100644
--- a/restore/namreg.c
+++ b/restore/namreg.c
@@ -34,8 +34,6 @@
 
 /* structure definitions used locally ****************************************/
 
-#define max( a, b )	( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
-
 #define NAMREG_AVGLEN	10
 
 /* persistent context for a namreg - placed in first page
diff --git a/restore/node.c b/restore/node.c
index b5df88a..4cc8fb0 100644
--- a/restore/node.c
+++ b/restore/node.c
@@ -30,9 +30,6 @@
 #include "node.h"
 #include "mmap.h"
 
-#define max( a, b )	( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
-#define min( a, b )	( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
-
 extern size_t pgsz;
 extern size_t pgmask;
 
-- 
2.0.0

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/2] dump: don't redefine min() or max()

[Christoph Hellwig]

On Tue, Jul 15, 2014 at 03:45:05PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> They are included from other header files.
> 
> Signed-off-by: Dave Chinner <dchinner@redhat.com>

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 2/2] dump: fix translation build errors

[Dave Chinner]

From: Dave Chinner <dchinner@redhat.com>

The translations fail to build because of duplicate message strings.
Remove the duplicate.

Also, fix the missing "language" tag from the german translation.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 po/de.po | 10 +---------
 po/pl.po |  9 ---------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/po/de.po b/po/de.po
index 8bdd756..62face8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2012-08-28 10:58+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3470,15 +3471,6 @@ msgstr "Versuch, %s mit »stat« abzufragen, fehlgeschlagen: %s\n"
 msgid "attempt to truncate %s failed: %s\n"
 msgstr "Versuch, %s zu kürzen, fehlgeschlagen: %s\n"
 
-#: .././restore/content.c:7337 .././restore/content.c:7585
-#, c-format
-msgid ""
-"attempt to set extended attributes (xflags 0x%x, extsize = 0x%x, projid = 0x%"
-"x) of %s failed: %s\n"
-msgstr ""
-"Versuch, erweiterte Attribute (xflags 0x%x, extsize = 0x%x, projid = 0x%x) "
-"von %s zu setzen, fehlgeschlagen: %s\n"
-
 #: .././restore/content.c:7493 .././restore/content.c:7760
 #, c-format
 msgid "unable to set access and modification times of %s: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 3ce823e..62dee9a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3766,15 +3766,6 @@ msgstr "chown (uid=%d, gid=%d) %s nie powiodło się: %s\n"
 msgid "chmod %s failed: %s\n"
 msgstr "chmod %s nie powiodło się: %s\n"
 
-#: .././restore/tree.c:2616
-#, c-format
-msgid ""
-"attempt to set extended attributes (xflags 0x%x, extsize = 0x%x, projid = 0x"
-"%x) of %s failed: %s\n"
-msgstr ""
-"próba ustawienia rozszerzonych atrybutów (xflags 0x%x, extsize = 0x%x, "
-"projid = 0x%x) %s nie powiodła się: %s\n"
-
 #: .././restore/tree.c:2643
 #, c-format
 msgid "unable to rmdir %s: not empty\n"
-- 
2.0.0

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/2] dump: fix translation build errors

[Christoph Hellwig]

On Tue, Jul 15, 2014 at 03:45:06PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> The translations fail to build because of duplicate message strings.
> Remove the duplicate.
> 
> Also, fix the missing "language" tag from the german translation.
> 
> Signed-off-by: Dave Chinner <dchinner@redhat.com>

Looks good.

Btw, Jakub are you still interested in xfsdump translations?  We might
do another release soon so it might be a good time to start work on it.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/2] dump: fix translation build errors

[Jakub Bogusz]

[-- Attachment #1: Type: text/plain, Size: 761 bytes --]

On Tue, Jul 15, 2014 at 03:21:43AM -0700, Christoph Hellwig wrote:
> On Tue, Jul 15, 2014 at 03:45:06PM +1000, Dave Chinner wrote:
> > From: Dave Chinner <dchinner@redhat.com>
> > 
> > The translations fail to build because of duplicate message strings.
> > Remove the duplicate.
> > 
> > Also, fix the missing "language" tag from the german translation.
> > 
> > Signed-off-by: Dave Chinner <dchinner@redhat.com>
> 
> Looks good.
> 
> Btw, Jakub are you still interested in xfsdump translations?  We might
> do another release soon so it might be a good time to start work on it.

Do you mean current git master (git://oss.sgi.com/xfs/cmds/xfsdump.git)?

I checked it, single message needed update (new pl.po attached).


-- 
Jakub Bogusz    http://qboosh.pl/

[-- Attachment #2: xfsdump-3.1.3+git.pl.po.gz --]
[-- Type: application/gzip, Size: 25642 bytes --]

[-- Attachment #3: Type: text/plain, Size: 121 bytes --]

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/2] dump: fix translation build errors

[Christoph Hellwig]

On Tue, Jul 15, 2014 at 04:55:14PM +0200, Jakub Bogusz wrote:
> > Btw, Jakub are you still interested in xfsdump translations?  We might
> > do another release soon so it might be a good time to start work on it.
> 
> Do you mean current git master (git://oss.sgi.com/xfs/cmds/xfsdump.git)?

Yes!

> I checked it, single message needed update (new pl.po attached).

Thanks a lot!

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs