Print this page
6659 nvlist_free(NULL) is a no-op

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/syseventd/modules/sysevent_conf_mod/sysevent_conf_mod.c
          +++ new/usr/src/cmd/syseventd/modules/sysevent_conf_mod/sysevent_conf_mod.c
↓ open down ↓ 1688 lines elided ↑ open up ↑
1689 1689  
1690 1690                  if (sysevent_get_attr_list(ev, &nvlist) != 0) {
1691 1691                          syslog(LOG_ERR, GET_ATTR_LIST_ERR,
1692 1692                                  sep->se_conf_file, sep->se_lineno,
1693 1693                                  strerror(errno));
1694 1694                          freestr(line);
1695 1695                          return (1);
1696 1696                  }
1697 1697                  if (expand_macros(ev, nvlist, sep, line, hdr)) {
1698 1698                          freestr(line);
1699      -                        if (nvlist)
1700      -                                nvlist_free(nvlist);
     1699 +                        nvlist_free(nvlist);
1701 1700                          return (1);
1702 1701                  }
1703      -                if (nvlist)
1704      -                        nvlist_free(nvlist);
     1702 +                nvlist_free(nvlist);
1705 1703          }
1706 1704  
1707 1705          if (debug_level >= DBG_EXEC) {
1708 1706                  syseventd_print(DBG_EXEC, "%s, line %d: path = %s\n",
1709 1707                          sep->se_conf_file, sep->se_lineno, sep->se_path);
1710 1708                  syseventd_print(DBG_EXEC, "    cmd = %s\n", line->s_str);
1711 1709          }
1712 1710  
1713 1711          cmd_nvlist = NULL;
1714 1712          if ((errno = nvlist_alloc(&cmd_nvlist, NV_UNIQUE_NAME, 0)) != 0) {
↓ open down ↓ 568 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX