rpms/hfsplusutils/devel hfsplusutils-1.0.4-memset.patch, NONE, 1.1 hfsplusutils.spec, 1.10, 1.11

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/hfsplusutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15808

Modified Files:
	hfsplusutils.spec 
Added Files:
	hfsplusutils-1.0.4-memset.patch 
Log Message:
Fix memset breakage


hfsplusutils-1.0.4-memset.patch:

--- NEW FILE hfsplusutils-1.0.4-memset.patch ---
--- hfsplus-1.0.4/libhfsp/src/record.c~	2002-03-17 17:20:01.000000000 +0000
+++ hfsplus-1.0.4/libhfsp/src/record.c	2007-08-22 14:31:26.000000000 +0100
@@ -654,7 +654,7 @@ int record_init_string(record* r, UInt16
     hfsp_cat_entry* entry = &r->record;
     UInt16	    ptype = parent->record.type;
 
-    memset(r, sizeof(record), 0);   // **** Debugging only
+    memset(r, 0, sizeof(record));   // **** Debugging only
 
     r->tree	    = parent->tree;
     r->node_index   = 0;


Index: hfsplusutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hfsplusutils/devel/hfsplusutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hfsplusutils.spec	29 Jul 2007 11:15:38 -0000	1.10
+++ hfsplusutils.spec	22 Aug 2007 13:32:55 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Tools for reading Macintosh HFS+ volumes
 Name: hfsplusutils
 Version: 1.0.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: GPL
 Group: Applications/File
@@ -11,6 +11,7 @@
 Patch1: hfsplusutils-1.0.4-errno.patch
 Patch2: hfsplusutils-1.0.4-includes.patch
 Patch3: hfsplusutils-1.0.4-gcc4.patch
+Patch4: hfsplusutils-1.0.4-memset.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: automake, autoconf, libtool
 %description
@@ -25,6 +26,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 sed -i -e 's/^CFLAGS\s/AM_CFLAGS /' {libhfsp/src,src}/Makefile.am
 
@@ -69,7 +71,10 @@
 
 
 %changelog
-* Sun Jul 29 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.4-9
+* Wed Aug 22 2007 David Woodhouse <dwmw2 at infradead.org> 1.0.4-10
+- Fix memset argument ordering confusion
+ 
+* Sun Jul 29 2007 Ville Skyttä <ville.skytta at iki.fi>  1.0.4-9
 - Use autoreconf, configure with dependency tracking disabled,
   build with $RPM_OPT_FLAGS and use parallel build (#227573).