diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-05-16 07:37:13 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-05-16 07:37:13 +0100 |
| commit | 15a5f64a0e54ccfff87908c70d561a14d8b63c16 (patch) | |
| tree | 3f568f7e250402d5c1ac452ef87b25ddea236642 /usr/src | |
| parent | 149775e4e52b307722e6ba685551b334e3f2b346 (diff) | |
| download | illumos-joyent-15a5f64a0e54ccfff87908c70d561a14d8b63c16.tar.gz | |
1811 hal uses non-pointer NULL as g_strconcat sentinel
Reviewed by: Garrett D'Amore <garrett@nexenta.com>
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/hal/hald/hald_dbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/cmd/hal/hald/hald_dbus.c b/usr/src/cmd/hal/hald/hald_dbus.c index 7aa517a59c..51fe5206a4 100644 --- a/usr/src/cmd/hal/hald/hald_dbus.c +++ b/usr/src/cmd/hal/hald/hald_dbus.c @@ -3295,7 +3295,7 @@ hald_exec_method_cb (HalDevice *d, guint32 exit_type, * otherwise, dbus will be messed up. */ invalid_name = TRUE; - exp_detail = g_strconcat (exp_name, " \n ", exp_detail, NULL); + exp_detail = g_strconcat (exp_name, " \n ", exp_detail, (void *)NULL); exp_name = "org.freedesktop.Hal.Device.UnknownError"; } reply = dbus_message_new_error (message, exp_name, exp_detail); |