Print this page
Fixes to allow compilation on OmniOS and OI
OS-478 -- lint

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/zoneadm/zoneadm.c
          +++ new/usr/src/cmd/zoneadm/zoneadm.c
↓ open down ↓ 2603 lines elided ↑ open up ↑
2604 2604  verify_handle(int cmd_num, zone_dochandle_t handle, char *argv[])
2605 2605  {
2606 2606          struct zone_nwiftab nwiftab;
2607 2607          int return_code = Z_OK;
2608 2608          int err;
2609 2609          boolean_t in_alt_root;
2610 2610          zone_iptype_t iptype;
2611 2611          dladm_handle_t dh;
2612 2612          dladm_status_t status;
2613 2613          datalink_id_t linkid;
2614      -        char errmsg[DLADM_STRSIZE];
2615 2614  
2616 2615          in_alt_root = zonecfg_in_alt_root();
2617 2616          if (in_alt_root)
2618 2617                  goto no_net;
2619 2618  
2620 2619          if ((err = zonecfg_get_iptype(handle, &iptype)) != Z_OK) {
2621 2620                  errno = err;
2622 2621                  zperror(cmd_to_str(cmd_num), B_TRUE);
2623 2622                  zonecfg_fini_handle(handle);
2624 2623                  return (Z_ERR);
↓ open down ↓ 1 lines elided ↑ open up ↑
2626 2625          if ((err = zonecfg_setnwifent(handle)) != Z_OK) {
2627 2626                  errno = err;
2628 2627                  zperror(cmd_to_str(cmd_num), B_TRUE);
2629 2628                  zonecfg_fini_handle(handle);
2630 2629                  return (Z_ERR);
2631 2630          }
2632 2631          while (zonecfg_getnwifent(handle, &nwiftab) == Z_OK) {
2633 2632                  struct lifreq lifr;
2634 2633                  sa_family_t af = AF_UNSPEC;
2635 2634                  char dl_owner_zname[ZONENAME_MAX];
     2635 +                char errmsg[DLADM_STRSIZE];
2636 2636                  zoneid_t dl_owner_zid;
2637 2637                  zoneid_t target_zid;
2638 2638                  int res;
2639 2639  
2640 2640                  /* skip any loopback interfaces */
2641 2641                  if (strcmp(nwiftab.zone_nwif_physical, "lo0") == 0)
2642 2642                          continue;
2643 2643                  switch (iptype) {
2644 2644                  case ZS_SHARED:
2645 2645                          if ((res = zonecfg_valid_net_address(
↓ open down ↓ 3149 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX