diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-25 13:52:16 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-25 13:52:16 +0000 |
| commit | d152c784e9ec5ececac97129ea92fe6afc57078c (patch) | |
| tree | 79232acc096ef9414315de612d4587007b1606d5 /usr/src/lib/libcpc | |
| parent | 394dadbc86535e5075b260851683ccbb3f571c6d (diff) | |
| parent | 07eb1aef88b873c5c1036d9cf69820c1ef6a32fb (diff) | |
| download | illumos-joyent-d152c784e9ec5ececac97129ea92fe6afc57078c.tar.gz | |
[illumos-gate merge]
commit 07eb1aef88b873c5c1036d9cf69820c1ef6a32fb
11151 libpkcs11: NULL pointer errors
commit c0e21d6af8bfe88f1c49c7c12d4537b663fe9db9
11150 libdladm: NULL pointer errors
commit c8a3ee0e3658c32402e6bd505596d4fa45bfe17c
11208 add mdb format character for jazzed-up binary output
11206 mdb output autowrapping still subtly wrong
11207 many 64-bit mdb format characters have insufficient width
commit b1e2e3fb17324e9ddf43db264a0c64da7756d9e6
10936 umem_genasm needs to be stricter about segments
10937 Clean up umem smatch and cerrwarn
commit 3c308cd1a430039e3b6327544d02ab1a5384066a
11259 mandoc should allow ERRORS section in all man section 7 variants
commit 3970c09844d4f5e54234620de153ab71a05afbca
11149 libpkg: NULL pointer errors
commit f00128d8e2d39a5be61357047531dc79fde48623
11134 libdevinfo: NULL pointer errors
commit 4a014300cea3d870431d7e52aff6781d3c63e5d1
11143 libscf: NULL pointer errors
commit d60ff33691519a9505afc8818735139f4dfd0c31
11141 libdtrace: NULL pointer errors
commit 7c207486dba29784d04c67b7d1a97e8cff0a4ff9
11139 libcpc: NULL pointer errors
commit ce67cb245e522293fca567799070a5cdd4267929
11131 libtsol: NULL pointer errors
commit 559f8b540657be5e8d59b0b7017058a7ac6ba4bb
11127 libsip: NULL pointer errors
commit f21450b8fa7a1530d48dc06401e691df1b8965fa
11121 libadm: NULL pointer errors
commit 5f060f5100426465bddc18c6f81b146ccee30eb8
11120 libpcidb: NULL pointer errors
commit 22ca2f96318fd461cfbcc23fd450623fe08610a3
11109 librtld_db: NULL pointer errors
commit 6888a8ba15f151decee7821a09e34fed2fb63513
11107 mcs: NULL pointer errors
commit 9320f4959b6c72e7a6d056623827091cace259ee
11106 elfedit: NULL pointer errors
commit fb8f92baa78fdf1ddda6f49125fbd59366393ac8
11101 libld: NULL pointer errors
Conflicts:
usr/src/lib/libumem/amd64/umem_genasm.c
Diffstat (limited to 'usr/src/lib/libcpc')
| -rw-r--r-- | usr/src/lib/libcpc/common/libcpc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/lib/libcpc/common/libcpc.c b/usr/src/lib/libcpc/common/libcpc.c index de6c13d33c..9e8cb62d9c 100644 --- a/usr/src/lib/libcpc/common/libcpc.c +++ b/usr/src/lib/libcpc/common/libcpc.c @@ -203,7 +203,7 @@ cpc_set_create(cpc_t *cpc) set->cs_fd = -1; set->cs_pctx = NULL; set->cs_id = -1; - set->cs_thr = NULL; + set->cs_thr = 0; sigblocked = cpc_lock(cpc); set->cs_next = cpc->cpc_sets; @@ -617,7 +617,7 @@ cpc_unbind(cpc_t *cpc, cpc_set_t *set) break; } - set->cs_thr = NULL; + set->cs_thr = 0; set->cs_id = -1; set->cs_state = CS_UNBOUND; if (ret != 0) @@ -781,7 +781,7 @@ cpc_get_list(int which, int arg) void cpc_walk_requests(cpc_t *cpc, cpc_set_t *set, void *arg, void (*action)(void *arg, int index, const char *event, uint64_t preset, - uint_t flags, int nattrs, const cpc_attr_t *attrs)) + uint_t flags, int nattrs, const cpc_attr_t *attrs)) { cpc_request_t *rp; cpc_attr_t *attrs = NULL; @@ -871,7 +871,7 @@ err: /*ARGSUSED*/ void cpc_walk_events_all(cpc_t *cpc, void *arg, - void (*action)(void *arg, const char *event)) + void (*action)(void *arg, const char *event)) { cpc_walk_events_impl(cpc, arg, action, 0); } @@ -880,7 +880,7 @@ cpc_walk_events_all(cpc_t *cpc, void *arg, /*ARGSUSED*/ void cpc_walk_generic_events_all(cpc_t *cpc, void *arg, - void (*action)(void *arg, const char *event)) + void (*action)(void *arg, const char *event)) { cpc_walk_events_impl(cpc, arg, action, 1); } |