From ab49725fd8587ef2b90dd0a67b2c915bc772d089 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 7 Nov 2013 14:56:31 +0100 Subject: machine: move symbols referenced by shared code from main to shared file With --enable-address-sanitizer we get: machined-dbus.c:228: undefined reference to 'manager_add_machine' --- src/machine/machined.c | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'src/machine/machined.c') diff --git a/src/machine/machined.c b/src/machine/machined.c index a5f529384..d6dd984e7 100644 --- a/src/machine/machined.c +++ b/src/machine/machined.c @@ -80,47 +80,6 @@ void manager_free(Manager *m) { free(m); } -int manager_add_machine(Manager *m, const char *name, Machine **_machine) { - Machine *machine; - - assert(m); - assert(name); - - machine = hashmap_get(m->machines, name); - if (!machine) { - machine = machine_new(m, name); - if (!machine) - return -ENOMEM; - } - - if (_machine) - *_machine = machine; - - return 0; -} - -int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine) { - _cleanup_free_ char *unit = NULL; - Machine *mm; - int r; - - assert(m); - assert(pid >= 1); - assert(machine); - - r = cg_pid_get_unit(pid, &unit); - if (r < 0) - mm = hashmap_get(m->machine_leaders, UINT_TO_PTR(pid)); - else - mm = hashmap_get(m->machine_units, unit); - - if (!mm) - return 0; - - *machine = mm; - return 1; -} - int manager_enumerate_machines(Manager *m) { _cleanup_closedir_ DIR *d = NULL; struct dirent *de; -- cgit v1.2.3