emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/plist: no need to check against NULL if prop_object_type() is used.

Browse Source
This commit is contained in:
Juan RP
2010-12-03 06:36:05 +01:00
parent b3c8a8ef5c
commit d2f5535162
1 changed files with 3 additions and 3 deletions

6
lib/plist.c

@ -119,7 +119,7 @@ xbps_callback_array_iter_reverse_in_dict(prop_dictionary_t dict,
assert(fn != NULL); assert(fn != NULL);
array = prop_dictionary_get(dict, key); array = prop_dictionary_get(dict, key);
if (array == NULL || prop_object_type(array) != PROP_TYPE_ARRAY) { if (prop_object_type(array) != PROP_TYPE_ARRAY) {
xbps_dbg_printf("invalid key '%s' for dictionary", key); xbps_dbg_printf("invalid key '%s' for dictionary", key);
return EINVAL; return EINVAL;
} }
@ -297,7 +297,7 @@ xbps_get_array_iter_from_dict(prop_dictionary_t dict, const char *key)
assert(key != NULL); assert(key != NULL);
array = prop_dictionary_get(dict, key); array = prop_dictionary_get(dict, key);
if (array == NULL || prop_object_type(array) != PROP_TYPE_ARRAY) { if (prop_object_type(array) != PROP_TYPE_ARRAY) {
errno = EINVAL; errno = EINVAL;
return NULL; return NULL;
} }
@ -380,7 +380,7 @@ xbps_remove_pkg_from_dict(prop_dictionary_t dict,
assert(pkgname != NULL); assert(pkgname != NULL);
array = prop_dictionary_get(dict, key); array = prop_dictionary_get(dict, key);
if (array == NULL || prop_object_type(array) != PROP_TYPE_ARRAY) { if (prop_object_type(array) != PROP_TYPE_ARRAY) {
errno = EINVAL; errno = EINVAL;
xbps_dbg_printf("invalid array type for key: %s pkgname: %s\n", xbps_dbg_printf("invalid array type for key: %s pkgname: %s\n",
key, pkgname); key, pkgname);