[newlib-cygwin/cygwin-3_5-branch] Cygwin: Fix warning about narrowing conversions in tape options
Corinna Vinschen
corinna@sourceware.org
Thu Aug 22 20:37:44 GMT 2024
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=25a0df8a70dfc886791e832f63c65aebe315c8cf
commit 25a0df8a70dfc886791e832f63c65aebe315c8cf
Author: Jon Turney <jon.turney@dronecode.org.uk>
AuthorDate: Sun Aug 4 17:01:38 2024 +0100
Commit: Corinna Vinschen <corinna@vinschen.de>
CommitDate: Thu Aug 22 19:58:49 2024 +0200
Cygwin: Fix warning about narrowing conversions in tape options
Fix a gcc 12 warning about a narrowing conversion in case labels for
tape options.
> In file included from /wip/cygwin/src/winsup/cygwin/include/sys/mtio.h:14,
> from ../../../../src/winsup/cygwin/fhandler/tape.cc:13:
> ../../../../src/winsup/cygwin/fhandler/tape.cc: In member function ‘int mtinfo_drive::set_options(HANDLE, int32_t)’:
> ../../../../src/winsup/cygwin/fhandler/tape.cc:965:12: error: narrowing conversion of ‘4026531840’ from ‘unsigned int’ to ‘int’ [-Wnarrowing]
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Diff:
---
winsup/cygwin/fhandler/tape.cc | 4 ++--
winsup/cygwin/local_includes/mtinfo.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/winsup/cygwin/fhandler/tape.cc b/winsup/cygwin/fhandler/tape.cc
index 0e235f16c65c..732fd1bb7f55 100644
--- a/winsup/cygwin/fhandler/tape.cc
+++ b/winsup/cygwin/fhandler/tape.cc
@@ -894,9 +894,9 @@ mtinfo_drive::get_status (HANDLE mt, struct mtget *get)
}
int
-mtinfo_drive::set_options (HANDLE mt, int32_t options)
+mtinfo_drive::set_options (HANDLE mt, uint32_t options)
{
- int32_t what = (options & MT_ST_OPTIONS);
+ uint32_t what = (options & MT_ST_OPTIONS);
bool call_setparams = false;
bool set;
TAPE_SET_DRIVE_PARAMETERS sdp =
diff --git a/winsup/cygwin/local_includes/mtinfo.h b/winsup/cygwin/local_includes/mtinfo.h
index 03aabbfd0e3c..46f8b1be95f4 100644
--- a/winsup/cygwin/local_includes/mtinfo.h
+++ b/winsup/cygwin/local_includes/mtinfo.h
@@ -101,7 +101,7 @@ class mtinfo_drive
int set_compression (HANDLE mt, int32_t count);
int set_blocksize (HANDLE mt, DWORD count);
int get_status (HANDLE mt, struct mtget *get);
- int set_options (HANDLE mt, int32_t options);
+ int set_options (HANDLE mt, uint32_t options);
int async_wait (HANDLE mt, DWORD *bytes_written);
public:
More information about the Cygwin-cvs
mailing list