diff options
| author |   Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-07-15 19:35:58 +0000 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-09-11 14:35:32 -0300 |
| commit | 04986243d1af37ac0177ed2f9db0a066ebd2b212 (patch) | |
| tree | 87b9cebcc14f51dd0cf4103be16fc26542b65c69 /locale | |
| parent | Linux: Consolidate xmknod (diff) | |
| download | glibc-04986243d1af37ac0177ed2f9db0a066ebd2b212.tar.gz glibc-04986243d1af37ac0177ed2f9db0a066ebd2b212.tar.bz2 glibc-04986243d1af37ac0177ed2f9db0a066ebd2b212.zip | |
Remove internal usage of extensible stat functions
It replaces the internal usage of __{f,l}xstat{at}{64} with the
__{f,l}stat{at}{64}. It should not change the generate code since
sys/stat.h explicit defines redirections to internal calls back to
xstat* symbols.
Checked with a build for all affected ABIs. I also check on
x86_64-linux-gnu and i686-linux-gnu.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/loadarchive.c | 4 | ||||
| -rw-r--r-- | locale/loadlocale.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/locale/loadarchive.c b/locale/loadarchive.c index ba0fe45648..8de6a327a4 100644 --- a/locale/loadarchive.c +++ b/locale/loadarchive.c @@ -207,7 +207,7 @@ _nl_load_locale_from_archive (int category, const char **namep) /* Cannot open the archive, for whatever reason. */ return NULL; - if (__fxstat64 (_STAT_VER, fd, &archive_stat) == -1) + if (__fstat64 (fd, &archive_stat) == -1) { /* stat failed, very strange. */ close_and_out: @@ -405,7 +405,7 @@ _nl_load_locale_from_archive (int category, const char **namep) /* Now verify we think this is really the same archive file we opened before. If it has been changed we cannot trust the header we read previously. */ - if (__fxstat64 (_STAT_VER, fd, &st) < 0 + if (__fstat64 (fd, &st) < 0 || st.st_size != archive_stat.st_size || st.st_mtime != archive_stat.st_mtime || st.st_dev != archive_stat.st_dev diff --git a/locale/loadlocale.c b/locale/loadlocale.c index 2fcb348d1d..82c745d9a2 100644 --- a/locale/loadlocale.c +++ b/locale/loadlocale.c @@ -180,7 +180,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category) /* Cannot open the file. */ return; - if (__builtin_expect (__fxstat64 (_STAT_VER, fd, &st), 0) < 0) + if (__builtin_expect (__fstat64 (fd, &st), 0) < 0) { puntfd: __close_nocancel_nostatus (fd); @@ -206,7 +206,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category) if (__builtin_expect (fd, 0) < 0) return; - if (__builtin_expect (__fxstat64 (_STAT_VER, fd, &st), 0) < 0) + if (__builtin_expect (__fstat64 (fd, &st), 0) < 0) goto puntfd; } |