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

bin: use size_t where applicable.

Browse Source 
To make sure we don't get a negative value due to overflowing.
This commit is contained in:
Juan RP
2020-02-22 11:09:21 +01:00
parent 5a6709b560
commit c031ee6945
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/xbps-install/util.c
View File

@ -54,9 +54,9 @@ get_maxcols(void)
}
void
print_package_line(const char *str, int maxcols, bool reset)
print_package_line(const char *str, size_t maxcols, bool reset)
{
static int cols;
static size_t cols;
static bool first;
if (reset) {
@ -82,7 +82,7 @@ find_longest_pkgname(struct transaction *trans)
{
xbps_object_t obj;
const char *pkgname;
unsigned int len = 0, max = 0;
size_t len = 0, max = 0;
while ((obj = xbps_object_iterator_next(trans->iter)) != NULL) {
if (!xbps_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname))
@ -96,7 +96,7 @@ find_longest_pkgname(struct transaction *trans)
}
bool
print_trans_colmode(struct transaction *trans, int cols)
print_trans_colmode(struct transaction *trans, size_t cols)
{
xbps_dictionary_t ipkgd;
xbps_object_t obj;
@ -104,8 +104,7 @@ print_trans_colmode(struct transaction *trans, int cols)
const char *pkgver, *pkgname, *ipkgver, *ver, *iver, *tract;
char size[8];
uint64_t dlsize = 0;
unsigned int x, blen, pnamelen;
int hdrlen;
size_t x, blen, pnamelen, hdrlen;
pnamelen = find_longest_pkgname(trans);
/* header length */