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

Merge pull request #11366 from keszybz/a-few-unrelated-cleanups

Browse source 
A few unrelated cleanups
This commit is contained in:
Yu Watanabe 2019-01-10 14:25:25 +09:00 committed by GitHub
parent 65641b3cdc 690f02f4b8
commit 943179fe2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 70 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);

71
src/libsystemd/sd-device/sd-device.c
View file

@ -29,7 +29,7 @@
#include "util.h"
int device_new_aux(sd_device **ret) {
sd_device *device = NULL;
sd_device *device;
assert(ret);
@ -205,9 +205,7 @@ int device_set_syspath(sd_device *device, const char *_syspath, bool verify) {
return r;
free_and_replace(device->syspath, syspath);
device->devpath = devpath;
return 0;
}
@ -227,7 +225,6 @@ _public_ int sd_device_new_from_syspath(sd_device **ret, const char *syspath) {
return r;
*ret = TAKE_PTR(device);
return 0;
}
@ -610,8 +607,8 @@ _public_ int sd_device_new_from_device_id(sd_device **ret, const char *id) {
return sd_device_new_from_devnum(ret, id[0], devt);
}
case 'n':
{
case 'n': {
_cleanup_(sd_device_unrefp) sd_device *device = NULL;
_cleanup_close_ int sk = -1;
struct ifreq ifr = {};
@ -642,11 +639,10 @@ _public_ int sd_device_new_from_device_id(sd_device **ret, const char *id) {
return -ENODEV;
*ret = TAKE_PTR(device);
return 0;
}
case '+':
{
case '+': {
char subsys[PATH_MAX];
char *sysname;
@ -660,6 +656,7 @@ _public_ int sd_device_new_from_device_id(sd_device **ret, const char *id) {
return sd_device_new_from_subsystem_sysname(ret, subsys, sysname);
}
default:
return -EINVAL;
}
@ -727,7 +724,6 @@ _public_ int sd_device_get_parent(sd_device *child, sd_device **ret) {
return -ENOENT;
*ret = child->parent;
return 0;
}
@ -746,11 +742,8 @@ int device_set_subsystem(sd_device *device, const char *_subsystem) {
if (r < 0)
return r;
free_and_replace(device->subsystem, subsystem);
device->subsystem_set = true;
return 0;
return free_and_replace(device->subsystem, subsystem);
}
static int device_set_drivers_subsystem(sd_device *device, const char *_subsystem) {
@ -769,9 +762,7 @@ static int device_set_drivers_subsystem(sd_device *device, const char *_subsyste
if (r < 0)
return r;
free_and_replace(device->driver_subsystem, subsystem);
return 0;
return free_and_replace(device->driver_subsystem, subsystem);
}
_public_ int sd_device_get_subsystem(sd_device *device, const char **ret) {
@ -836,7 +827,6 @@ _public_ int sd_device_get_subsystem(sd_device *device, const char **ret) {
return -ENOENT;
*ret = device->subsystem;
return 0;
}
@ -886,7 +876,6 @@ _public_ int sd_device_get_parent_with_subsystem_devtype(sd_device *child, const
return r;
*ret = parent;
return 0;
}
@ -923,11 +912,8 @@ int device_set_driver(sd_device *device, const char *_driver) {
if (r < 0)
return r;
free_and_replace(device->driver, driver);
device->driver_set = true;
return 0;
return free_and_replace(device->driver, driver);
}
_public_ int sd_device_get_driver(sd_device *device, const char **ret) {
@ -960,7 +946,6 @@ _public_ int sd_device_get_driver(sd_device *device, const char **ret) {
return -ENOENT;
*ret = device->driver;
return 0;
}
@ -972,7 +957,6 @@ _public_ int sd_device_get_devpath(sd_device *device, const char **devpath) {
assert(device->devpath[0] == '/');
*devpath = device->devpath;
return 0;
}
@ -992,7 +976,6 @@ _public_ int sd_device_get_devname(sd_device *device, const char **devname) {
assert(path_startswith(device->devname, "/dev/"));
*devname = device->devname;
return 0;
}
@ -1033,13 +1016,9 @@ static int device_set_sysname(sd_device *device) {
if (len == 0)
sysnum = NULL;
free_and_replace(device->sysname, sysname);
device->sysnum = sysnum;
device->sysname_set = true;
return 0;
device->sysnum = sysnum;
return free_and_replace(device->sysname, sysname);
}
_public_ int sd_device_get_sysname(sd_device *device, const char **ret) {
@ -1057,7 +1036,6 @@ _public_ int sd_device_get_sysname(sd_device *device, const char **ret) {
assert_return(device->sysname, -ENOENT);
*ret = device->sysname;
return 0;
}
@ -1077,7 +1055,6 @@ _public_ int sd_device_get_sysnum(sd_device *device, const char **ret) {
return -ENOENT;
*ret = device->sysnum;
return 0;
}
@ -1286,7 +1263,6 @@ int device_get_id_filename(sd_device *device, const char **ret) {
}
*ret = device->id_filename;
return 0;
}
@ -1418,7 +1394,6 @@ _public_ int sd_device_get_usec_since_initialized(sd_device *device, uint64_t *u
return -EIO;
*usec = now_ts - device->usec_initialized;
return 0;
}
@ -1561,7 +1536,6 @@ _public_ const char *sd_device_get_property_first(sd_device *device, const char
if (_value)
*_value = value;
return key;
}
@ -1583,7 +1557,6 @@ _public_ const char *sd_device_get_property_next(sd_device *device, const char *
if (_value)
*_value = value;
return key;
}
@ -1694,7 +1667,6 @@ _public_ int sd_device_get_property_value(sd_device *device, const char *key, co
if (_value)
*_value = value;
return 0;
}
@ -1721,8 +1693,7 @@ static int device_add_sysattr_value(sd_device *device, const char *_key, char *v
r = hashmap_put(device->sysattr_values, key, value);
if (r < 0)
return r;
key = NULL;
TAKE_PTR(key);
return 0;
}
@ -1739,7 +1710,6 @@ static int device_get_sysattr_value(sd_device *device, const char *_key, const c
if (_value)
*_value = value;
return 0;
}
@ -1823,14 +1793,11 @@ _public_ int sd_device_get_sysattr_value(sd_device *device, const char *sysattr,
static void device_remove_sysattr_value(sd_device *device, const char *_key) {
_cleanup_free_ char *key = NULL;
_cleanup_free_ char *value = NULL;
assert(device);
assert(_key);
value = hashmap_remove2(device->sysattr_values, _key, (void **) &key);
return;
free(hashmap_remove2(device->sysattr_values, _key, (void **) &key));
}
/* set the attribute and save it in the cache. If a NULL value is passed the
@ -1846,7 +1813,6 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
if (!_value) {
device_remove_sysattr_value(device, sysattr);
return 0;
}
@ -1877,23 +1843,22 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
if (r == -EISDIR)
return r;
free(value);
value = strdup("");
if (!value)
return -ENOMEM;
r = free_and_strdup(&value, "");
if (r < 0)
return r;
r = device_add_sysattr_value(device, sysattr, value);
if (r < 0)
return r;
TAKE_PTR(value);
value = NULL;
return -ENXIO;
}
r = device_add_sysattr_value(device, sysattr, value);
if (r < 0)
return r;
TAKE_PTR(value);
value = NULL;
return 0;
}

5
src/machine/machinectl.c
View file

@ -1309,7 +1309,7 @@ static int on_machine_removed(sd_bus_message *m, void *userdata, sd_bus_error *r
static int process_forward(sd_event *event, PTYForward **forward, int master, PTYForwardFlags flags, const char *name) {
char last_char = 0;
bool machine_died;
int ret = 0, r;
int r;
assert(event);
assert(master >= 0);
@ -1355,8 +1355,7 @@ static int process_forward(sd_event *event, PTYForward **forward, int master, PT
log_info("Connection to machine %s terminated.", name);
}
sd_event_get_exit_code(event, &ret);
return ret;
return 0;
}
static int parse_machine_uid(const char *spec, const char **machine, char **uid) {

4
src/resolve/resolved.c
View file

@ -81,9 +81,7 @@ static int run(int argc, char *argv[]) {
if (r < 0)
return log_error_errno(r, "Event loop failed: %m");
(void) sd_event_get_exit_code(m->event, &r);
return r;
return 0;
}
DEFINE_MAIN_FUNCTION(run);

4
src/timesync/timesyncd.c
View file

@ -169,9 +169,7 @@ static int run(int argc, char *argv[]) {
log_debug_errno(r, "Failed to touch %s, ignoring: %m", CLOCK_FILE);
}
(void) sd_event_get_exit_code(m->event, &r);
return r;
return 0;
}
DEFINE_MAIN_FUNCTION(run);

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;