strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Better use size_t for malloc_size"

Browse source 
This reverts commit 652e4ee372.  Turns out on
Windows read (aka _read) actually has a parameter of type unsigned, not size_t,
(<https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/posix-read?view=msvc-170>
"read"), so this started to cause

> C:/cygwin/home/tdf/jenkins/workspace/lo_tb_master_win64_dbg/soltools/mkdepend/main.c(504): error C2220: the following warning is treated as an error
> C:/cygwin/home/tdf/jenkins/workspace/lo_tb_master_win64_dbg/soltools/mkdepend/main.c(504): warning C4267: 'function': conversion from 'size_t' to 'unsigned int', possible loss of data

(<https://ci.libreoffice.org/job/lo_tb_master_win64_dbg/34368/>) for MSVC builds
targeting x64.

Change-Id: Ica821c8b32e225b7ebbfcbd33d8b7d55515ab3e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135270
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2022-06-03 14:01:31 +02:00
parent ff525d0d70
commit 628082158a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
soltools/mkdepend/main.c
View file

@ -473,7 +473,7 @@ struct filepointer *getfile(char *file)
struct stat st; struct stat st;
off_t size_backup; off_t size_backup;
ssize_t bytes_read; ssize_t bytes_read;
size_t malloc_size; unsigned malloc_size;
content = (struct filepointer *)malloc(sizeof(struct filepointer)); content = (struct filepointer *)malloc(sizeof(struct filepointer));
if ((fd = open(file, O_RDONLY)) < 0) { if ((fd = open(file, O_RDONLY)) < 0) {
@ -486,7 +486,7 @@ struct filepointer *getfile(char *file)
size_backup = st.st_size; size_backup = st.st_size;
malloc_size = size_backup; malloc_size = size_backup;
/* Since off_t usually is larger than size_t, need to test for /* Since off_t usually is larger than unsigned, need to test for
* truncation. * truncation.
*/ */
if ( (off_t)malloc_size != size_backup ) if ( (off_t)malloc_size != size_backup )