diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-10-17 10:36:28 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-10-17 10:36:28 -0400 |
| commit | f77180d803041f05d074ba8f26604f9d77c88b45 (patch) | |
| tree | 75033012031929d82654a8692deb674c2e840c4d /usr/src/cmd | |
| parent | f1e5b922ed8766e68b9264a57a94dd9a28cddd69 (diff) | |
| parent | e59cb7a82e3c588904c5b7ede8cba0bf3cd17eb1 (diff) | |
| download | illumos-joyent-f77180d803041f05d074ba8f26604f9d77c88b45.tar.gz | |
[illumos-gate merge]
commit e59cb7a82e3c588904c5b7ede8cba0bf3cd17eb1
15025 hald can't anymore receive events with newer glib versions than 2.63.4
commit 8a67df42cf817fc66635eb83ffe3fc2f8216300a
15046 libc: unused variable
commit 2067ad9da908e7634f4b17778a0523d3acca8102
15045 SMB should implement FSCTL_DFS_GET_REFERRALS_EX
commit a44ccde211b3554142d11535037f8ef996519c3b
15044 SMB should return NT_STATUS_FS_DRIVER_REQUIRED for DFS ioctls when DFS is not supported
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/hal/hald/solaris/sysevent.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr/src/cmd/hal/hald/solaris/sysevent.c b/usr/src/cmd/hal/hald/solaris/sysevent.c index 771fd1acf0..9e1300853f 100644 --- a/usr/src/cmd/hal/hald/solaris/sysevent.c +++ b/usr/src/cmd/hal/hald/solaris/sysevent.c @@ -2,6 +2,7 @@ * * sysevent.c : Solaris sysevents * + * Copyright 2022 Carsten Grzemba <grzemba@contac-dt.de> * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * @@ -184,7 +185,7 @@ sysevent_dev_handler(sysevent_t *ev) snprintf(s, sizeof (s), "%s %s %s\n", class, subclass, phys_path); - nwritten = write(sysevent_pipe_fds[1], s, strlen(s) + 1); + nwritten = write(sysevent_pipe_fds[1], s, strlen(s)); HAL_INFO (("sysevent_dev_handler: wrote %d bytes", nwritten)); goto out; @@ -233,7 +234,7 @@ sysevent_dev_handler(sysevent_t *ev) snprintf(s, sizeof (s), "%s %s %s %s %s %s %d\n", class, subclass, phys_path, dev_name, dev_hid, dev_uid, dev_index); - nwritten = write(sysevent_pipe_fds[1], s, strlen(s) + 1); + nwritten = write(sysevent_pipe_fds[1], s, strlen(s)); HAL_INFO (("sysevent_dev_handler: wrote %d bytes", nwritten)); @@ -295,7 +296,7 @@ sysevent_iochannel_data (GIOChannel *source, sysevent_dev_branch(phys_path); } else if (strcmp(class, EC_PWRCTL) == 0) { sysevent_pwrctl(class, subclass, phys_path, - dev_name, dev_hid, dev_uid, dev_index); + dev_name, dev_hid, dev_uid, dev_index); } else if (strcmp(class, EC_DEVFS) == 0) { if (strcmp(subclass, ESC_DEVFS_DEVI_ADD) == 0) { sysevent_devfs_add(phys_path); @@ -477,7 +478,7 @@ sysevent_devfs_add(gchar *devfs_path) di_fini (node); } -static void +static void sysevent_pwrctl(gchar *class, gchar *subclass, gchar *phys_path, gchar *dev_name, gchar *dev_hid, gchar *dev_uid, uint_t dev_index) { @@ -606,8 +607,8 @@ sysevent_dr_insert_cpu(di_node_t node, void *arg) static void sysevent_process_dr(gchar *ap_id, gchar *hint_val) { - cfga_err_t cfgerr; - cfga_list_data_t *cfg_stat; + cfga_err_t cfgerr; + cfga_list_data_t *cfg_stat; int nlist; char *errstr; di_node_t root_node; |