picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix a few comments

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-01-04 21:46:54 +01:00
parent 2cfb197890
commit 1b2a7d92af
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/basic/btrfs-util.c
View file

@ -941,7 +941,7 @@ int btrfs_qgroup_destroy_recursive(int fd, uint64_t qgroupid) {
/* Destroys the specified qgroup, but unassigns it from all
* its parents first. Also, it recursively destroys all
* qgroups it is assgined to that have the same id part of the
* qgroups it is assigned to that have the same id part of the
* qgroupid as the specified group. */
r = btrfs_qgroupid_split(qgroupid, NULL, &subvol_id);

8
src/udev/net/link-config.c
View file

@ -256,13 +256,13 @@ int link_config_get(link_config_ctx *ctx, sd_device *device, link_config **ret)
if (name_assign_type == NET_NAME_ENUM) {
log_warning("Config file %s applies to device based on potentially unpredictable interface name '%s'",
link->filename, sysname);
link->filename, sysname);
*ret = link;
return 0;
} else if (name_assign_type == NET_NAME_RENAMED) {
log_warning("Config file %s matches device based on renamed interface name '%s', ignoring",
link->filename, sysname);
link->filename, sysname);
continue;
}
@ -272,13 +272,11 @@ int link_config_get(link_config_ctx *ctx, sd_device *device, link_config **ret)
link->filename, sysname);
*ret = link;
return 0;
}
}
*ret = NULL;
return -ENOENT;
}
@ -303,7 +301,7 @@ static bool should_rename(sd_device *device, bool respect_predictable) {
unsigned type;
int r;
/* if we can't get the assgin type, assume we should rename */
/* if we can't get the assign type, assume we should rename */
if (sd_device_get_sysattr_value(device, "name_assign_type", &s) < 0)
return true;

4
src/udev/udev-builtin-net_id.c
View file

@ -460,7 +460,7 @@ static int dev_pci_slot(sd_device *dev, struct netnames *names) {
}
}
/* kernel provided front panel port name for multiple port PCI device */
/* kernel provided front panel port name for multi-port PCI device */
(void) sd_device_get_sysattr_value(dev, "phys_port_name", &port_name);
/* compose a name based on the raw kernel's PCI bus, slot numbers */
@ -478,7 +478,7 @@ static int dev_pci_slot(sd_device *dev, struct netnames *names) {
if (l == 0)
names->pci_path[0] = '\0';
/* ACPI _SUN — slot user number */
/* ACPI _SUN — slot user number */
r = sd_device_new_from_subsystem_sysname(&pci, "subsystem", "pci");
if (r < 0)
return r;