JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* libc/posix/scandir.c (DIRSIZ): Use offsetof instead of magic

Browse Source 
number.
This commit is contained in:
Corinna Vinschen
2013-04-02 11:38:12 +00:00
parent bbd4e05a4d
commit 2e463c77de
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@@ -1,3 +1,8 @@
2013-04-02 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libc/posix/scandir.c (DIRSIZ): Use offsetof instead of magic
number.
2013-03-27 Bin Cheng <bin.cheng@arm.com>
* acconfig.h (_FVWRITE_IN_STREAMIO): Undefine.

5
newlib/libc/posix/scandir.c
View File

@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)scandir.c 5.10 (Berkeley) 2/23/91";
#include <sys/types.h>
#include <sys/stat.h>
#include <stddef.h>
#include <dirent.h>
#include <stdlib.h>
#include <string.h>
@@ -56,10 +57,10 @@ static char sccsid[] = "@(#)scandir.c 5.10 (Berkeley) 2/23/91";
#undef DIRSIZ
#ifdef _DIRENT_HAVE_D_NAMLEN
#define DIRSIZ(dp) \
((sizeof (struct dirent) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
(offsetof (struct dirent, d_name) + (((dp)->d_namlen+1 + 3) &~ 3))
#else
#define DIRSIZ(dp) \
((sizeof (struct dirent) - (MAXNAMLEN+1)) + ((strlen((dp)->d_name)+1 + 3) &~ 3))
(offsetof (struct dirent, d_name) + ((strlen((dp)->d_name)+1 + 3) &~ 3))
#endif
#ifndef __P