diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2018-08-08 09:25:12 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2018-08-08 10:50:19 +0200 |
| commit | 37f4fea07c87973408e4ad231ba6c8bd57982b03 (patch) | |
| tree | c94ca6a6c9384f59ffbddc79f5bbacfb926ea9de | |
| parent | 13909bc262b8de1b3a8f9d0662f9a6243482885c (diff) | |
| download | cygnal-37f4fea07c87973408e4ad231ba6c8bd57982b03.tar.gz cygnal-37f4fea07c87973408e4ad231ba6c8bd57982b03.tar.bz2 cygnal-37f4fea07c87973408e4ad231ba6c8bd57982b03.zip | |
Cygwin: utils: change 3rd readlink param to size_t
Avoid gcc warnings
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/utils/path.cc | 8 | ||||
| -rw-r--r-- | winsup/utils/path.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc index fcc5c0790..17ea3524d 100644 --- a/winsup/utils/path.cc +++ b/winsup/utils/path.cc @@ -181,7 +181,7 @@ out: /* Assumes is_symlink(fh) is true */ bool -readlink (HANDLE fh, char *path, int maxlen) +readlink (HANDLE fh, char *path, size_t maxlen) { DWORD rv; char *buf, *cp; @@ -225,7 +225,7 @@ readlink (HANDLE fh, char *path, int maxlen) return false; wcstombs (path, (wchar_t *) (cp + 2), wlen + 1); } - else if (len + 1 > maxlen) + else if ((size_t) (len + 1) > maxlen) return false; else memcpy (path, cp, len); @@ -243,7 +243,7 @@ readlink (HANDLE fh, char *path, int maxlen) return false; wcstombs (path, (wchar_t *) (cp + 2), wlen + 1); } - else if (fi.nFileSizeLow - strlen (SYMLINK_COOKIE) > (unsigned) maxlen) + else if (fi.nFileSizeLow - strlen (SYMLINK_COOKIE) > maxlen) return false; else strcpy (path, cp); @@ -778,7 +778,7 @@ rel_vconcat (const char *cwd, const char *s, va_list v) cwd = pathbuf; } - int max_len = 0; + size_t max_len = 0; mnt_t *m, *match = NULL; for (m = mount_table; m->posix; m++) diff --git a/winsup/utils/path.h b/winsup/utils/path.h index 53ef4d2f6..ee7c28a7a 100644 --- a/winsup/utils/path.h +++ b/winsup/utils/path.h @@ -17,7 +17,7 @@ char *cygpath (const char *s, ...); char *cygpath_rel (const char *cwd, const char *s, ...); bool is_exe (HANDLE); bool is_symlink (HANDLE); -bool readlink (HANDLE, char *, int); +bool readlink (HANDLE, char *, size_t); int get_word (HANDLE, int); int get_dword (HANDLE, int); bool from_fstab_line (mnt_t *m, char *line, bool user); |