[packages/h4h5tools] - added format patch

qboosh qboosh at pld-linux.org
Mon Dec 24 11:44:39 CET 2012


commit bf96ac4b0366536923928a4b7e46f9782d4fc327
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Dec 24 11:45:57 2012 +0100

    - added format patch

 h4h5tools-format.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 h4h5tools.spec         |  2 ++
 2 files changed, 52 insertions(+)
---
diff --git a/h4h5tools.spec b/h4h5tools.spec
index 5d2b818..751b309 100644
--- a/h4h5tools.spec
+++ b/h4h5tools.spec
@@ -10,6 +10,7 @@ Source0:	ftp://ftp.hdfgroup.org/HDF5/releases/tools/h4toh5/h4toh5-%{version}/src
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-shared.patch
 Patch2:		%{name}-hdfeos.patch
+Patch3:		%{name}-format.patch
 URL:		http://www.hdfgroup.org/h4toh5/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -82,6 +83,7 @@ oraz z HDF5 do HDF 4.x.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
diff --git a/h4h5tools-format.patch b/h4h5tools-format.patch
new file mode 100644
index 0000000..76ed91f
--- /dev/null
+++ b/h4h5tools-format.patch
@@ -0,0 +1,50 @@
+--- h4h5tools-2.2.1/utils/h5toh4/h5toh4.c.orig	2011-12-23 21:56:47.000000000 +0100
++++ h4h5tools-2.2.1/utils/h5toh4/h5toh4.c	2012-12-24 11:44:20.413416898 +0100
+@@ -293,7 +293,7 @@
+   {
+     (void) fprintf(stderr, err1, argc);
+     PrintOptions_h5toh4();
+-    (void) fprintf(stderr, err4);
++    (void) fputs(err4, stderr);
+     return EXIT_FAILURE;
+   }
+ 
+@@ -305,7 +305,7 @@
+     if ((token = gtoken(argv[i])) == TOK_ERR)
+     {
+       PrintOptions_h5toh4();
+-      (void) fprintf(stderr, err4);
++      (void) fputs(err4, stderr);
+       return EXIT_FAILURE;
+     }
+ 
+@@ -348,9 +348,9 @@
+ 
+       case TOK_ERR:   /* command syntax error */
+       default:
+-        (void) fprintf(stderr, err2);
++        (void) fputs(err2, stderr);
+ 				PrintOptions_h5toh4();
+-    		(void) fprintf(stderr, err4);
++    		(void) fputs(err4, stderr);
+     		return EXIT_FAILURE;
+     }
+   }
+@@ -6435,7 +6435,7 @@
+ 		case DFNT_INT32:
+ 			ip =  (int32 *)value;
+ 			for (i = 0; i < count; i++) {
+-			    sprintf(tmp,"%ld,",ip[i]);
++			    sprintf(tmp,"%ld,",(long)ip[i]);
+ 			    thing = strcat(thing,tmp);
+ 			}
+ 			free(tmp);
+@@ -6485,7 +6485,7 @@
+ 		case DFNT_UINT32:
+ 			uip =  (uint32 *)value;
+ 			for (i = 0; i < count; i++) {
+-			    sprintf(tmp,"%ld,",uip[i]);
++			    sprintf(tmp,"%ld,",(long)uip[i]);
+ 			    thing = strcat(thing,tmp);
+ 			}
+ 			free(tmp);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/h4h5tools.git/commitdiff/bf96ac4b0366536923928a4b7e46f9782d4fc327



More information about the pld-cvs-commit mailing list