chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: use usec_t and now()
[elogind.git]
/
src
/
libudev
/
libudev-device.c
diff --git
a/src/libudev/libudev-device.c
b/src/libudev/libudev-device.c
index 1bef70962c59d7b8a080a6b21090fcf22c644ca8..181a9d8eebf394135a10a0ea88e936500d705baf 100644
(file)
--- a/
src/libudev/libudev-device.c
+++ b/
src/libudev/libudev-device.c
@@
-67,7
+67,7
@@
struct udev_device {
struct udev_list sysattr_list;
struct udev_list tags_list;
unsigned long long int seqnum;
struct udev_list sysattr_list;
struct udev_list tags_list;
unsigned long long int seqnum;
- u
nsigned long long in
t usec_initialized;
+ u
sec_
t usec_initialized;
int devlink_priority;
int refcount;
dev_t devnum;
int devlink_priority;
int refcount;
dev_t devnum;
@@
-246,7
+246,7
@@
static int udev_device_set_devtype(struct udev_device *udev_device, const char *
return 0;
}
return 0;
}
-
static
int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsystem)
+int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsystem)
{
free(udev_device->subsystem);
udev_device->subsystem = strdup(subsystem);
{
free(udev_device->subsystem);
udev_device->subsystem = strdup(subsystem);
@@
-378,12
+378,12
@@
void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
next = strchr(slink, ' ');
while (next != NULL) {
next[0] = '\0';
next = strchr(slink, ' ');
while (next != NULL) {
next[0] = '\0';
- udev_device_add_devlink(udev_device, slink
, 0
);
+ udev_device_add_devlink(udev_device, slink);
slink = &next[1];
next = strchr(slink, ' ');
}
if (slink[0] != '\0')
slink = &next[1];
next = strchr(slink, ' ');
}
if (slink[0] != '\0')
- udev_device_add_devlink(udev_device, slink
, 0
);
+ udev_device_add_devlink(udev_device, slink);
} else if (startswith(property, "TAGS=")) {
char tags[UTIL_PATH_SIZE];
char *next;
} else if (startswith(property, "TAGS=")) {
char tags[UTIL_PATH_SIZE];
char *next;
@@
-503,7
+503,7
@@
int udev_device_read_db(struct udev_device *udev_device, const char *dbfile)
switch(line[0]) {
case 'S':
util_strscpyl(filename, sizeof(filename), "/dev/", val, NULL);
switch(line[0]) {
case 'S':
util_strscpyl(filename, sizeof(filename), "/dev/", val, NULL);
- udev_device_add_devlink(udev_device, filename
, 0
);
+ udev_device_add_devlink(udev_device, filename);
break;
case 'L':
udev_device_set_devlink_priority(udev_device, atoi(val));
break;
case 'L':
udev_device_set_devlink_priority(udev_device, atoi(val));
@@
-1124,7
+1124,7
@@
_public_ const char *udev_device_get_sysname(struct udev_device *udev_device)
*
* Get the instance number of the device.
*
*
* Get the instance number of the device.
*
- * Returns: the trailing number string of
of
the device name
+ * Returns: the trailing number string of the device name
**/
_public_ const char *udev_device_get_sysnum(struct udev_device *udev_device)
{
**/
_public_ const char *udev_device_get_sysnum(struct udev_device *udev_device)
{
@@
-1267,7
+1267,7
@@
_public_ const char *udev_device_get_action(struct udev_device *udev_device)
**/
_public_ unsigned long long int udev_device_get_usec_since_initialized(struct udev_device *udev_device)
{
**/
_public_ unsigned long long int udev_device_get_usec_since_initialized(struct udev_device *udev_device)
{
- u
nsigned long long
now_ts;
+ u
sec_t
now_ts;
if (udev_device == NULL)
return 0;
if (udev_device == NULL)
return 0;
@@
-1275,23
+1275,23
@@
_public_ unsigned long long int udev_device_get_usec_since_initialized(struct ud
udev_device_read_db(udev_device, NULL);
if (udev_device->usec_initialized == 0)
return 0;
udev_device_read_db(udev_device, NULL);
if (udev_device->usec_initialized == 0)
return 0;
- now_ts = now
_usec(
);
+ now_ts = now
(CLOCK_MONOTONIC
);
if (now_ts == 0)
return 0;
return now_ts - udev_device->usec_initialized;
}
if (now_ts == 0)
return 0;
return now_ts - udev_device->usec_initialized;
}
-u
nsigned long long
udev_device_get_usec_initialized(struct udev_device *udev_device)
+u
sec_t
udev_device_get_usec_initialized(struct udev_device *udev_device)
{
return udev_device->usec_initialized;
}
{
return udev_device->usec_initialized;
}
-void udev_device_set_usec_initialized(struct udev_device *udev_device, u
nsigned long long
usec_initialized)
+void udev_device_set_usec_initialized(struct udev_device *udev_device, u
sec_t
usec_initialized)
{
char num[32];
udev_device->usec_initialized = usec_initialized;
{
char num[32];
udev_device->usec_initialized = usec_initialized;
- snprintf(num, sizeof(num), "%llu", usec_initialized);
+ snprintf(num, sizeof(num), "%llu",
(unsigned long long)
usec_initialized);
udev_device_add_property(udev_device, "USEC_INITIALIZED", num);
}
udev_device_add_property(udev_device, "USEC_INITIALIZED", num);
}
@@
-1505,7
+1505,7
@@
int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode
return 0;
}
return 0;
}
-int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink
, int unique
)
+int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink)
{
struct udev_list_entry *list_entry;
{
struct udev_list_entry *list_entry;
@@
-1513,8
+1513,6
@@
int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink
list_entry = udev_list_entry_add(&udev_device->devlinks_list, devlink, NULL);
if (list_entry == NULL)
return -ENOMEM;
list_entry = udev_list_entry_add(&udev_device->devlinks_list, devlink, NULL);
if (list_entry == NULL)
return -ENOMEM;
- if (unique)
- udev_list_entry_set_num(list_entry, true);
return 0;
}
return 0;
}