chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
docs: remove unneeded the's in gudev docs
[elogind.git]
/
src
/
libudev
/
libudev-device.c
diff --git
a/src/libudev/libudev-device.c
b/src/libudev/libudev-device.c
index eb43668c56a36098c5602bd8ac7d110758d415cb..9558ac36d2a4fb445e1c06b037ddf75dbe8d16d5 100644
(file)
--- a/
src/libudev/libudev-device.c
+++ b/
src/libudev/libudev-device.c
@@
-36,13
+36,15
@@
#include "libudev.h"
#include "libudev-private.h"
#include "libudev.h"
#include "libudev-private.h"
+static int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode);
+
/**
* SECTION:libudev-device
* @short_description: kernel sys devices
*
* Representation of kernel sys devices. Devices are uniquely identified
* by their syspath, every device has exactly one path in the kernel sys
/**
* SECTION:libudev-device
* @short_description: kernel sys devices
*
* Representation of kernel sys devices. Devices are uniquely identified
* by their syspath, every device has exactly one path in the kernel sys
- * filesystem. Devices usually belong to a kernel subsystem, and
and
have
+ * filesystem. Devices usually belong to a kernel subsystem, and have
* a unique name inside that subsystem.
*/
* a unique name inside that subsystem.
*/
@@
-534,7
+536,7
@@
int udev_device_read_db(struct udev_device *udev_device, const char *dbfile)
f = fopen(dbfile, "re");
if (f == NULL) {
udev_dbg(udev_device->udev, "no db file to read %s: %m\n", dbfile);
f = fopen(dbfile, "re");
if (f == NULL) {
udev_dbg(udev_device->udev, "no db file to read %s: %m\n", dbfile);
- return -
1
;
+ return -
errno
;
}
udev_device->is_initialized = true;
}
udev_device->is_initialized = true;
@@
-591,7
+593,7
@@
int udev_device_read_uevent_file(struct udev_device *udev_device)
strscpyl(filename, sizeof(filename), udev_device->syspath, "/uevent", NULL);
f = fopen(filename, "re");
if (f == NULL)
strscpyl(filename, sizeof(filename), udev_device->syspath, "/uevent", NULL);
f = fopen(filename, "re");
if (f == NULL)
- return -
1
;
+ return -
errno
;
udev_device->uevent_loaded = true;
while (fgets(line, sizeof(line), f)) {
udev_device->uevent_loaded = true;
while (fgets(line, sizeof(line), f)) {
@@
-980,9
+982,8
@@
static struct udev_device *device_new_from_parent(struct udev_device *udev_devic
* Find the next parent device, and fill in information from the sys
* device and the udev database entry.
*
* Find the next parent device, and fill in information from the sys
* device and the udev database entry.
*
- * The returned the device is not referenced. It is attached to the
- * child device, and will be cleaned up when the child device
- * is cleaned up.
+ * Returned device is not referenced. It is attached to the child
+ * device, and will be cleaned up when the child device is cleaned up.
*
* It is not necessarily just the upper level directory, empty or not
* recognized sys directories are ignored.
*
* It is not necessarily just the upper level directory, empty or not
* recognized sys directories are ignored.
@@
-1016,9
+1017,8
@@
_public_ struct udev_device *udev_device_get_parent(struct udev_device *udev_dev
* If devtype is #NULL, only subsystem is checked, and any devtype will
* match.
*
* If devtype is #NULL, only subsystem is checked, and any devtype will
* match.
*
- * The returned the device is not referenced. It is attached to the
- * child device, and will be cleaned up when the child device
- * is cleaned up.
+ * Returned device is not referenced. It is attached to the child
+ * device, and will be cleaned up when the child device is cleaned up.
*
* It can be called as many times as needed, without caring about
* references.
*
* It can be called as many times as needed, without caring about
* references.
@@
-1088,7
+1088,7
@@
_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.
+ * Returns:
#NULL
**/
_public_ struct udev_device *udev_device_unref(struct udev_device *udev_device)
{
**/
_public_ struct udev_device *udev_device_unref(struct udev_device *udev_device)
{
@@
-1096,7
+1096,7
@@
_public_ struct udev_device *udev_device_unref(struct udev_device *udev_device)
return NULL;
udev_device->refcount--;
if (udev_device->refcount > 0)
return NULL;
udev_device->refcount--;
if (udev_device->refcount > 0)
- return
udev_device
;
+ return
NULL
;
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);
@@
-1519,13
+1519,13
@@
static int udev_device_sysattr_list_read(struct udev_device *udev_device)
int num = 0;
if (udev_device == NULL)
int num = 0;
if (udev_device == NULL)
- return -
1
;
+ return -
EINVAL
;
if (udev_device->sysattr_list_read)
return 0;
dir = opendir(udev_device_get_syspath(udev_device));
if (!dir)
if (udev_device->sysattr_list_read)
return 0;
dir = opendir(udev_device_get_syspath(udev_device));
if (!dir)
- return -
1
;
+ return -
errno
;
for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
char path[UTIL_PATH_SIZE];
for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
char path[UTIL_PATH_SIZE];
@@
-1611,7
+1611,7
@@
int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath
return 0;
}
return 0;
}
-int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode)
+
static
int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode)
{
free(udev_device->devnode);
if (devnode[0] != '/') {
{
free(udev_device->devnode);
if (devnode[0] != '/') {