Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame^] | 1 | Subject: [PATCH] collectd: replace deprecated readdir_r() with readdir() |
| 2 | |
| 3 | * Replace the usage of readdir_r() with readdir() |
| 4 | to address a compilation error under glibc 2.24 |
| 5 | due to the deprecation of readdir_r |
| 6 | |
| 7 | | ../../collectd-5.5.0/src/vserver.c: In function 'vserver_read': |
| 8 | | ../../collectd-5.5.0/src/vserver.c:167:3: error: 'readdir_r' is deprecated [-Werror=deprecated-declarations] |
| 9 | | status = readdir_r (proc, (struct dirent *) dirent_buffer, &dent); |
| 10 | | ^~~~~~ |
| 11 | | In file included from /buildarea4/myu2/build/prj_test_20160722/bitbake_build/tmp/sysroots/qemux86/usr/include/features.h:368:0, |
| 12 | | from /buildarea4/myu2/build/prj_test_20160722/bitbake_build/tmp/sysroots/qemux86/usr/include/stdio.h:27, |
| 13 | | from ../../collectd-5.5.0/src/daemon/collectd.h:34, |
| 14 | | from ../../collectd-5.5.0/src/vserver.c:29: |
| 15 | | /buildarea4/myu2/build/prj_test_20160722/bitbake_build/tmp/sysroots/qemux86/usr/include/dirent.h:189:12: note: declared here |
| 16 | | extern int __REDIRECT (readdir_r, |
| 17 | | ^ |
| 18 | |
| 19 | [1]https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7584a3f96de88d5eefe5d6c634515278cbfbf052;hp=8d9c92017d85f23ba6a2b3614b2f2bcf1820d6f0 |
| 20 | |
| 21 | Upstream-Status: Pending |
| 22 | |
| 23 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| 24 | --- |
| 25 | src/vserver.c | 15 ++++----------- |
| 26 | 1 file changed, 4 insertions(+), 11 deletions(-) |
| 27 | |
| 28 | diff --git a/src/vserver.c b/src/vserver.c |
| 29 | index bd2e867..2e4e715 100644 |
| 30 | --- a/src/vserver.c |
| 31 | +++ b/src/vserver.c |
| 32 | @@ -131,15 +131,8 @@ static derive_t vserver_get_sock_bytes(const char *s) |
| 33 | |
| 34 | static int vserver_read (void) |
| 35 | { |
| 36 | -#if NAME_MAX < 1024 |
| 37 | -# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + 1024 + 1) |
| 38 | -#else |
| 39 | -# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + NAME_MAX + 1) |
| 40 | -#endif |
| 41 | - |
| 42 | DIR *proc; |
| 43 | - struct dirent *dent; /* 42 */ |
| 44 | - char dirent_buffer[DIRENT_BUFFER_SIZE]; |
| 45 | + struct dirent *dent = NULL; /* 42 */ |
| 46 | |
| 47 | errno = 0; |
| 48 | proc = opendir (PROCDIR); |
| 49 | @@ -164,11 +157,11 @@ static int vserver_read (void) |
| 50 | |
| 51 | int status; |
| 52 | |
| 53 | - status = readdir_r (proc, (struct dirent *) dirent_buffer, &dent); |
| 54 | - if (status != 0) |
| 55 | + dent = readdir (proc); |
| 56 | + if (dent == NULL && errno != 0) |
| 57 | { |
| 58 | char errbuf[4096]; |
| 59 | - ERROR ("vserver plugin: readdir_r failed: %s", |
| 60 | + ERROR ("vserver plugin: readdir failed: %s", |
| 61 | sstrerror (errno, errbuf, sizeof (errbuf))); |
| 62 | closedir (proc); |
| 63 | return (-1); |
| 64 | -- |
| 65 | 2.8.2 |
| 66 | |