diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-05-16 07:03:03 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-05-16 07:03:03 +0100 |
| commit | a4b5e52b9bb5ef6f924a2454830eac72992bf8c5 (patch) | |
| tree | 945c521c97bb0bbd8a0e74fe448566c431cd60ef /usr/src | |
| parent | 5963c4f9d1eb33d95ac319791aa1d0b9ea17f154 (diff) | |
| download | illumos-joyent-a4b5e52b9bb5ef6f924a2454830eac72992bf8c5.tar.gz | |
1551 svccfg should not treat NULL as an integer
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Alexander Eremin <alexander.eremin@nexenta.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/svc/svccfg/svccfg_libscf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/cmd/svc/svccfg/svccfg_libscf.c b/usr/src/cmd/svc/svccfg/svccfg_libscf.c index 9b04203a07..e00d10e815 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_libscf.c +++ b/usr/src/cmd/svc/svccfg/svccfg_libscf.c @@ -13070,7 +13070,7 @@ listtmpl(const char *pattern, int templates) abort(); /* If pattern is specified, we want to list only those items. */ - while (scf_tmpl_iter_pgs(pgt, fmribuf, snapbuf, NULL, NULL) == 1) { + while (scf_tmpl_iter_pgs(pgt, fmribuf, snapbuf, NULL, 0) == 1) { listed = 0; if (pattern == NULL || (scf_tmpl_pg_name(pgt, &pg_name) > 0 && fnmatch(pattern, pg_name, 0) == 0)) { @@ -13080,7 +13080,7 @@ listtmpl(const char *pattern, int templates) scf_tmpl_prop_reset(prt); - while (scf_tmpl_iter_props(pgt, prt, NULL) == 0) { + while (scf_tmpl_iter_props(pgt, prt, 0) == 0) { search_name = NULL; prop_name_size = scf_tmpl_prop_name(prt, &prop_name); if ((prop_name_size > 0) && (pg_name != NULL)) { @@ -13192,7 +13192,7 @@ listprop(const char *pattern, int only_pgs, int templates) scfdie(); assert(szret <= pgnlen); - if (scf_tmpl_get_by_pg(pg, pgt, NULL) == -1) { + if (scf_tmpl_get_by_pg(pg, pgt, 0) == -1) { if (scf_error() != SCF_ERROR_NOT_FOUND) scfdie(); pgtp = NULL; @@ -13284,7 +13284,7 @@ listprop(const char *pattern, int only_pgs, int templates) if (pgtp != NULL) { if (scf_tmpl_get_by_prop(pgt, prnbuf, - prt, NULL) < 0) { + prt, 0) < 0) { if (scf_error() != SCF_ERROR_NOT_FOUND) scfdie(); @@ -13633,9 +13633,9 @@ lscf_setprop(const char *pgname, const char *type, const char *value, /* Then check for a type set in a template. */ } else if (scf_tmpl_get_by_pg(pg, pgt, - NULL) == 0 && + 0) == 0 && scf_tmpl_get_by_prop(pgt, propname, prt, - NULL) == 0 && + 0) == 0 && scf_tmpl_prop_type(prt, ¤t_ty) == 0) { ty = current_ty; @@ -15522,7 +15522,7 @@ lscf_delnotify(const char *set, int global) } for (p = pgs; *p; ++p) { - if (smf_notify_del_params(de_tag(*p), NULL, NULL) != + if (smf_notify_del_params(de_tag(*p), NULL, 0) != SCF_SUCCESS) { uu_warn(gettext("Failed for \"%s\": %s\n"), *p, scf_strerror(scf_error())); |