mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-02-05 13:28:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/ns: really silence -Wunused-result warning

Browse source 
A previous change didn't really ignore the return value of fread() and
a warning was still emitted:

-----------------------------------------------------------------------
[103/1571] Building C object src/xrt/drivers/CMakeFiles/drv_ns.dir/north_star/ns_hmd.c.o
../src/xrt/drivers/north_star/ns_hmd.c: In function ‘ns_config_load’:
../src/xrt/drivers/north_star/ns_hmd.c:512:8: warning: ignoring return value of ‘fread’, declared with attribute warn_unused_result [-Wunused-result]
  512 |  (void)fread(json, 1, file_size, config_file);
      |        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-----------------------------------------------------------------------

Check the return value of fread to fix the warning for good, and declare
the return value of ftell as long as stated in the man page.
This commit is contained in:
Antonio Ospite 2022-03-14 13:41:52 +01:00 committed by Jakob Bornecrantz
parent 37852ffa65
commit 6ca4522de0
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/xrt/drivers/north_star/ns_hmd.c
View file

@ -494,9 +494,9 @@ ns_config_load(struct ns_hmd *ns, const char *config_path)
goto parse_error;
}
fseek(config_file, 0, SEEK_END); // Go to end of file
int file_size = ftell(config_file); // See offset we're at. This should be the file size in bytes.
rewind(config_file); // Go back to the beginning of the file
fseek(config_file, 0, SEEK_END); // Go to end of file
long file_size = ftell(config_file); // See offset we're at. This should be the file size in bytes.
rewind(config_file); // Go back to the beginning of the file
if (file_size == 0) {
NS_INFO(ns, "Empty config file!");
@ -509,7 +509,11 @@ ns_config_load(struct ns_hmd *ns, const char *config_path)
char *json = calloc(file_size + 1, 1);
json_allocated = true;
(void)fread(json, 1, file_size, config_file);
size_t ret = fread(json, 1, file_size, config_file);
if ((long)ret != file_size) {
NS_ERROR(ns, "Failed to read configuration file at path \"%s\"", config_path);
goto parse_error;
}
fclose(config_file);
config_file = NULL;
json[file_size] = '\0';