[csw-devel] SF.net SVN: gar:[13549] csw/mgar/pkg/file/trunk

[wahwah at users.sourceforge.net]

Revision: 13549
          http://gar.svn.sourceforge.net/gar/?rev=13549&view=rev
Author:   wahwah
Date:     2011-03-03 23:33:30 +0000 (Thu, 03 Mar 2011)

Log Message:
-----------
gfile: Remove surplus output from libmagic

Not sure why the printf is there at all.  Commenting it out won't change the
functionality of libmagic.

Modified Paths:
--------------
    csw/mgar/pkg/file/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch

Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile	2011-03-03 20:56:58 UTC (rev 13548)
+++ csw/mgar/pkg/file/trunk/Makefile	2011-03-03 23:33:30 UTC (rev 13549)
@@ -20,6 +20,7 @@
 # These flags are not understood by Sun Studio
 CONFIGURE_ARGS += --disable-warnings
 TEST_TARGET = check
+PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch
 
 NOISAEXEC = 1
 

Added: csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch	                        (rev 0)
+++ csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch	2011-03-03 23:33:30 UTC (rev 13549)
@@ -0,0 +1,27 @@
+From 9be2ae854b16feecf9aed9cf908faf30e33b0edf Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 4 Mar 2011 00:30:29 +0100
+Subject: [PATCH] Remove surplus "flags!" output on SPARC
+
+---
+ src/apprentice.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/apprentice.c b/src/apprentice.c
+index 49126ac..15d34de 100644
+--- a/src/apprentice.c
++++ b/src/apprentice.c
+@@ -2461,8 +2461,10 @@ bs1(struct magic *m)
+ 	m->in_offset = swap4((uint32_t)m->in_offset);
+ 	m->lineno = swap4((uint32_t)m->lineno);
+ 	if (IS_STRING(m->type)) {
++    /* This printf causes surplus output on sparc machines.
+ 		if (m->type == FILE_PSTRING)
+ 			printf("flags! %d\n", m->str_flags);
++    */
+ 		m->str_range = swap4(m->str_range);
+ 		m->str_flags = swap4(m->str_flags);
+ 	}
+-- 
+1.7.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.