lib/list: remove LIST_HEAD macro
* the variable definition with hidden type is always horrible, for example: int func() { LIST_HEAD(foo); ... } the more readable is: int func() { struct list_head foo; INIT_LIST_HEAD(&foo); ... } * the name LIST_HEAD conflict with /usr/include/sys/queue.h * we use it only on two places in sulogin Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
11e1097e6c
commit
5d74cf0092
|
@ -33,11 +33,6 @@ struct list_head {
|
||||||
struct list_head *next, *prev;
|
struct list_head *next, *prev;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define LIST_HEAD_INIT(name) { &(name), &(name) }
|
|
||||||
|
|
||||||
#define LIST_HEAD(name) \
|
|
||||||
struct list_head name = LIST_HEAD_INIT(name)
|
|
||||||
|
|
||||||
#define INIT_LIST_HEAD(ptr) do { \
|
#define INIT_LIST_HEAD(ptr) do { \
|
||||||
(ptr)->next = (ptr); (ptr)->prev = (ptr); \
|
(ptr)->next = (ptr); (ptr)->prev = (ptr); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
|
@ -802,8 +802,7 @@ int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
char *name = NULL;
|
char *name = NULL;
|
||||||
int fd, re;
|
int fd, re;
|
||||||
LIST_HEAD(consoles);
|
struct list_head *p, consoles;
|
||||||
struct list_head *p;
|
|
||||||
|
|
||||||
if (argc == 2) {
|
if (argc == 2) {
|
||||||
name = argv[1];
|
name = argv[1];
|
||||||
|
@ -816,6 +815,7 @@ int main(int argc, char *argv[])
|
||||||
if (!name)
|
if (!name)
|
||||||
errx(EXIT_FAILURE, "usage: %s [<tty>]\n", program_invocation_short_name);
|
errx(EXIT_FAILURE, "usage: %s [<tty>]\n", program_invocation_short_name);
|
||||||
|
|
||||||
|
INIT_LIST_HEAD(&consoles);
|
||||||
re = detect_consoles(name, fd, &consoles);
|
re = detect_consoles(name, fd, &consoles);
|
||||||
|
|
||||||
list_for_each(p, &consoles) {
|
list_for_each(p, &consoles) {
|
||||||
|
|
|
@ -827,8 +827,7 @@ static void usage(FILE *out)
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
LIST_HEAD(consoles);
|
struct list_head *ptr, consoles;
|
||||||
struct list_head *ptr;
|
|
||||||
struct console *con;
|
struct console *con;
|
||||||
char *tty = NULL;
|
char *tty = NULL;
|
||||||
struct passwd *pwd;
|
struct passwd *pwd;
|
||||||
|
@ -849,6 +848,8 @@ int main(int argc, char **argv)
|
||||||
{ NULL, 0, 0, 0 }
|
{ NULL, 0, 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
INIT_LIST_HEAD(&consoles);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If we are init we need to set up a own session.
|
* If we are init we need to set up a own session.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue