diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-05-27 07:21:37 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-05-27 07:21:37 -0700 |
| commit | c6bc88b50d3d4c2bc4d0949ada7300aad9641c6e (patch) | |
| tree | 2fe20ebe9917445fe6e4601993721ce2658433fe | |
| parent | 3d8c0b27719ec6fd180c85608b241a53c123ca4c (diff) | |
| download | subsurface-c6bc88b50d3d4c2bc4d0949ada7300aad9641c6e.tar.gz | |
Fix some warnings
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | core/datatrak.c | 5 | ||||
| -rw-r--r-- | core/profile.c | 2 | ||||
| -rw-r--r-- | tests/testparse.cpp | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/core/datatrak.c b/core/datatrak.c index 4896974e2..e61e5c1c8 100644 --- a/core/datatrak.c +++ b/core/datatrak.c @@ -18,7 +18,8 @@ unsigned char lector_bytes[2], lector_word[4], tmp_1byte, *byte; unsigned int tmp_2bytes; 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) { @@ -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) { - int rc, profile_length, n = 0, libdc_model; + int rc, profile_length, libdc_model; char *tmp_notes_str = NULL; unsigned char *tmp_string1 = NULL, *locality = NULL, diff --git a/core/profile.c b/core/profile.c index 36e365d48..26098b210 100644 --- a/core/profile.c +++ b/core/profile.c @@ -1293,7 +1293,7 @@ static void plot_string(struct plot_info *pi, struct plot_data *entry, struct me { int pressurevalue, mod, ead, end, eadd; const char *depth_unit, *pressure_unit, *temp_unit, *vertical_speed_unit; - double depthvalue, tempvalue, speedvalue, sacvalue, density; + double depthvalue, tempvalue, speedvalue, sacvalue; int decimals; const char *unit; diff --git a/tests/testparse.cpp b/tests/testparse.cpp index 9d2f4dea7..47eb952ef 100644 --- a/tests/testparse.cpp +++ b/tests/testparse.cpp @@ -138,7 +138,7 @@ void TestParse::testParse() { QCOMPARE(parseCSV(0, SUBSURFACE_TEST_DATA "/dives/test41.csv"), 0); fprintf(stderr, "number of dives %d \n", dive_table.nr); - + QCOMPARE(parseDivingLog(), 0); 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(parse_dm4_buffer(_sqlite3_handle, 0, 0, 0, &dive_table), 0); - + QCOMPARE(save_dives("./testdm4out.ssrf"), 0); FILE_COMPARE("./testdm4out.ssrf", SUBSURFACE_TEST_DATA "/dives/TestDiveDM4.xml"); @@ -224,10 +224,8 @@ void TestParse::testParseHUDC() void TestParse::testParseNewFormat() { - struct dive *dive; QDir dir; QStringList filter; - QString firstLine; QStringList files; /* |