SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virt: move array iterators to smaller scope, and use right type

Browse Source
This commit is contained in:
Lennart Poettering
2022-04-04 11:36:26 +02:00
parent 1b86c7c59e
commit 0ee2d5b2a9
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/virt.c
+2 -5
View File
@@ -173,7 +173,6 @@ static Virtualization detect_vm_dmi_vendor(void) {
for (size_t i = 0; i < ELEMENTSOF(dmi_vendors); i++) {
_cleanup_free_ char *s = NULL;
unsigned j;
r = read_one_line_file(dmi_vendors[i], &s);
if (r < 0) {
@@ -183,7 +182,7 @@ static Virtualization detect_vm_dmi_vendor(void) {
return r;
}
for (j = 0; j < ELEMENTSOF(dmi_vendor_table); j++)
for (size_t j = 0; j < ELEMENTSOF(dmi_vendor_table); j++)
if (startswith(s, dmi_vendor_table[j].vendor)) {
log_debug("Virtualization %s found in DMI (%s)", s, dmi_vendors[i]);
return dmi_vendor_table[j].id;
@@ -610,8 +609,6 @@ static int running_in_cgroupns(void) {
}
static Virtualization detect_container_files(void) {
unsigned i;
static const struct {
const char *file_path;
Virtualization id;
@@ -624,7 +621,7 @@ static Virtualization detect_container_files(void) {
{ "/.dockerenv", VIRTUALIZATION_DOCKER },
};
for (i = 0; i < ELEMENTSOF(container_file_table); i++) {
for (size_t i = 0; i < ELEMENTSOF(container_file_table); i++) {
if (access(container_file_table[i].file_path, F_OK) >= 0)
return container_file_table[i].id;