diff options
| author | Allan McRae <allan@archlinux.org> | 2019-06-20 08:28:44 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2019-06-20 08:28:44 +0200 |
| commit | 4ca5f5949b42f76867f11eec0a5379ed3eb531d2 (patch) | |
| tree | 203b0b5b0162e9dca1d49fe455702af5b25dff52 | |
| parent | 1a343d378a9e0c4ea143db9e796cf7262eb0d4cb (diff) | |
| download | pacman-4ca5f5949b42f76867f11eec0a5379ed3eb531d2.tar.gz pacman-4ca5f5949b42f76867f11eec0a5379ed3eb531d2.tar.xz | |
Fix compiler warnings with gcc-9.1
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | src/pacman/callback.c | 2 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 2 | ||||
| -rw-r--r-- | src/pacman/query.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 22865614..aa5f521e 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -804,7 +804,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) int i = filenamelen - 3; wchar_t *wcp = wcfname; /* grab the max number of char columns we can fill */ - while(i > 0 && wcwidth(*wcp) < i) { + while(wcwidth(*wcp) < i) { i -= wcwidth(*wcp); wcp++; } diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 93fb98a4..b7406cea 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1079,7 +1079,7 @@ static void cl_to_log(int argc, char *argv[]) return; } char *p = cl_text; - for(i = 0; i < argc - 1; i++) { + for(i = 0; i + 1 < argc; i++) { strcpy(p, argv[i]); p += strlen(argv[i]); *p++ = ' '; diff --git a/src/pacman/query.c b/src/pacman/query.c index 3e728257..de82553c 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -189,7 +189,7 @@ static int query_fileowner(alpm_list_t *targets) if(!lrealpath(filename, rpath)) { /* Can't canonicalize path, try to proceed anyway */ - strncpy(rpath, filename, PATH_MAX); + strcpy(rpath, filename); } if(strncmp(rpath, root, rootlen) != 0) { |