Relax memory requirements on 64bit platforms; fix two memleaks.

bin/xbps-query/defs.h

@@ -55,8 +55,8 @@ int	ownedby(struct xbps_handle *, int, char **);
 int	repo_ownedby(struct xbps_handle *, int, char **);
 
 /* From list.c */
-size_t	get_maxcols(void);
-size_t	find_longest_pkgver(struct xbps_handle *, prop_object_t);
+int		get_maxcols(void);
+unsigned int	find_longest_pkgver(struct xbps_handle *, prop_object_t);
 
 int	list_pkgs_in_dict(struct xbps_handle *, prop_object_t, void *, bool *);
 int	list_manual_pkgs(struct xbps_handle *, prop_object_t, void *, bool *);

bin/xbps-query/list.c

@@ -34,11 +34,11 @@
 #include "defs.h"
 
 struct list_pkgver_cb {
-	size_t pkgver_len;
-	size_t maxcols;
+	int pkgver_len;
+	int maxcols;
 };
 
-size_t
+int
 get_maxcols(void)
 {
 	struct winsize ws;
@@ -58,7 +58,7 @@ list_pkgs_in_dict(struct xbps_handle *xhp,
 	struct list_pkgver_cb *lpc = arg;
 	const char *pkgver, *short_desc, *state_str;
 	char tmp[255], *out = NULL;
-	size_t i, len = 0;
+	int i, len = 0;
 	pkg_state_t state;
 
 	(void)xhp;
@@ -167,8 +167,8 @@ repo_list_uri_cb(struct xbps_repo *repo, void *arg, bool *done)
 	(void)arg;
 	(void)done;
 
-	printf("%s (%zu packages)\n", repo->uri,
-	    (size_t)prop_dictionary_count(repo->idx));
+	printf("%s (%u packages)\n", repo->uri,
+	    prop_dictionary_count(repo->idx));
 
 	return 0;
 }
@@ -189,7 +189,7 @@ repo_list(struct xbps_handle *xhp)
 
 struct fflongest {
 	prop_dictionary_t d;
-	size_t len;
+	unsigned int len;
 };
 
 static int
@@ -201,7 +201,7 @@ _find_longest_pkgver_cb(struct xbps_handle *xhp,
 	struct fflongest *ffl = arg;
 	prop_dictionary_t pkgd;
 	const char *pkgver;
-	size_t len;
+	unsigned int len;
 
 	(void)xhp;
 	(void)loop_done;
@@ -219,7 +219,7 @@ _find_longest_pkgver_cb(struct xbps_handle *xhp,
 	return 0;
 }
 
-size_t
+unsigned int
 find_longest_pkgver(struct xbps_handle *xhp, prop_object_t o)
 {
 	struct fflongest ffl;

bin/xbps-query/ownedby.c

@@ -128,7 +128,7 @@ repo_match_files_by_pattern(prop_array_t files,
 			struct ffdata *ffd)
 {
 	const char *filestr;
-	size_t i;
+	unsigned int i;
 	int x;
 
 	for (i = 0; i < prop_array_count(files); i++) {

bin/xbps-query/search.c

@@ -47,7 +47,7 @@
 struct search_data {
 	int npatterns;
 	char **patterns;
-	size_t maxcols;
+	int maxcols;
 	prop_array_t results;
 };
 
@@ -56,7 +56,7 @@ print_results(struct xbps_handle *xhp, struct search_data *sd)
 {
 	const char *pkgver, *desc, *inststr;
 	char tmp[256], *out;
-	size_t i, j, tlen = 0, len = 0;
+	unsigned int i, j, tlen = 0, len = 0;
 
 	/* Iterate over results array and find out largest pkgver string */
 	for (i = 0; i < prop_array_count(sd->results); i++) {
@@ -80,7 +80,7 @@ print_results(struct xbps_handle *xhp, struct search_data *sd)
 			inststr = "[-]";
 
 		len = strlen(inststr) + strlen(tmp) + strlen(desc) + 3;
-		if (len > sd->maxcols) {
+		if ((int)len > sd->maxcols) {
 			out = malloc(sd->maxcols+1);
 			assert(out);
 			snprintf(out, sd->maxcols-3, "%s %s %s",
@@ -103,7 +103,7 @@ search_pkgs_cb(struct xbps_repo *repo, void *arg, bool *done)
 	prop_dictionary_keysym_t ksym;
 	struct search_data *sd = arg;
 	const char *pkgver, *desc;
-	size_t i;
+	unsigned int i;
 	int x;
 
 	(void)done;
@@ -120,7 +120,7 @@ search_pkgs_cb(struct xbps_repo *repo, void *arg, bool *done)
 		provides = prop_dictionary_get(pkgd, "provides");
 
 		for (x = 0; x < sd->npatterns; x++) {
-			size_t j;
+			unsigned int j;
 			bool vpkgfound = false;
 
 			for (j = 0; j < prop_array_count(provides); j++) {

bin/xbps-query/show-deps.c

@@ -40,7 +40,7 @@ print_rdeps(struct xbps_handle *xhp, prop_array_t rdeps,
 	prop_array_t currdeps;
 	prop_dictionary_t pkgd;
 	const char *pkgdep;
-	size_t i;
+	unsigned int i;
 	int j;
 
 	if (!origin)
@@ -98,7 +98,7 @@ show_pkg_revdeps(struct xbps_handle *xhp, const char *pkg)
 {
 	prop_array_t reqby;
 	const char *pkgdep;
-	size_t i;
+	unsigned int i;
 
 	if ((reqby = xbps_pkgdb_get_pkg_revdeps(xhp, pkg)) != NULL) {
 		for (i = 0; i < prop_array_count(reqby); i++) {

bin/xbps-query/show-info-files.c

@@ -43,7 +43,7 @@ print_value_obj(const char *keyname, prop_object_t obj,
 	prop_array_t allkeys;
 	prop_object_t obj2, keysym;
 	const char *ksymname, *value;
-	size_t i;
+	unsigned int i;
 	char size[8];
 
 	if (indent == NULL)
@@ -151,7 +151,7 @@ static void
 print_srcrevs(const char *keyname, prop_string_t obj)
 {
 	const char *str = prop_string_cstring_nocopy(obj);
-	size_t i;
+	unsigned int i;
 
 	/* parse string appending a \t after EOL */
 	printf("%s:\n  ", keyname);
@@ -170,7 +170,7 @@ show_pkg_info(prop_dictionary_t dict)
 	prop_array_t all_keys;
 	prop_object_t obj, keysym;
 	const char *keyname;
-	size_t i;
+	unsigned int i;
 
 	all_keys = prop_dictionary_all_keys(dict);
 	for (i = 0; i < prop_array_count(all_keys); i++) {
@@ -201,7 +201,7 @@ show_pkg_files(prop_dictionary_t filesd)
 	prop_object_t obj;
 	prop_dictionary_keysym_t ksym;
 	const char *keyname, *file;
-	size_t i, x;
+	unsigned int i, x;
 
 	if (prop_object_type(filesd) != PROP_TYPE_DICTIONARY)
 		return EINVAL;