rpms/hdf5/FC-3 hdf5-1.6.5-h5diff_attr.patch, NONE, 1.1 hdf5-1.6.4-h5diff_attr.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/hdf5/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2967

Added Files:
	hdf5-1.6.5-h5diff_attr.patch 
Removed Files:
	hdf5-1.6.4-h5diff_attr.patch 
Log Message:
Update patch to fix h5diff_attr.c to 1.6.5


hdf5-1.6.5-h5diff_attr.patch:

--- NEW FILE hdf5-1.6.5-h5diff_attr.patch ---
--- hdf5-1.6.5/tools/lib/h5diff_attr.c.orig	2005-12-21 12:08:45.000000000 -0700
+++ hdf5-1.6.5/tools/lib/h5diff_attr.c	2005-12-21 12:11:17.000000000 -0700
@@ -61,8 +61,8 @@
  int        rank2;        /* rank of dataset */
  hsize_t    dims1[H5S_MAX_RANK];/* dimensions of dataset */
  hsize_t    dims2[H5S_MAX_RANK];/* dimensions of dataset */
- char       name1[255];
- char       name2[255];
+ char       name1[255],np1[512];
+ char       name2[255],np2[512];
  int        n1, n2, i, j;
  int        ret=0;
  hsize_t    nfound;
@@ -196,21 +196,21 @@
  * array compare
  *-------------------------------------------------------------------------
  */
- sprintf(name1,"%s of <%s>",name1,path1);
- sprintf(name2,"%s of <%s>",name2,path2);
+ snprintf(np1,sizeof(np1),"%s of <%s>",name1,path1);
+ snprintf(np2,sizeof(np2),"%s of <%s>",name2,path2);
 
  /* always print name */
  if (options->m_verbose)
  {
-  printf( "Attribute:   <%s> and <%s>\n",name1,name2);
+  printf( "Attribute:   <%s> and <%s>\n",np1,np2);
   nfound = diff_array(buf1,
                      buf2,
                      nelmts1,
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -230,8 +230,8 @@
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -239,15 +239,15 @@
    options->m_quiet=0;
    if (nfound)
    {
-    printf( "Attribute:   <%s> and <%s>\n",name1,name2);
+    printf( "Attribute:   <%s> and <%s>\n",np1,np2);
     nfound = diff_array(buf1,
                      buf2,
                      nelmts1,
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);
@@ -263,8 +263,8 @@
                      rank1,
                      dims1,
                      options,
-                     name1,
-                     name2,
+                     np1,
+                     np2,
                      mtype1_id,
                      attr1_id,
                      attr2_id);


--- hdf5-1.6.4-h5diff_attr.patch DELETED ---