shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 00:51:24 +03:00
Code

basic/locale-util: reduce variable scope

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-02-11 09:55:01 +01:00
parent 333ab199a1
commit 0eacd1852a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/basic/locale-util.c
View File

@ -98,7 +98,6 @@ static int add_locales_from_archive(Set *locales) {
_cleanup_close_ int fd = -1; _cleanup_close_ int fd = -1;
size_t sz = 0; size_t sz = 0;
struct stat st; struct stat st;
size_t i;
int r; int r;
fd = open("/usr/lib/locale/locale-archive", O_RDONLY|O_NOCTTY|O_CLOEXEC); fd = open("/usr/lib/locale/locale-archive", O_RDONLY|O_NOCTTY|O_CLOEXEC);
@ -129,7 +128,7 @@ static int add_locales_from_archive(Set *locales) {
} }
e = (const struct namehashent*) ((const uint8_t*) p + h->namehash_offset); e = (const struct namehashent*) ((const uint8_t*) p + h->namehash_offset);
for (i = 0; i < h->namehash_size; i++) { for (size_t i = 0; i < h->namehash_size; i++) {
char *z; char *z;
if (e[i].locrec_offset == 0) if (e[i].locrec_offset == 0)
@ -434,12 +433,10 @@ const char *special_glyph(SpecialGlyph code) {
} }
void locale_variables_free(char *l[_VARIABLE_LC_MAX]) { void locale_variables_free(char *l[_VARIABLE_LC_MAX]) {
LocaleVariable i;
if (!l) if (!l)
return; return;
for (i = 0; i < _VARIABLE_LC_MAX; i++) for (LocaleVariable i = 0; i < _VARIABLE_LC_MAX; i++)
l[i] = mfree(l[i]); l[i] = mfree(l[i]);
} }