diff options
| author | Toomas Soome <tsoome@me.com> | 2021-03-16 01:08:35 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-09-17 19:02:01 +0300 |
| commit | 50e803017668ce124e5b7c37cae78c397813805a (patch) | |
| tree | 7c10b13454058f184825f4190b84d742322c67bb | |
| parent | a0ff59d0a2ee2e2fae253ea72aa6e4b41d524191 (diff) | |
| download | illumos-joyent-50e803017668ce124e5b7c37cae78c397813805a.tar.gz | |
14074 sbd: macro expands to multiple statements
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Sebastian Wiedenroth <wiedi@frubar.net>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/sun4u/sys/sbdpriv.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/sun4u/sys/sbdpriv.h b/usr/src/uts/sun4u/sys/sbdpriv.h index 4f15ebb8c7..ddcd9d7ca3 100644 --- a/usr/src/uts/sun4u/sys/sbdpriv.h +++ b/usr/src/uts/sun4u/sys/sbdpriv.h @@ -27,8 +27,6 @@ #ifndef _SYS_SBDPRIV_H #define _SYS_SBDPRIV_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -105,7 +103,7 @@ typedef struct { SBDP_IOCTL_FLAG_FORCE : 0) typedef struct sbd_handle { - void *h_sbd; + void *h_sbd; sbderror_t *h_err; dev_t h_dev; /* dev_t of opened device */ int h_cmd; /* ioctl argument */ @@ -141,12 +139,14 @@ typedef struct sbd_handle { ((ep)->e_rsc[0] = '\0') #define SBD_GET_PERR(spe, ep) \ +{ \ (ep)->e_errno = EIO; \ (ep)->e_code = (spe)->e_code; \ if (*((spe)->e_rsc) != '\0') \ bcopy((caddr_t)((spe)->e_rsc), \ (caddr_t)((ep))->e_rsc, \ - sizeof (((ep))->e_rsc)); + sizeof (((ep))->e_rsc)); \ +} /* * dev_t is shared by PIM and PSM layers. |