chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f775ccf
)
builtin: rename load()/unload() to init()/exit()
author
Kay Sievers
<kay.sievers@vrfy.org>
Sat, 24 Dec 2011 16:58:52 +0000
(17:58 +0100)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Sat, 24 Dec 2011 16:58:52 +0000
(17:58 +0100)
udev/udev-builtin-kmod.c
patch
|
blob
|
history
udev/udev-builtin.c
patch
|
blob
|
history
udev/udev.h
patch
|
blob
|
history
udev/udevadm-test-builtin.c
patch
|
blob
|
history
udev/udevadm-test.c
patch
|
blob
|
history
udev/udevd.c
patch
|
blob
|
history
diff --git
a/udev/udev-builtin-kmod.c
b/udev/udev-builtin-kmod.c
index 10afcd5db08d499e7edbaae0ac6924914b8a66ba..8e7a50a02046e4978ac159c7a63567a298054d77 100644
(file)
--- a/
udev/udev-builtin-kmod.c
+++ b/
udev/udev-builtin-kmod.c
@@
-2,7
+2,7
@@
* load kernel modules
*
* Copyright (C) 2011 Kay Sievers <kay.sievers@vrfy.org>
* load kernel modules
*
* Copyright (C) 2011 Kay Sievers <kay.sievers@vrfy.org>
- * Copyright (C) 2011
ProFUSION embedded systems
+ * Copyright (C) 2011 ProFUSION embedded systems
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-337,7
+337,7
@@
static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool te
return EXIT_SUCCESS;
}
return EXIT_SUCCESS;
}
-static int builtin_kmod_
load
(struct udev *udev)
+static int builtin_kmod_
init
(struct udev *udev)
{
kmod_unref(ctx);
ctx = kmod_new(NULL, NULL);
{
kmod_unref(ctx);
ctx = kmod_new(NULL, NULL);
@@
-348,7
+348,7
@@
static int builtin_kmod_load(struct udev *udev)
return 0;
}
return 0;
}
-static int builtin_kmod_
unload
(struct udev *udev)
+static int builtin_kmod_
exit
(struct udev *udev)
{
ctx = kmod_unref(ctx);
info(udev, "unload module index\n");
{
ctx = kmod_unref(ctx);
info(udev, "unload module index\n");
@@
-358,8
+358,8
@@
static int builtin_kmod_unload(struct udev *udev)
const struct udev_builtin udev_builtin_kmod = {
.name = "kmod",
.cmd = builtin_kmod,
const struct udev_builtin udev_builtin_kmod = {
.name = "kmod",
.cmd = builtin_kmod,
- .
load = builtin_kmod_load
,
- .
unload = builtin_kmod_unload
,
+ .
init = builtin_kmod_init
,
+ .
exit = builtin_kmod_exit
,
.help = "kernel module loader",
.run_once = false,
};
.help = "kernel module loader",
.run_once = false,
};
diff --git
a/udev/udev-builtin.c
b/udev/udev-builtin.c
index 6dfd006710ee8cbc89b5c4e1e48de81eb5ef4a2a..baf09b91b9c61c86af9838dea34d3b603edea68c 100644
(file)
--- a/
udev/udev-builtin.c
+++ b/
udev/udev-builtin.c
@@
-33,23
+33,23
@@
static const struct udev_builtin *builtins[] = {
[UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
};
[UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
};
-int udev_builtin_
load
(struct udev *udev)
+int udev_builtin_
init
(struct udev *udev)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(builtins); i++)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(builtins); i++)
- if (builtins[i]->
load
)
- builtins[i]->
load
(udev);
+ if (builtins[i]->
init
)
+ builtins[i]->
init
(udev);
return 0;
}
return 0;
}
-int udev_builtin_
unload
(struct udev *udev)
+int udev_builtin_
exit
(struct udev *udev)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(builtins); i++)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(builtins); i++)
- if (builtins[i]->
unload
)
- builtins[i]->
unload
(udev);
+ if (builtins[i]->
exit
)
+ builtins[i]->
exit
(udev);
return 0;
}
return 0;
}
diff --git
a/udev/udev.h
b/udev/udev.h
index aafa15cd31ce53a3981aa03daab80a3ec5d2c3c1..430958a457407834f0c921556831db95e9761ecb 100644
(file)
--- a/
udev/udev.h
+++ b/
udev/udev.h
@@
-159,8
+159,8
@@
struct udev_builtin {
const char *name;
int (*cmd)(struct udev_device *dev, int argc, char *argv[], bool test);
const char *help;
const char *name;
int (*cmd)(struct udev_device *dev, int argc, char *argv[], bool test);
const char *help;
- int (*
load
)(struct udev *udev);
- int (*
unload
)(struct udev *udev);
+ int (*
init
)(struct udev *udev);
+ int (*
exit
)(struct udev *udev);
bool run_once;
};
extern const struct udev_builtin udev_builtin_path_id;
bool run_once;
};
extern const struct udev_builtin udev_builtin_path_id;
diff --git
a/udev/udevadm-test-builtin.c
b/udev/udevadm-test-builtin.c
index ea1bcbcb07d17de17c9a7a51e4a5d6a375c3b036..66043c76d6aedb6fb7021f850e25e8ff7491aaff 100644
(file)
--- a/
udev/udevadm-test-builtin.c
+++ b/
udev/udevadm-test-builtin.c
@@
-86,7
+86,7
@@
static int adm_builtin(struct udev *udev, int argc, char *argv[])
goto out;
}
goto out;
}
- udev_builtin_
load
(udev);
+ udev_builtin_
init
(udev);
cmd = udev_builtin_lookup(command);
if (cmd >= UDEV_BUILTIN_MAX) {
cmd = udev_builtin_lookup(command);
if (cmd >= UDEV_BUILTIN_MAX) {
@@
-116,7
+116,7
@@
static int adm_builtin(struct udev *udev, int argc, char *argv[])
}
out:
udev_device_unref(dev);
}
out:
udev_device_unref(dev);
- udev_builtin_
unload
(udev);
+ udev_builtin_
exit
(udev);
return rc;
}
return rc;
}
diff --git
a/udev/udevadm-test.c
b/udev/udevadm-test.c
index a7c6226a567d1c95bc7315f631329133e3872763..851500527fc94678be0a1f4a0e9f1b6f1f3faae4 100644
(file)
--- a/
udev/udevadm-test.c
+++ b/
udev/udevadm-test.c
@@
-103,7
+103,7
@@
static int adm_test(struct udev *udev, int argc, char *argv[])
sigprocmask(SIG_SETMASK, NULL, &sigmask_orig);
sigprocmask(SIG_SETMASK, NULL, &sigmask_orig);
- udev_builtin_
load
(udev);
+ udev_builtin_
init
(udev);
rules = udev_rules_new(udev, resolve_names);
if (rules == NULL) {
rules = udev_rules_new(udev, resolve_names);
if (rules == NULL) {
@@
-161,7
+161,7
@@
out:
udev_event_unref(event);
udev_device_unref(dev);
udev_rules_unref(rules);
udev_event_unref(event);
udev_device_unref(dev);
udev_rules_unref(rules);
- udev_builtin_
unload
(udev);
+ udev_builtin_
exit
(udev);
return rc;
}
return rc;
}
diff --git
a/udev/udevd.c
b/udev/udevd.c
index a5ef24417d821957a919aad1505ce33e08e21a15..3a39b6a50ab71709d15ddf39650f8d13787434fa 100644
(file)
--- a/
udev/udevd.c
+++ b/
udev/udevd.c
@@
-1513,7
+1513,7
@@
int main(int argc, char *argv[])
}
fd_worker = worker_watch[READ_END];
}
fd_worker = worker_watch[READ_END];
- udev_builtin_
load
(udev);
+ udev_builtin_
init
(udev);
rules = udev_rules_new(udev, resolve_names);
if (rules == NULL) {
rules = udev_rules_new(udev, resolve_names);
if (rules == NULL) {
@@
-1702,8
+1702,8
@@
int main(int argc, char *argv[])
}
reload_config = 0;
}
reload_config = 0;
- udev_builtin_
unload
(udev);
- udev_builtin_
load
(udev);
+ udev_builtin_
exit
(udev);
+ udev_builtin_
init
(udev);
}
}
}
}
@@
-1717,7
+1717,7
@@
exit_daemonize:
worker_list_cleanup(udev);
event_queue_cleanup(udev, EVENT_UNDEF);
udev_rules_unref(rules);
worker_list_cleanup(udev);
event_queue_cleanup(udev, EVENT_UNDEF);
udev_rules_unref(rules);
- udev_builtin_
unload
(udev);
+ udev_builtin_
exit
(udev);
if (fd_signal >= 0)
close(fd_signal);
if (worker_watch[READ_END] >= 0)
if (fd_signal >= 0)
close(fd_signal);
if (worker_watch[READ_END] >= 0)