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: remove seqnum API and all assumptions about seqnums
[elogind.git]
/
src
/
udev
/
udev-event.c
diff --git
a/src/udev/udev-event.c
b/src/udev/udev-event.c
index 228232bf79f3f6ddfa4757308f77428e9a342443..5998be2f77862dce55a2b1c8a185cad763a100f7 100644
(file)
--- a/
src/udev/udev-event.c
+++ b/
src/udev/udev-event.c
@@
-39,7
+39,7
@@
struct udev_event *udev_event_new(struct udev_device *dev)
struct udev *udev = udev_device_get_udev(dev);
struct udev_event *event;
struct udev *udev = udev_device_get_udev(dev);
struct udev_event *event;
- event =
calloc(1, sizeof(struct udev_event)
);
+ event =
new0(struct udev_event, 1
);
if (event == NULL)
return NULL;
event->dev = dev;
if (event == NULL)
return NULL;
event->dev = dev;
@@
-254,6
+254,8
@@
subst:
cpos++;
while (isspace(cpos[0]))
cpos++;
cpos++;
while (isspace(cpos[0]))
cpos++;
+ if (cpos[0] == '\0')
+ break;
}
if (i > 0) {
log_error("requested part of result string not found");
}
if (i > 0) {
log_error("requested part of result string not found");
@@
-748,7
+750,7
@@
out:
static int rename_netif(struct udev_event *event)
{
struct udev_device *dev = event->dev;
static int rename_netif(struct udev_event *event)
{
struct udev_device *dev = event->dev;
- _cleanup_
sd_
rtnl_unref_ sd_rtnl *rtnl = NULL;
+ _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
char name[IFNAMSIZ];
const char *oldname;
int r;
char name[IFNAMSIZ];
const char *oldname;
int r;
@@
-760,7
+762,7
@@
static int rename_netif(struct udev_event *event)
strscpy(name, IFNAMSIZ, event->name);
strscpy(name, IFNAMSIZ, event->name);
- r = sd_rtnl_open(
0, &rtnl
);
+ r = sd_rtnl_open(
&rtnl, 0
);
if (r < 0)
return r;
if (r < 0)
return r;