diff options
| author | Toomas Soome <tsoome@me.com> | 2020-04-11 09:52:50 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-04-24 20:53:03 +0300 |
| commit | 67dca347c78f6433be936f7be1c9bbf7069a19ec (patch) | |
| tree | 247c4f317dddb9f0e6b54062bc33e7eb2859681d /usr/src/lib/fm | |
| parent | cd8579f741f9678d47f40aa55c57144419a78b13 (diff) | |
| download | illumos-gate-67dca347c78f6433be936f7be1c9bbf7069a19ec.tar.gz | |
12534 fm: NULL pointer errors
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/fm')
| -rw-r--r-- | usr/src/lib/fm/libldom/sparc/ldom_xmpp_client.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_walker.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/lib/fm/libldom/sparc/ldom_xmpp_client.c b/usr/src/lib/fm/libldom/sparc/ldom_xmpp_client.c index f183b5b7f9..b12cd868e9 100644 --- a/usr/src/lib/fm/libldom/sparc/ldom_xmpp_client.c +++ b/usr/src/lib/fm/libldom/sparc/ldom_xmpp_client.c @@ -252,7 +252,7 @@ xmpp_connect(xmpp_conn_t *conn) conn->tls_started = B_FALSE; conn->parser = xmlCreatePushParserCtxt(&xml_handler, (void *) conn, - NULL, NULL, NULL); + NULL, 0, NULL); if (conn->parser == NULL) { return (-1); } @@ -417,7 +417,7 @@ xmpp_client_thr(void *data) * It should only be reset once after the ssl is opened * in the start_tls(). */ - (void) xmlCtxtResetPush(conn.parser, NULL, NULL, NULL, + (void) xmlCtxtResetPush(conn.parser, NULL, 0, NULL, NULL); } xmpp_close(&conn); diff --git a/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_walker.c b/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_walker.c index c762e5e5c0..a767df54d6 100644 --- a/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_walker.c +++ b/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_walker.c @@ -308,7 +308,7 @@ pi_walker(pi_enum_t *pip, tnode_t *t_parent, const char *hc_name, * by calling an appropriate creation routine for the node type. * * Output: - * This routine returns MDE_WALK_NEXT, MDE_WALK_DONE or MDE_WALK_ERROR + * This routine returns MDE_WALK_NEXT, MDE_WALK_DONE or MDE_WALK_ERROR * only. */ static int @@ -704,7 +704,7 @@ pi_walkerlist_create(topo_mod_t *mod) /* Initialize the uutil list structure */ walker_pool = uu_list_pool_create("pi_walker_pool", sizeof (pi_walkernode_t), offsetof(pi_walkernode_t, walker_node), - pi_walkerlist_compare, NULL); + pi_walkerlist_compare, 0); if (walker_pool == NULL) { (void) topo_mod_seterrno(mod, EMOD_NOMEM); return (-1); |