Skip to content

Commit b4bab23

Browse files
marcobambinimarcobambini
committed
Several compilation warnings fixed
1 parent f5e1ccd commit b4bab23

File tree

4 files changed

+40
-41
lines changed

4 files changed

+40
-41
lines changed

‎src/cloudsync.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ bool table_add_to_context (db_t *db, cloudsync_context *data, table_algo algo, c
10411041

10421042
char *sql = cloudsync_memory_mprintf(SQL_PRAGMA_TABLEINFO_LIST_NONPK_NAME_CID, table_name);
10431043
if (!sql) goto abort_add_table;
1044-
int rc = database_exec_callback(db, sql, table_add_to_context_cb, (void *)table);
1044+
rc = database_exec_callback(db, sql, table_add_to_context_cb, (void *)table);
10451045
cloudsync_memory_free(sql);
10461046
if (rc == DBRES_ABORT) goto abort_add_table;
10471047
}
@@ -1720,7 +1720,7 @@ int cloudsync_finalize_alter (cloudsync_context *data, cloudsync_table_context *
17201720
if (!sql) {rc = DBRES_NOMEM; goto finalize;}
17211721

17221722
char *pkclause = NULL;
1723-
int rc = database_select_text(db, sql, &pkclause);
1723+
rc = database_select_text(db, sql, &pkclause);
17241724
cloudsync_memory_free(sql);
17251725
if (rc != DBRES_OK) goto finalize;
17261726
char *pkvalues = (pkclause) ? pkclause : "rowid";
@@ -2061,9 +2061,9 @@ void cloudsync_payload_header_init (cloudsync_payload_header *header, uint32_t e
20612061

20622062
header->signature = htonl(CLOUDSYNC_PAYLOAD_SIGNATURE);
20632063
header->version = CLOUDSYNC_PAYLOAD_VERSION;
2064-
header->libversion[0] = major;
2065-
header->libversion[1] = minor;
2066-
header->libversion[2] = patch;
2064+
header->libversion[0] = (uint8_t)major;
2065+
header->libversion[1] = (uint8_t)minor;
2066+
header->libversion[2] = (uint8_t)patch;
20672067
header->expanded_size = htonl(expanded_size);
20682068
header->ncols = htons(ncols);
20692069
header->nrows = htonl(nrows);
@@ -2075,7 +2075,7 @@ int cloudsync_payload_encode_step (cloudsync_payload_context *payload, cloudsync
20752075
// debug_values(argc, argv);
20762076

20772077
// check if the step function is called for the first time
2078-
if (payload->nrows == 0) payload->ncols = argc;
2078+
if (payload->nrows == 0) payload->ncols = (uint16_t)argc;
20792079

20802080
size_t breq = pk_encode_size((dbvalue_t **)argv, argc, 0);
20812081
if (cloudsync_datapayload_check(payload, breq) == false) {

‎src/pk.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ char *pk_encode (dbvalue_t **argv, int argc, char *b, bool is_prikey, size_t *bs
305305
if (!buffer) return NULL;
306306

307307
// the first u8 value is the total number of items in the primary key(s)
308-
bseek = pk_encode_u8(buffer, 0, argc);
308+
bseek = pk_encode_u8(buffer, 0, (uint8_t)argc);
309309
}
310310

311311
for (int i = 0; i < argc; i++) {
@@ -319,7 +319,7 @@ char *pk_encode (dbvalue_t **argv, int argc, char *b, bool is_prikey, size_t *bs
319319
}
320320
if (value < 0) {value = -value; type = DATABASE_TYPE_NEGATIVE_INTEGER;}
321321
size_t nbytes = pk_encode_nbytes_needed(value);
322-
uint8_t type_byte = (nbytes << 3) | type;
322+
uint8_t type_byte = (uint8_t)((nbytes << 3) | type);
323323
bseek = pk_encode_u8(buffer, bseek, type_byte);
324324
bseek = pk_encode_int64(buffer, bseek, value, nbytes);
325325
}
@@ -329,15 +329,15 @@ char *pk_encode (dbvalue_t **argv, int argc, char *b, bool is_prikey, size_t *bs
329329
if (value < 0) {value = -value; type = DATABASE_TYPE_NEGATIVE_FLOAT;}
330330
int64_t net_double;
331331
memcpy(&net_double, &value, sizeof(int64_t));
332-
bseek = pk_encode_u8(buffer, bseek, type);
332+
bseek = pk_encode_u8(buffer, bseek, (uint8_t)type);
333333
bseek = pk_encode_int64(buffer, bseek, net_double, sizeof(int64_t));
334334
}
335335
break;
336336
case DBTYPE_TEXT:
337337
case DBTYPE_BLOB: {
338338
int32_t len = (int32_t)database_value_bytes(argv[i]);
339339
size_t nbytes = pk_encode_nbytes_needed(len);
340-
uint8_t type_byte = (nbytes << 3) | database_value_type(argv[i]);
340+
uint8_t type_byte = (uint8_t)((nbytes << 3) | database_value_type(argv[i]));
341341
bseek = pk_encode_u8(buffer, bseek, type_byte);
342342
bseek = pk_encode_int64(buffer, bseek, len, nbytes);
343343
bseek = pk_encode_data(buffer, bseek, (char *)database_value_blob(argv[i]), len);

‎src/utils.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ char *cloudsync_string_ndup (const char *str, size_t len, bool lowercase) {
136136
if (lowercase) {
137137
// convert each character to lowercase and copy it to the new string
138138
for (size_t i = 0; i < len; i++) {
139-
s[i] = tolower(str[i]);
139+
s[i] = (char)tolower(str[i]);
140140
}
141141
} else {
142142
memcpy(s, str, len);

‎test/unit.c‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ void do_delete (sqlite3 *db, int table_mask, bool print_result) {
885885
if (print_result) printf("TESTING DELETE on %s\n", table_name);
886886

887887
char *sql = sqlite3_mprintf("DELETE FROM \"%w\" WHERE first_name='name5';", table_name);
888-
int rc = sqlite3_exec(db, sql, NULL, NULL, NULL);
888+
rc = sqlite3_exec(db, sql, NULL, NULL, NULL);
889889
sqlite3_free(sql);
890890
if (rc != SQLITE_OK) goto finalize;
891891

@@ -899,7 +899,7 @@ void do_delete (sqlite3 *db, int table_mask, bool print_result) {
899899
const char *table_name = CUSTOMERS_NOCOLS_TABLE;
900900
if (print_result) printf("TESTING DELETE on %s\n", table_name);
901901

902-
int rc = sqlite3_exec(db, "DELETE FROM \"" CUSTOMERS_NOCOLS_TABLE "\" WHERE first_name='name100005';", NULL, NULL, NULL);
902+
rc = sqlite3_exec(db, "DELETE FROM \"" CUSTOMERS_NOCOLS_TABLE "\" WHERE first_name='name100005';", NULL, NULL, NULL);
903903
if (rc != SQLITE_OK) goto finalize;
904904

905905
rc = sqlite3_exec(db, "DELETE FROM \"" CUSTOMERS_NOCOLS_TABLE "\" WHERE first_name='name100007';", NULL, NULL, NULL);
@@ -910,7 +910,7 @@ void do_delete (sqlite3 *db, int table_mask, bool print_result) {
910910
const char *table_name = "customers_noprikey";
911911
if (print_result) printf("TESTING DELETE on %s\n", table_name);
912912

913-
int rc = sqlite3_exec(db, "DELETE FROM customers_noprikey WHERE first_name='name200005';", NULL, NULL, NULL);
913+
rc = sqlite3_exec(db, "DELETE FROM customers_noprikey WHERE first_name='name200005';", NULL, NULL, NULL);
914914
if (rc != SQLITE_OK) goto finalize;
915915

916916
rc = sqlite3_exec(db, "DELETE FROM customers_noprikey WHERE first_name='name200007';", NULL, NULL, NULL);
@@ -1667,9 +1667,9 @@ bool do_test_pk (sqlite3 *db, int ntest, bool print_result) {
16671667
// cleanup memory
16681668
sqlite3_finalize(stmt);
16691669
stmt = NULL;
1670-
for (int i=0; i<nkeys; ++i) {
1671-
int t = pklist[i].type;
1672-
if ((t == SQLITE_TEXT) || (t == SQLITE_BLOB)) free(pklist[i].pvalue);
1670+
for (int k=0; k<nkeys; ++k) {
1671+
int t = pklist[k].type;
1672+
if ((t == SQLITE_TEXT) || (t == SQLITE_BLOB)) free(pklist[k].pvalue);
16731673
}
16741674
}
16751675

@@ -2537,7 +2537,7 @@ bool do_test_merge (int nclients, bool print_result, bool cleanup_databases) {
25372537
// compare results
25382538
for (int i=1; i<nclients; ++i) {
25392539
char *sql = sqlite3_mprintf("SELECT * FROM \"%w\" ORDER BY first_name, \"" CUSTOMERS_TABLE_COLUMN_LASTNAME "\";", CUSTOMERS_TABLE);
2540-
bool result = do_compare_queries(db[0], sql, db[i], sql, -1, -1, print_result);
2540+
result = do_compare_queries(db[0], sql, db[i], sql, -1, -1, print_result);
25412541
sqlite3_free(sql);
25422542
if (result == false) goto finalize;
25432543
}
@@ -2662,7 +2662,7 @@ bool do_test_merge_2 (int nclients, int table_mask, bool print_result, bool clea
26622662
for (int i=1; i<nclients; ++i) {
26632663
if (table_mask & TEST_PRIKEYS) {
26642664
char *sql = sqlite3_mprintf("SELECT * FROM \"%w\" ORDER BY first_name, \"" CUSTOMERS_TABLE_COLUMN_LASTNAME "\";", CUSTOMERS_TABLE);
2665-
bool result = do_compare_queries(db[0], sql, db[i], sql, -1, -1, print_result);
2665+
result = do_compare_queries(db[0], sql, db[i], sql, -1, -1, print_result);
26662666
sqlite3_free(sql);
26672667
if (result == false) goto finalize;
26682668
}
@@ -2763,7 +2763,7 @@ bool do_test_merge_4 (int nclients, bool print_result, bool cleanup_databases) {
27632763
// compare results
27642764
for (int i=1; i<nclients; ++i) {
27652765
sqlite3_snprintf(sizeof(buf), buf, "SELECT * FROM \"%w\" ORDER BY first_name, \"" CUSTOMERS_TABLE_COLUMN_LASTNAME "\";", CUSTOMERS_TABLE);
2766-
bool result = do_compare_queries(db[0], buf, db[i], buf, -1, -1, print_result);
2766+
result = do_compare_queries(db[0], buf, db[i], buf, -1, -1, print_result);
27672767
if (result == false) goto finalize;
27682768

27692769
const char *sql2 = "SELECT 'name1', 'surname1', 3, 'note3', 'stamp9'";
@@ -2784,9 +2784,9 @@ bool do_test_merge_4 (int nclients, bool print_result, bool cleanup_databases) {
27842784
if (rc != SQLITE_OK && db[i] && (sqlite3_errcode(db[i]) != SQLITE_OK)) printf("do_test_merge_4 error: %s\n", sqlite3_errmsg(db[i]));
27852785
if (db[i]) close_db(db[i]);
27862786
if (cleanup_databases) {
2787-
char buf[256];
2788-
do_build_database_path(buf, i, timestamp, saved_counter++);
2789-
file_delete_internal(buf);
2787+
char path[256];
2788+
do_build_database_path(path, i, timestamp, saved_counter++);
2789+
file_delete_internal(path);
27902790
}
27912791
}
27922792
return result;
@@ -2886,9 +2886,9 @@ bool do_test_merge_5 (int nclients, bool print_result, bool cleanup_databases, b
28862886
if (rc != SQLITE_OK && db[i] && (sqlite3_errcode(db[i]) != SQLITE_OK)) printf("do_test_merge_5: %s\n", sqlite3_errmsg(db[i]));
28872887
if (db[i]) close_db(db[i]);
28882888
if (cleanup_databases) {
2889-
char buf[256];
2890-
do_build_database_path(buf, i, timestamp, saved_counter++);
2891-
file_delete_internal(buf);
2889+
char path[256];
2890+
do_build_database_path(path, i, timestamp, saved_counter++);
2891+
file_delete_internal(path);
28922892
}
28932893
}
28942894
return result;
@@ -3056,9 +3056,9 @@ bool do_test_merge_check_db_version_2 (int nclients, bool print_result, bool cle
30563056
}
30573057

30583058
// check grouped values from cloudsync_changes
3059-
char *query_changes = "SELECT db_version, COUNT(distinct(seq)) AS cnt FROM cloudsync_changes GROUP BY db_version;";
3059+
char *sql_changes = "SELECT db_version, COUNT(distinct(seq)) AS cnt FROM cloudsync_changes GROUP BY db_version;";
30603060
char *query_expected_results = "SELECT * FROM (VALUES (1,2),(2,2),(3,2),(4,2),(5,4));";
3061-
if (do_compare_queries(db[0], query_changes, db[0], query_expected_results, -1, -1, print_result) == false) {
3061+
if (do_compare_queries(db[0], sql_changes, db[0], query_expected_results, -1, -1, print_result) == false) {
30623062
goto finalize;
30633063
}
30643064

@@ -3139,8 +3139,7 @@ bool do_test_insert_cloudsync_changes (bool print_result, bool cleanup_databases
31393139

31403140
if (print_result) {
31413141
printf("\n-> customers\n");
3142-
char *sql = "SELECT * FROM todo;";
3143-
do_query(db, sql, query_changes);
3142+
do_query(db, "SELECT * FROM todo;", query_changes);
31443143
}
31453144

31463145
result = true;
@@ -3221,7 +3220,7 @@ bool do_test_merge_alter_schema_1 (int nclients, bool print_result, bool cleanup
32213220
// compare results
32223221
for (int i=1; i<nclients; ++i) {
32233222
char *sql = sqlite3_mprintf("SELECT * FROM \"%w\" ORDER BY first_name, \"" CUSTOMERS_TABLE_COLUMN_LASTNAME "\";", CUSTOMERS_TABLE);
3224-
bool result = do_compare_queries(db[0], sql, db[i], sql, -1, -1, print_result);
3223+
result = do_compare_queries(db[0], sql, db[i], sql, -1, -1, print_result);
32253224
sqlite3_free(sql);
32263225
if (result == false) goto finalize;
32273226
}
@@ -4971,9 +4970,9 @@ bool do_test_merge_index_consistency (int nclients, bool print_result, bool clea
49714970
rc = sqlite3_prepare_v2(db[i], sql, -1, &stmt, NULL);
49724971
if (rc == SQLITE_OK) {
49734972
if (sqlite3_step(stmt) == SQLITE_ROW) {
4974-
const char *result = (const char*)sqlite3_column_text(stmt, 0);
4975-
if (strcmp(result, "ok") != 0) {
4976-
printf("Index integrity issue in client %d: %s\n", i, result);
4973+
const char *result2 = (const char*)sqlite3_column_text(stmt, 0);
4974+
if (strcmp(result2, "ok") != 0) {
4975+
printf("Index integrity issue in client %d: %s\n", i, result2);
49774976
sqlite3_finalize(stmt);
49784977
goto finalize;
49794978
}
@@ -5607,8 +5606,8 @@ bool do_test_prikey (int nclients, bool print_result, bool cleanup_databases) {
56075606

56085607
// compare results
56095608
for (int i=1; i<nclients; ++i) {
5610-
const char *sql = "SELECT * FROM foo ORDER BY a;";
5611-
if (do_compare_queries(db[0], sql, db[i], sql, -1, -1, print_result) == false) goto finalize;
5609+
const char *sql_query = "SELECT * FROM foo ORDER BY a;";
5610+
if (do_compare_queries(db[0], sql_query, db[i], sql_query, -1, -1, print_result) == false) goto finalize;
56125611
}
56135612

56145613
result = true;
@@ -5736,8 +5735,8 @@ bool do_test_gos (int nclients, bool print_result, bool cleanup_databases) {
57365735

57375736
// compare results
57385737
for (int i=1; i<nclients; ++i) {
5739-
const char *sql = "SELECT * FROM log ORDER BY id;";
5740-
if (do_compare_queries(db[0], sql, db[i], sql, -1, -1, print_result) == false) goto finalize;
5738+
const char *sql_query = "SELECT * FROM log ORDER BY id;";
5739+
if (do_compare_queries(db[0], sql_query, db[i], sql_query, -1, -1, print_result) == false) goto finalize;
57415740
}
57425741

57435742
if (print_result) {
@@ -5813,7 +5812,7 @@ bool do_test_network_encode_decode (int nclients, bool print_result, bool cleanu
58135812

58145813
char *blob = NULL;
58155814
db_int64 blob_size = 0;
5816-
int rc = database_select_blob(db[target], src_sql, &blob, &blob_size);
5815+
rc = database_select_blob(db[target], src_sql, &blob, &blob_size);
58175816
if ((rc != DBRES_OK) || (!blob)) goto finalize;
58185817

58195818
const char *values[] = {blob};
@@ -5830,7 +5829,7 @@ bool do_test_network_encode_decode (int nclients, bool print_result, bool cleanu
58305829
// compare results
58315830
for (int i=1; i<nclients; ++i) {
58325831
char *sql = sqlite3_mprintf("SELECT * FROM \"%w\" ORDER BY first_name, \"" CUSTOMERS_TABLE_COLUMN_LASTNAME "\";", CUSTOMERS_TABLE);
5833-
bool result = do_compare_queries(db[0], sql, db[i], sql, -1, -1, print_result);
5832+
result = do_compare_queries(db[0], sql, db[i], sql, -1, -1, print_result);
58345833
sqlite3_free(sql);
58355834
if (result == false) goto finalize;
58365835
}
@@ -6018,7 +6017,7 @@ bool do_test_alter(int nclients, int alter_version, bool print_result, bool clea
60186017
sql = sqlite3_mprintf("SELECT * FROM \"%w\" ORDER BY first_name, \"" CUSTOMERS_TABLE_COLUMN_LASTNAME "\";", CUSTOMERS_TABLE);
60196018
break;
60206019
}
6021-
bool result = do_compare_queries(db[0], sql, db[i], sql, -1, -1, print_result);
6020+
result = do_compare_queries(db[0], sql, db[i], sql, -1, -1, print_result);
60226021
sqlite3_free(sql);
60236022
if (result == false) goto finalize;
60246023
}

0 commit comments

Comments
 (0)