Print this page
4450 pointless condfree in libfmnotify
Reviewed by: Dan McDonald <danmcd@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/fm/libfmnotify/common/libfmnotify.c
          +++ new/usr/src/lib/fm/libfmnotify/common/libfmnotify.c
↓ open down ↓ 586 lines elided ↑ open up ↑
 587  587                  }
 588  588                  evi->ei_fmri = fmri;
 589  589                  evi->ei_to_state = strdup(to_state);
 590  590                  evi->ei_from_state = strdup(from_state);
 591  591                  evi->ei_reason = strdup(reason);
 592  592          }
 593  593          *ev_info = evi;
 594  594          return (0);
 595  595  }
 596  596  
 597      -static void
 598      -condfree(void *buf)
 599      -{
 600      -        if (buf != NULL)
 601      -                free(buf);
 602      -}
 603      -
 604  597  void
 605  598  nd_free_event_info(nd_ev_info_t *ev_info)
 606  599  {
 607      -        condfree(ev_info->ei_severity);
 608      -        condfree(ev_info->ei_descr);
 609      -        condfree(ev_info->ei_diagcode);
 610      -        condfree(ev_info->ei_url);
 611      -        condfree(ev_info->ei_uuid);
 612      -        condfree(ev_info->ei_fmri);
 613      -        condfree(ev_info->ei_from_state);
 614      -        condfree(ev_info->ei_to_state);
 615      -        condfree(ev_info->ei_reason);
      600 +        free(ev_info->ei_severity);
      601 +        free(ev_info->ei_descr);
      602 +        free(ev_info->ei_diagcode);
      603 +        free(ev_info->ei_url);
      604 +        free(ev_info->ei_uuid);
      605 +        free(ev_info->ei_fmri);
      606 +        free(ev_info->ei_from_state);
      607 +        free(ev_info->ei_to_state);
      608 +        free(ev_info->ei_reason);
 616  609          fmev_rele(ev_info->ei_ev);
 617  610          free(ev_info);
 618  611  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX