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

xbps-rindex: add: remove unused headers; prop_array_count checks for NULL pointers.

Browse Source
This commit is contained in:
Juan RP 2013-06-19 09:20:44 +02:00
parent 03575cecd0
commit 02a11ed08c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/xbps-rindex/index-add.c
View File

@ -35,8 +35,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <xbps_api.h> #include <xbps_api.h>
#include <archive.h>
#include <archive_entry.h>
#include "defs.h" #include "defs.h"
/* /*
@ -212,19 +210,19 @@ index_add(struct xbps_handle *xhp, int argc, char **argv, bool force)
/* Find out if binary pkg stored in index contain any file */ /* Find out if binary pkg stored in index contain any file */
pkg_cffiles = prop_dictionary_get(newpkgfilesd, "conf_files"); pkg_cffiles = prop_dictionary_get(newpkgfilesd, "conf_files");
if (pkg_cffiles != NULL && prop_array_count(pkg_cffiles)) if (prop_array_count(pkg_cffiles))
found = true; found = true;
else else
pkg_cffiles = NULL; pkg_cffiles = NULL;
pkg_files = prop_dictionary_get(newpkgfilesd, "files"); pkg_files = prop_dictionary_get(newpkgfilesd, "files");
if (pkg_files != NULL && prop_array_count(pkg_files)) if (prop_array_count(pkg_files))
found = true; found = true;
else else
pkg_files = NULL; pkg_files = NULL;
pkg_links = prop_dictionary_get(newpkgfilesd, "links"); pkg_links = prop_dictionary_get(newpkgfilesd, "links");
if (pkg_links != NULL && prop_array_count(pkg_links)) if (prop_array_count(pkg_links))
found = true; found = true;
else else
pkg_links = NULL; pkg_links = NULL;
@ -288,6 +286,7 @@ index_add(struct xbps_handle *xhp, int argc, char **argv, bool force)
prop_dictionary_count(idx)); prop_dictionary_count(idx));
printf("index-files: %u packages registered.\n", printf("index-files: %u packages registered.\n",
prop_dictionary_count(idxfiles)); prop_dictionary_count(idxfiles));
prop_object_release(idx); prop_object_release(idx);
prop_object_release(idxfiles); prop_object_release(idxfiles);