diff options
| author | Rob Johnston <rob.johnston@joyent.com> | 2020-04-06 23:58:00 +0000 |
|---|---|---|
| committer | Rob Johnston <rob.johnston@joyent.com> | 2020-04-06 23:58:00 +0000 |
| commit | 31e120a40245f18b0fa944cf64a1bd687e1e9107 (patch) | |
| tree | 69087cc00d358dfd1be7e5a1b1144c04867dad0d | |
| parent | b8217f3fce45f916125daf3ef675504c86ec4332 (diff) | |
| download | illumos-joyent-sastopo.tar.gz | |
Fix build errors after mergesastopo
| -rw-r--r-- | usr/src/cmd/fm/sastopo/common/sastopo.c | 7 | ||||
| -rw-r--r-- | usr/src/lib/fm/topo/modules/common/ses/ses.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/cmd/fm/sastopo/common/sastopo.c b/usr/src/cmd/fm/sastopo/common/sastopo.c index 2e41b69bc6..fe243cdc5a 100644 --- a/usr/src/cmd/fm/sastopo/common/sastopo.c +++ b/usr/src/cmd/fm/sastopo/common/sastopo.c @@ -796,12 +796,11 @@ main(int argc, char *argv[]) ini = topo_list_next(ini)) { for (tgt = topo_list_next(&cbarg.tgt_list); tgt != NULL; tgt = topo_list_next(tgt)) { - int np; + uint_t np; topo_path_t **paths; - np = topo_digraph_paths(thp, tdg, ini->vtx, tgt->vtx, - &paths); - if (np < 0) { + if (topo_digraph_paths(thp, tdg, ini->vtx, tgt->vtx, + &paths, &np) < 0) { (void) fprintf(stderr, "topo_digraph_paths " "failed!\n"); goto out; diff --git a/usr/src/lib/fm/topo/modules/common/ses/ses.c b/usr/src/lib/fm/topo/modules/common/ses/ses.c index d214b9ceed..bcc57828cf 100644 --- a/usr/src/lib/fm/topo/modules/common/ses/ses.c +++ b/usr/src/lib/fm/topo/modules/common/ses/ses.c @@ -100,7 +100,7 @@ typedef struct ses_enum_chassis { ses_enum_target_t *sec_target; topo_instance_t sec_instance; topo_instance_t sec_scinstance; - int sec_maxinstance; + uint64_t sec_maxinstance; boolean_t sec_hasdev; boolean_t sec_internal; } ses_enum_chassis_t; |