chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
readahead: disable collect/replay during system updates
[elogind.git]
/
src
/
libudev
/
libudev-device.c
diff --git
a/src/libudev/libudev-device.c
b/src/libudev/libudev-device.c
index 97cf6654eee94a0567aa3889f8008eeb6799c679..a8277d1363dc4b039d20dd6a01bd4c1edee5f337 100644
(file)
--- a/
src/libudev/libudev-device.c
+++ b/
src/libudev/libudev-device.c
@@
-485,7
+485,7
@@
int udev_device_read_db(struct udev_device *udev_device, const char *dbfile)
f = fopen(dbfile, "re");
if (f == NULL) {
f = fopen(dbfile, "re");
if (f == NULL) {
- dbg(udev_device->udev, "no db file to read %s: %m\n", dbfile);
+
udev_
dbg(udev_device->udev, "no db file to read %s: %m\n", dbfile);
return -1;
}
udev_device->is_initialized = true;
return -1;
}
udev_device->is_initialized = true;
@@
-525,7
+525,7
@@
int udev_device_read_db(struct udev_device *udev_device, const char *dbfile)
}
fclose(f);
}
fclose(f);
- dbg(udev_device->udev, "device %p filled with db file data\n", udev_device);
+
udev_
dbg(udev_device->udev, "device %p filled with db file data\n", udev_device);
return 0;
}
return 0;
}
@@
-643,7
+643,7
@@
_public_ struct udev_device *udev_device_new_from_syspath(struct udev *udev, con
/* path starts in sys */
if (!startswith(syspath, TEST_PREFIX "/sys")) {
/* path starts in sys */
if (!startswith(syspath, TEST_PREFIX "/sys")) {
- dbg(udev, "not in sys :%s\n", syspath);
+
udev_
dbg(udev, "not in sys :%s\n", syspath);
return NULL;
}
return NULL;
}
@@
-675,7
+675,7
@@
_public_ struct udev_device *udev_device_new_from_syspath(struct udev *udev, con
return NULL;
udev_device_set_syspath(udev_device, path);
return NULL;
udev_device_set_syspath(udev_device, path);
- dbg(udev, "device %p has devpath '%s'\n", udev_device, udev_device_get_devpath(udev_device));
+
udev_
dbg(udev, "device %p has devpath '%s'\n", udev_device, udev_device_get_devpath(udev_device));
return udev_device;
}
return udev_device;
}
@@
-877,7
+877,7
@@
_public_ struct udev_device *udev_device_new_from_environment(struct udev *udev)
udev_device_add_property_from_string_parse(udev_device, environ[i]);
if (udev_device_add_property_from_string_parse_finish(udev_device) < 0) {
udev_device_add_property_from_string_parse(udev_device, environ[i]);
if (udev_device_add_property_from_string_parse_finish(udev_device) < 0) {
- dbg(udev, "missing values, invalid device\n");
+
udev_
dbg(udev, "missing values, invalid device\n");
udev_device_unref(udev_device);
udev_device = NULL;
}
udev_device_unref(udev_device);
udev_device = NULL;
}
@@
-1022,14
+1022,15
@@
_public_ struct udev_device *udev_device_ref(struct udev_device *udev_device)
* Drop a reference of a udev device. If the refcount reaches zero,
* the resources of the device will be released.
*
* Drop a reference of a udev device. If the refcount reaches zero,
* the resources of the device will be released.
*
+ * Returns: the passed udev device if it has still an active reference, or #NULL otherwise.
**/
**/
-_public_
void
udev_device_unref(struct udev_device *udev_device)
+_public_
struct udev_device *
udev_device_unref(struct udev_device *udev_device)
{
if (udev_device == NULL)
{
if (udev_device == NULL)
- return;
+ return
NULL
;
udev_device->refcount--;
if (udev_device->refcount > 0)
udev_device->refcount--;
if (udev_device->refcount > 0)
- return;
+ return
udev_device
;
if (udev_device->parent_device != NULL)
udev_device_unref(udev_device->parent_device);
free(udev_device->syspath);
if (udev_device->parent_device != NULL)
udev_device_unref(udev_device->parent_device);
free(udev_device->syspath);
@@
-1049,6
+1050,7
@@
_public_ void udev_device_unref(struct udev_device *udev_device)
free(udev_device->envp);
free(udev_device->monitor_buf);
free(udev_device);
free(udev_device->envp);
free(udev_device->monitor_buf);
free(udev_device);
+ return NULL;
}
/**
}
/**