Mercurial > illumos > illumos-gate
changeset 6687:fc90aaafc32d
6704339 hald crashes with SIGSEGV, after putback for PSARC 2007/679 CPUFreq HAL
| author | np146283 |
|---|---|
| date | Thu, 22 May 2008 10:16:08 -0700 |
| parents | 3c9396c20a27 |
| children | 0b51c3ad6121 |
| files | usr/src/cmd/hal/tools/Makefile usr/src/cmd/hal/utils/adt_data.c |
| diffstat | 2 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/hal/tools/Makefile Thu May 22 09:42:15 2008 -0700 +++ b/usr/src/cmd/hal/tools/Makefile Thu May 22 10:16:08 2008 -0700 @@ -50,8 +50,8 @@ STORAGE_OBJS = $(STORAGE_PROG:%=%.o) -STORAGE_SHAREDOBJS = hal-storage-shared.o adt_data.o logger.o -STORAGE_SHAREDSRCS = $(STORAGE_SHAREDOBJS:%.o=%.c) $(STORAGE_SHAREDOBJS:%.o=../utils/%.c) $(STORAGE_SHAREDOBJS:%.o=../hald/%.c) +STORAGE_SHAREDOBJS = hal-storage-shared.o adt_data.o +STORAGE_SHAREDSRCS = $(STORAGE_SHAREDOBJS:%.o=%.c) $(STORAGE_SHAREDOBJS:%.o=../utils/%.c) SRCS = $(PROGSRCS) $(STORAGE_SHAREDSRCS) @@ -99,9 +99,6 @@ adt_data.o: ../utils/adt_data.c $(COMPILE.c) -o $@ ../utils/adt_data.c -logger.o: ../hald/logger.c - $(COMPILE.c) -o $@ ../hald/logger.c - hal-storage-closetray: hal-storage-closetray.o $(STORAGE_SHAREDOBJS) $(LINK.c) hal-storage-closetray.o $(STORAGE_SHAREDOBJS) -o $@ $(LDLIBS) $(POST_PROCESS)
--- a/usr/src/cmd/hal/utils/adt_data.c Thu May 22 09:42:15 2008 -0700 +++ b/usr/src/cmd/hal/utils/adt_data.c Thu May 22 10:16:08 2008 -0700 @@ -37,7 +37,7 @@ "org.freedesktop.DBus", "GetAuditSessionData"); if (message == NULL) { - HAL_INFO (("cannot get GetAuditSessionData message\n")); + printf ("cannot get GetAuditSessionData message\n"); return NULL; } @@ -52,7 +52,7 @@ message, -1, &error); if (dbus_error_is_set (&error)) { - HAL_INFO (("send failed %s\n", error.message)); + printf ("send failed %s\n", error.message); dbus_error_free (&error); dbus_message_unref (message); return NULL; @@ -66,7 +66,7 @@ if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_ARRAY || dbus_message_iter_get_element_type (&iter) != DBUS_TYPE_BYTE) { - HAL_INFO (("expecting an array of byte entries\n")); + printf ("expecting an array of byte entries\n"); dbus_message_unref (message); dbus_message_unref (reply); return NULL;