mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some warnings

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-05-27 07:21:37 -07:00
parent 3d8c0b2771
commit c6bc88b50d
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/datatrak.c
View file

@ -18,7 +18,8 @@
unsigned char lector_bytes[2], lector_word[4], tmp_1byte, *byte; unsigned char lector_bytes[2], lector_word[4], tmp_1byte, *byte;
unsigned int tmp_2bytes; unsigned int tmp_2bytes;
char is_nitrox, is_O2, is_SCR; char is_nitrox, is_O2, is_SCR;
unsigned long tmp_4bytes, maxbuf; unsigned long tmp_4bytes;
long maxbuf;
static unsigned int two_bytes_to_int(unsigned char x, unsigned char y) static unsigned int two_bytes_to_int(unsigned char x, unsigned char y)
{ {
@ -146,7 +147,7 @@ static dc_status_t dt_libdc_buffer(unsigned char *ptr, int prf_length, int dc_mo
*/ */
unsigned char *dt_dive_parser(unsigned char *runner, struct dive *dt_dive) unsigned char *dt_dive_parser(unsigned char *runner, struct dive *dt_dive)
{ {
int rc, profile_length, n = 0, libdc_model; int rc, profile_length, libdc_model;
char *tmp_notes_str = NULL; char *tmp_notes_str = NULL;
unsigned char *tmp_string1 = NULL, unsigned char *tmp_string1 = NULL,
*locality = NULL, *locality = NULL,

2
core/profile.c
View file

@ -1293,7 +1293,7 @@ static void plot_string(struct plot_info *pi, struct plot_data *entry, struct me
{ {
int pressurevalue, mod, ead, end, eadd; int pressurevalue, mod, ead, end, eadd;
const char *depth_unit, *pressure_unit, *temp_unit, *vertical_speed_unit; const char *depth_unit, *pressure_unit, *temp_unit, *vertical_speed_unit;
double depthvalue, tempvalue, speedvalue, sacvalue, density; double depthvalue, tempvalue, speedvalue, sacvalue;
int decimals; int decimals;
const char *unit; const char *unit;

6
tests/testparse.cpp
View file

@ -138,7 +138,7 @@ void TestParse::testParse()
{ {
QCOMPARE(parseCSV(0, SUBSURFACE_TEST_DATA "/dives/test41.csv"), 0); QCOMPARE(parseCSV(0, SUBSURFACE_TEST_DATA "/dives/test41.csv"), 0);
fprintf(stderr, "number of dives %d \n", dive_table.nr); fprintf(stderr, "number of dives %d \n", dive_table.nr);
QCOMPARE(parseDivingLog(), 0); QCOMPARE(parseDivingLog(), 0);
fprintf(stderr, "number of dives %d \n", dive_table.nr); fprintf(stderr, "number of dives %d \n", dive_table.nr);
@ -157,7 +157,7 @@ void TestParse::testParseDM4()
{ {
QCOMPARE(sqlite3_open(SUBSURFACE_TEST_DATA "/dives/TestDiveDM4.db", &_sqlite3_handle), 0); QCOMPARE(sqlite3_open(SUBSURFACE_TEST_DATA "/dives/TestDiveDM4.db", &_sqlite3_handle), 0);
QCOMPARE(parse_dm4_buffer(_sqlite3_handle, 0, 0, 0, &dive_table), 0); QCOMPARE(parse_dm4_buffer(_sqlite3_handle, 0, 0, 0, &dive_table), 0);
QCOMPARE(save_dives("./testdm4out.ssrf"), 0); QCOMPARE(save_dives("./testdm4out.ssrf"), 0);
FILE_COMPARE("./testdm4out.ssrf", FILE_COMPARE("./testdm4out.ssrf",
SUBSURFACE_TEST_DATA "/dives/TestDiveDM4.xml"); SUBSURFACE_TEST_DATA "/dives/TestDiveDM4.xml");
@ -224,10 +224,8 @@ void TestParse::testParseHUDC()
void TestParse::testParseNewFormat() void TestParse::testParseNewFormat()
{ {
struct dive *dive;
QDir dir; QDir dir;
QStringList filter; QStringList filter;
QString firstLine;
QStringList files; QStringList files;
/* /*