From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 25 Oct 2012 21:49:28 +0000 (-0700)
Subject: Use __getdents instead of __getdirentries in sparc __get_clockfreq_via_proc_openprom.
X-Git-Tag: glibc-2.17~348
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e9d84cdbc46301a0d9e83f7044393f7d8139382;p=thirdparty%2Fglibc.git

Use __getdents instead of __getdirentries in sparc __get_clockfreq_via_proc_openprom.
---

diff --git a/ChangeLog b/ChangeLog
index 2ce7d91c786..6656fa11465 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-25  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
+	(__get_clockfreq_via_proc_openprom): Use __getdents instead of
+	__getdirentries.
+
 2012-10-25  Joseph Myers  <joseph@codesourcery.com>
 	    Jim Blandy  <jimb@codesourcery.com>
 
@@ -981,7 +987,7 @@
 	(__SWBLK_T_TYPE): Likewise.
 
 2012-10-01  Patsy Franklin <pfrankli@redhat.com>
-            Honza Horak <hhorak@redhat.com>
+	    Honza Horak <hhorak@redhat.com>
 
 	* nis/yp_xdr.c (xdr_domainname): Use YPMAXDOMAIN as maxsize.
 	(xdr_mapname): Use YPMAXMAP as maxsize.
@@ -1498,7 +1504,7 @@
 
 2012-12-09  Allan McRae  <allan@archlinux.org>
 
-        * sysdeps/i386/fpu/libm-test-ulps: Update
+	* sysdeps/i386/fpu/libm-test-ulps: Update
 
 2012-09-11  Joseph Myers  <joseph@codesourcery.com>
 
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c b/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
index 67ff77fa8cb..abd0ebfb9f7 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
@@ -91,11 +91,9 @@ __get_clockfreq_via_proc_openprom (void)
     {
       unsigned long int buf[4096 / sizeof (unsigned long int)];
       struct dirent *dirp = (struct dirent *) buf;
-      off_t dbase = (off_t) 0;
       ssize_t len;
 
-      while ((len = __getdirentries (obp_fd, (char *) dirp,
-                                     sizeof (buf), &dbase)) > 0)
+      while ((len = __getdents (obp_fd, (char *) dirp, sizeof (buf))) > 0)
 	{
 	  struct dirent *this_dirp = dirp;