Revision: 71781
http://sourceforge.net/p/brlcad/code/71781
Author: starseeker
Date: 2018-09-22 15:09:58 +0000 (Sat, 22 Sep 2018)
Log Message:
-----------
warn_unused_result was getting tripped by dreport.c on re-run of CMake - don't
ignore return. This may be an indication that a CMake re-run is using build
flags from the cache that we set for our main code, but (so far at least) this
is the only issue that got triggered and it's easy to avoid.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_Util.cmake
Modified: brlcad/trunk/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Util.cmake 2018-09-22 14:18:40 UTC (rev
71780)
+++ brlcad/trunk/misc/CMake/BRLCAD_Util.cmake 2018-09-22 15:09:58 UTC (rev
71781)
@@ -689,14 +689,14 @@
if (strncmp(argv[1], \"final\", 5) == 0) {
if (argc < 4) return 1;
printf(\"Done.\\n\\nBRL-CAD Release ${BRLCAD_VERSION}, Build
${CONFIG_DATE}\\n\\nElapsed compilation time: \");
- infp = fopen(argv[2], \"r\"); (void)fscanf(infp, \"%ld\", &start_time); ;
fclose(infp); printtime(((long)t) - start_time);
+ infp = fopen(argv[2], \"r\"); if (!fscanf(infp, \"%ld\", &start_time))
return 1; fclose(infp); printtime(((long)t) - start_time);
printf(\"\\nElapsed time since configuration: \");
- infp = fopen(argv[3], \"r\"); (void)fscanf(infp, \"%ld\", &start_time); ;
fclose(infp); printtime(((long)t) - start_time);
+ infp = fopen(argv[3], \"r\"); if (!fscanf(infp, \"%ld\", &start_time))
return 1; fclose(infp); printtime(((long)t) - start_time);
printf(\"\\n---\\n${INSTALL_LINE}\\n${BENCHMARK_LINE}\\n\\n\");
return 0;
}
printf(\"%s\", argv[1]);
- infp = fopen(argv[2], \"r\"); (void)fscanf(infp, \"%ld\", &start_time); ;
fclose(infp); printtime(((long)t) - start_time);
+ infp = fopen(argv[2], \"r\"); if (!fscanf(infp, \"%ld\", &start_time))
return 1; ; fclose(infp); printtime(((long)t) - start_time);
printf(\"\\n\");
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
