Re: [POLICYREP PATCH] Add objset to libsepol

[James Antill <jantill@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1500 bytes --]

On Thu, 2007-04-26 at 12:57 -0400, Karl MacMillan wrote:
> Add the objset data structure to libsepol. Object sets behave similarly to
> Python sets.
[...]
> +struct sepol_objset
> +{
> +       struct sepol_list *objs;
> +       sepol_objset_cmp_t cmp;
> +       unsigned int len;
> +       char compliment;
> +};
> 
 What is len for?
> 
> +int sepol_objset_contains(struct sepol_handle *h, struct sepol_objset *s, void *obj)
> +{
> +	int ret;
> +	struct sepol_iter *iter;
> +
> +	ret = sepol_objset_seek(h, s, &iter, obj);
> +	if (ret == SEPOL_EEXIST) {
> +		sepol_iter_free(h, iter);
> +		return 1;
> +	} else if (ret == SEPOL_ENOENT) {
> +		sepol_iter_free(h, iter);
> +		return 0;
> +	} else if (ret == SEPOL_ITERSTOP) {
> +		return 0;
> +	}

 This should be:

       int ret;
       struct sepol_iter *iter;
       int found = !s->compliment;

       ret = sepol_objset_seek(h, s, &iter, obj);
       if (ret == SEPOL_EEXIST) {
               sepol_iter_free(h, iter);
               return found;
       } else if (ret == SEPOL_ENOENT) {
               sepol_iter_free(h, iter);
               return !found;
       } else if (ret == SEPOL_ITERSTOP) {
               return !found;
       }

...or something similar, no? Also C has switch, unlike python ;).

> +
> +	return ret;
> +}

 Having the iter errors bubble up the API like this sucks and will make
eq/subset/etc. much more complicated :(.

-- 
James Antill <jantill@redhat.com>

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]