hal/hald/linux2 osspec.c,1.18,1.19

David Zeuthen david at freedesktop.org
Thu Feb 24 17:55:10 PST 2005

Update of /cvs/hal/hal/hald/linux2
In directory gabe:/tmp/cvs-serv13820/hald/linux2

Modified Files:
Log Message:
2005-02-24  David Zeuthen  <davidz at redhat.com>

	* hald/linux2/osspec.c (osspec_shutdown): Remove this function

	* hald/dummy/osspec.c (computer_callouts_add_done): New function
	(osspec_probe): Fixup to use new di_search_and_merge stuff

	* hald/util.h: Export prototype for hal_util_kill_all_helpers

	* hald/util.c (helper_child_exited): Remove from running_helpers list
	(hal_util_helper_invoke): Add to running_helpers list
	(hal_util_kill_all_helpers): New function (uses running_helpers list)

	* hald/osspec.h: Don't export osspec_shutdown and osspec_shutdown_done

	* hald/haldaemon.in: No need to add @LIBEXECDIR@ to PATH now that
	hald does that itself

	* hald/hald.c (main): Add PACKAGE_LIBEXEC_DIR to out path. Fix a fd
	leak also (pointed out by Kay Sievers).
	(sigterm_iochn_data): Kill all pending helpers and exit

	* hald/device_info.c (di_search_and_merge): Fixup some stupid typos

	* hald/Makefile.am (INCLUDES): Include PACKAGE_LIBEXEC_DIR

Index: osspec.c
RCS file: /cvs/hal/hal/hald/linux2/osspec.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- osspec.c	24 Feb 2005 17:33:03 -0000	1.18
+++ osspec.c	25 Feb 2005 01:55:08 -0000	1.19
@@ -340,11 +340,6 @@
-osspec_shutdown (void)
 static void 
 computer_callouts_add_done (HalDevice *d, gpointer userdata1, gpointer userdata2)

More information about the hal-commit mailing list