Print this page
patch tsoome-feedback

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/fm/modules/common/eversholt/itree.c
          +++ new/usr/src/cmd/fm/modules/common/eversholt/itree.c
↓ open down ↓ 1719 lines elided ↑ open up ↑
1720 1720                   * bubble.
1721 1721                   */
1722 1722                  if (bub->t == B_FROM)
1723 1723                          itree_free_arrowlists(bub, 1);
1724 1724                  else
1725 1725                          itree_free_arrowlists(bub, 0);
1726 1726                  itree_free_bubble(bub);
1727 1727                  bub = nextbub;
1728 1728          }
1729 1729  
1730      -        if (ep->nvp != NULL)
1731      -                nvlist_free(ep->nvp);
     1730 +        nvlist_free(ep->nvp);
1732 1731          alloc_xfree(ep, sizeof (*ep));
1733 1732  }
1734 1733  
1735 1734  /*ARGSUSED*/
1736 1735  static void
1737 1736  itree_pruner(void *left, void *right, void *arg)
1738 1737  {
1739 1738          struct event *ep = (struct event *)right;
1740 1739          struct bubble *nextbub, *bub;
1741 1740  
↓ open down ↓ 10 lines elided ↑ open up ↑
1752 1751          lut_free(ep->serdprops, serdprops_destructor, NULL);
1753 1752  
1754 1753          /* Free my bubbles */
1755 1754          for (bub = ep->bubbles; bub != NULL; ) {
1756 1755                  nextbub = bub->next;
1757 1756                  itree_prune_arrowlists(bub);
1758 1757                  itree_free_bubble(bub);
1759 1758                  bub = nextbub;
1760 1759          }
1761 1760  
1762      -        if (ep->nvp != NULL)
1763      -                nvlist_free(ep->nvp);
     1761 +        nvlist_free(ep->nvp);
1764 1762          ep->props = NULL;
1765 1763          ep->payloadprops = NULL;
1766 1764          ep->serdprops = NULL;
1767 1765          ep->bubbles = NULL;
1768 1766          ep->nvp = NULL;
1769 1767  }
1770 1768  
1771 1769  static void
1772 1770  itree_free_bubble(struct bubble *freeme)
1773 1771  {
↓ open down ↓ 399 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX