| 1 |
commit: bbf9f4b708e1368a86c7978681e4a82604587fbc |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 23 20:11:35 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 23 20:11:35 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=bbf9f4b7 |
| 7 |
|
| 8 |
fix some more signedness problems |
| 9 |
|
| 10 |
q.c | 2 +- |
| 11 |
qcheck.c | 4 ++-- |
| 12 |
qdepends.c | 4 ++-- |
| 13 |
qlop.c | 5 +++-- |
| 14 |
qsize.c | 4 ++-- |
| 15 |
5 files changed, 10 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/q.c b/q.c |
| 18 |
index ff79643..9c06e2a 100644 |
| 19 |
--- a/q.c |
| 20 |
+++ b/q.c |
| 21 |
@@ -126,7 +126,7 @@ int q_main(int argc, char **argv) |
| 22 |
#elif defined(__sun) && defined(__SVR4) |
| 23 |
prog = getexecname(); |
| 24 |
rret = strlen(prog); |
| 25 |
- if (rret > sizeof(buf) - 1) { |
| 26 |
+ if ((size_t)rret > sizeof(buf) - 1) { |
| 27 |
rret = -1; |
| 28 |
} else { |
| 29 |
strncpy(buf, prog, rret); |
| 30 |
|
| 31 |
diff --git a/qcheck.c b/qcheck.c |
| 32 |
index 66589a3..c6e1ccb 100644 |
| 33 |
--- a/qcheck.c |
| 34 |
+++ b/qcheck.c |
| 35 |
@@ -354,8 +354,8 @@ int qcheck_main(int argc, char **argv) |
| 36 |
.undo_prelink = false, |
| 37 |
}; |
| 38 |
|
| 39 |
- while ((i = GETOPT_LONG(QCHECK, qcheck, "")) != -1) { |
| 40 |
- switch (i) { |
| 41 |
+ while ((ret = GETOPT_LONG(QCHECK, qcheck, "")) != -1) { |
| 42 |
+ switch (ret) { |
| 43 |
COMMON_GETOPTS_CASES(qcheck) |
| 44 |
case 's': { |
| 45 |
regex_t regex; |
| 46 |
|
| 47 |
diff --git a/qdepends.c b/qdepends.c |
| 48 |
index 117ca71..d5a8ef5 100644 |
| 49 |
--- a/qdepends.c |
| 50 |
+++ b/qdepends.c |
| 51 |
@@ -560,8 +560,8 @@ int qdepends_main(int argc, char **argv) |
| 52 |
|
| 53 |
depend_file = depend_files[0]; |
| 54 |
|
| 55 |
- while ((i = GETOPT_LONG(QDEPENDS, qdepends, "")) != -1) { |
| 56 |
- switch (i) { |
| 57 |
+ while ((ret = GETOPT_LONG(QDEPENDS, qdepends, "")) != -1) { |
| 58 |
+ switch (ret) { |
| 59 |
COMMON_GETOPTS_CASES(qdepends) |
| 60 |
|
| 61 |
case 'd': depend_file = depend_files[0]; break; |
| 62 |
|
| 63 |
diff --git a/qlop.c b/qlop.c |
| 64 |
index 410a94b..33e8d37 100644 |
| 65 |
--- a/qlop.c |
| 66 |
+++ b/qlop.c |
| 67 |
@@ -753,6 +753,7 @@ parse_date(const char *sdate, time_t *t) |
| 68 |
int qlop_main(int argc, char **argv) |
| 69 |
{ |
| 70 |
size_t i; |
| 71 |
+ int ret; |
| 72 |
int average = 1; |
| 73 |
time_t start_time, end_time; |
| 74 |
char do_time, do_list, do_unlist, do_sync, do_current, do_human_readable = 0; |
| 75 |
@@ -765,8 +766,8 @@ int qlop_main(int argc, char **argv) |
| 76 |
end_time = LONG_MAX; |
| 77 |
do_time = do_list = do_unlist = do_sync = do_current = 0; |
| 78 |
|
| 79 |
- while ((i = GETOPT_LONG(QLOP, qlop, "")) != -1) { |
| 80 |
- switch (i) { |
| 81 |
+ while ((ret = GETOPT_LONG(QLOP, qlop, "")) != -1) { |
| 82 |
+ switch (ret) { |
| 83 |
COMMON_GETOPTS_CASES(qlop) |
| 84 |
|
| 85 |
case 't': do_time = 1; break; |
| 86 |
|
| 87 |
diff --git a/qsize.c b/qsize.c |
| 88 |
index acf74bf..9cd66cf 100644 |
| 89 |
--- a/qsize.c |
| 90 |
+++ b/qsize.c |
| 91 |
@@ -156,8 +156,8 @@ int qsize_main(int argc, char **argv) |
| 92 |
.num_all_ignored = 0, |
| 93 |
}; |
| 94 |
|
| 95 |
- while ((i = GETOPT_LONG(QSIZE, qsize, "")) != -1) { |
| 96 |
- switch (i) { |
| 97 |
+ while ((ret = GETOPT_LONG(QSIZE, qsize, "")) != -1) { |
| 98 |
+ switch (ret) { |
| 99 |
COMMON_GETOPTS_CASES(qsize) |
| 100 |
case 'f': state.fs_size = 1; break; |
| 101 |
case 's': state.summary = 1; break; |
Archives