[gentoo-commits] proj/portage-utils:master commit in: /

[Fabian Groffen]

commit:     bbf9f4b708e1368a86c7978681e4a82604587fbc
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 23 20:11:35 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 20:11:35 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=bbf9f4b7

fix some more signedness problems

 q.c        | 2 +-
 qcheck.c   | 4 ++--
 qdepends.c | 4 ++--
 qlop.c     | 5 +++--
 qsize.c    | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/q.c b/q.c
index ff79643..9c06e2a 100644
--- a/q.c
+++ b/q.c
@@ -126,7 +126,7 @@ int q_main(int argc, char **argv)
 #elif defined(__sun) && defined(__SVR4)
                prog = getexecname();
                rret = strlen(prog);
-               if (rret > sizeof(buf) - 1) {
+               if ((size_t)rret > sizeof(buf) - 1) {
                        rret = -1;
                } else {
                        strncpy(buf, prog, rret);

diff --git a/qcheck.c b/qcheck.c
index 66589a3..c6e1ccb 100644
--- a/qcheck.c
+++ b/qcheck.c
@@ -354,8 +354,8 @@ int qcheck_main(int argc, char **argv)
                .undo_prelink = false,
        };
 
-       while ((i = GETOPT_LONG(QCHECK, qcheck, "")) != -1) {
-               switch (i) {
+       while ((ret = GETOPT_LONG(QCHECK, qcheck, "")) != -1) {
+               switch (ret) {
                COMMON_GETOPTS_CASES(qcheck)
                case 's': {
                        regex_t regex;

diff --git a/qdepends.c b/qdepends.c
index 117ca71..d5a8ef5 100644
--- a/qdepends.c
+++ b/qdepends.c
@@ -560,8 +560,8 @@ int qdepends_main(int argc, char **argv)
 
        depend_file = depend_files[0];
 
-       while ((i = GETOPT_LONG(QDEPENDS, qdepends, "")) != -1) {
-               switch (i) {
+       while ((ret = GETOPT_LONG(QDEPENDS, qdepends, "")) != -1) {
+               switch (ret) {
                COMMON_GETOPTS_CASES(qdepends)
 
                case 'd': depend_file = depend_files[0]; break;

diff --git a/qlop.c b/qlop.c
index 410a94b..33e8d37 100644
--- a/qlop.c
+++ b/qlop.c
@@ -753,6 +753,7 @@ parse_date(const char *sdate, time_t *t)
 int qlop_main(int argc, char **argv)
 {
        size_t i;
+       int ret;
        int average = 1;
        time_t start_time, end_time;
        char do_time, do_list, do_unlist, do_sync, do_current, 
do_human_readable = 0;
@@ -765,8 +766,8 @@ int qlop_main(int argc, char **argv)
        end_time = LONG_MAX;
        do_time = do_list = do_unlist = do_sync = do_current = 0;
 
-       while ((i = GETOPT_LONG(QLOP, qlop, "")) != -1) {
-               switch (i) {
+       while ((ret = GETOPT_LONG(QLOP, qlop, "")) != -1) {
+               switch (ret) {
                        COMMON_GETOPTS_CASES(qlop)
 
                        case 't': do_time = 1; break;

diff --git a/qsize.c b/qsize.c
index acf74bf..9cd66cf 100644
--- a/qsize.c
+++ b/qsize.c
@@ -156,8 +156,8 @@ int qsize_main(int argc, char **argv)
                .num_all_ignored = 0,
        };
 
-       while ((i = GETOPT_LONG(QSIZE, qsize, "")) != -1) {
-               switch (i) {
+       while ((ret = GETOPT_LONG(QSIZE, qsize, "")) != -1) {
+               switch (ret) {
                COMMON_GETOPTS_CASES(qsize)
                case 'f': state.fs_size = 1; break;
                case 's': state.summary = 1; break;