odbc driver: fix pointer-sign compiler warrnings (#2086)

db/drivers/odbc/create_table.c

@@ -7,8 +7,7 @@ int db__driver_create_table(dbTable * table)
 {
     dbString sql;
     cursor *c;
-    char msg[OD_MSG];
-    char *emsg = NULL;
+    SQLCHAR msg[OD_MSG];
     SQLRETURN ret;
     SQLINTEGER err;
 
@@ -23,7 +22,7 @@ int db__driver_create_table(dbTable * table)
     if (c == NULL)
 	return DB_FAILED;
 
-    ret = SQLExecDirect(c->stmt, db_get_string(&sql), SQL_NTS);
+    ret = SQLExecDirect(c->stmt, (SQLCHAR *)db_get_string(&sql), SQL_NTS);
 
     if ((ret != SQL_SUCCESS) && (ret != SQL_SUCCESS_WITH_INFO)) {
 	SQLGetDiagRec(SQL_HANDLE_STMT, c->stmt, 1, NULL, &err, msg,
@@ -31,7 +30,6 @@ int db__driver_create_table(dbTable * table)
 	db_d_append_error("SQLExecDirect():\n%s\n%s (%d)\n",
 			  db_get_string(&sql), msg, (int)err);
 	db_d_report_error();
-	G_free(emsg);
 
 	return DB_FAILED;
     }

db/drivers/odbc/cursor.c

@@ -27,7 +27,7 @@ cursor *alloc_cursor()
 {
     cursor *c;
     SQLRETURN ret;
-    char msg[OD_MSG];
+    SQLCHAR msg[OD_MSG];
     SQLINTEGER err;
 
     /* allocate the cursor */

db/drivers/odbc/db.c

@@ -8,7 +8,7 @@
 
 int db__driver_open_database(dbHandle * handle)
 {
-    char msg[OD_MSG];
+    SQLCHAR msg[OD_MSG];
     const char *name;
     SQLRETURN ret;
     SQLINTEGER err;

db/drivers/odbc/describe.c

@@ -18,7 +18,7 @@ int db__driver_describe_table(table_name, table)
     SQLRETURN ret;
     cursor *c;
     char s[100];
-    char msg[OD_MSG];
+    SQLCHAR msg[OD_MSG];
 
     /* allocate cursor */
     c = alloc_cursor();
@@ -31,7 +31,7 @@ int db__driver_describe_table(table_name, table)
 
     sprintf(s, "select * from %s", name);
 
-    ret = SQLExecDirect(c->stmt, s, SQL_NTS);
+    ret = SQLExecDirect(c->stmt, (SQLCHAR *)s, SQL_NTS);
     if ((ret != SQL_SUCCESS) && (ret != SQL_SUCCESS_WITH_INFO)) {
 	SQLGetDiagRec(SQL_HANDLE_STMT, c->stmt, 1, NULL, &err, msg,
 		      sizeof(msg), NULL);
@@ -69,7 +69,7 @@ int describe_table(stmt, table)
     dbColumn *column;
     int col;
     SQLLEN intval;
-    SQLUSMALLINT ncols;
+    SQLSMALLINT ncols;
     SQLRETURN ret;
     SQLCHAR charval[100];
 
@@ -92,12 +92,12 @@ int describe_table(stmt, table)
 
 	SQLColAttribute(stmt, col + 1, SQL_COLUMN_NAME, charval,
 			sizeof(charval), NULL, NULL);
-	db_set_column_name(column, charval);
+	db_set_column_name(column, (const char *)charval);
 
 	/* label(title) is not description, but I did not found better attribute and it can say something about column */
 	SQLColAttribute(stmt, col + 1, SQL_COLUMN_LABEL, charval,
 			sizeof(charval), NULL, NULL);
-	db_set_column_description(column, charval);
+	db_set_column_description(column, (const char *)charval);
 
 	SQLColAttribute(stmt, col + 1, SQL_COLUMN_LENGTH, NULL, 0, NULL,
 			&intval);

db/drivers/odbc/execute.c

@@ -22,7 +22,8 @@
 
 int db__driver_execute_immediate(dbString * sql)
 {
-    char *s, msg[OD_MSG];
+    char *s;
+    SQLCHAR msg[OD_MSG];
     cursor *c;
     SQLRETURN ret;
     SQLINTEGER err;
@@ -34,7 +35,7 @@ int db__driver_execute_immediate(dbString * sql)
     if (c == NULL)
 	return DB_FAILED;
 
-    ret = SQLExecDirect(c->stmt, s, SQL_NTS);
+    ret = SQLExecDirect(c->stmt, (SQLCHAR *)s, SQL_NTS);
     if ((ret != SQL_SUCCESS) && (ret != SQL_SUCCESS_WITH_INFO)) {
 	SQLGetDiagRec(SQL_HANDLE_STMT, c->stmt, 1, NULL, &err, msg,
 		      sizeof(msg), NULL);

db/drivers/odbc/listdb.c

@@ -8,7 +8,7 @@ int db__driver_list_databases(dbString *dbpath, int npaths, dbHandle **dblist, i
 {
     int i, count = 0;
     dbHandle *list;
-    char dsn[SQL_MAX_DSN_LENGTH], desc[100];
+    SQLCHAR dsn[SQL_MAX_DSN_LENGTH], desc[100];
     SQLUSMALLINT next;
 
     *dblist = NULL;
@@ -36,7 +36,7 @@ int db__driver_list_databases(dbString *dbpath, int npaths, dbHandle **dblist, i
     while (SQLDataSources(ODenvi, next, dsn, sizeof(dsn),
 			  NULL, desc, sizeof(desc), NULL) == SQL_SUCCESS) {
 	db_init_handle(&list[i]);
-	if (db_set_handle(&list[i], dsn, desc) != DB_OK) {
+	if (db_set_handle(&list[i], (const char *)dsn, (const char *)desc) != DB_OK) {
 	    db_d_append_error(_("Unable to set handle"));
 	    db_d_report_error();
 	    db_free_handle_array(list, count);

db/drivers/odbc/listtab.c

@@ -30,7 +30,7 @@ int db__driver_list_tables(tlist, tcount, system)
     else
 	sprintf(ttype, "TABLE, VIEW");
 
-    ret = SQLTables(c->stmt, NULL, 0, NULL, 0, NULL, 0, ttype, sizeof(ttype));
+    ret = SQLTables(c->stmt, NULL, 0, NULL, 0, NULL, 0, (SQLCHAR *)ttype, sizeof(ttype));
 
     if (ret != SQL_SUCCESS && ret != SQL_SUCCESS_WITH_INFO) {
 	db_d_append_error("SQLTables()");

db/drivers/odbc/select.c

@@ -9,7 +9,8 @@ int db__driver_open_select_cursor(dbString *sel, dbCursor *dbc, int mode)
     cursor *c;
     SQLRETURN ret;
     SQLINTEGER err;
-    char *sql, msg[OD_MSG];
+    char *sql;
+    SQLCHAR msg[OD_MSG];
     dbTable *table;
     int nrows;
 
@@ -23,7 +24,7 @@ int db__driver_open_select_cursor(dbString *sel, dbCursor *dbc, int mode)
 
     sql = db_get_string(sel);
 
-    ret = SQLExecDirect(c->stmt, sql, SQL_NTS);
+    ret = SQLExecDirect(c->stmt, (SQLCHAR *)sql, SQL_NTS);
     if ((ret != SQL_SUCCESS) && (ret != SQL_SUCCESS_WITH_INFO)) {
 	SQLGetDiagRec(SQL_HANDLE_STMT, c->stmt, 1, NULL, &err, msg,
 		      sizeof(msg), NULL);

db/drivers/odbc/table.c

@@ -127,7 +127,7 @@ int db__driver_drop_table(dbString * name)
     char cmd[200];
     cursor *c;
     SQLRETURN ret;
-    char msg[OD_MSG];
+    SQLCHAR msg[OD_MSG];
     SQLINTEGER err;
     SQLCHAR ttype[50], *tname;
     SQLLEN nrow = 0;
@@ -138,7 +138,7 @@ int db__driver_drop_table(dbString * name)
     if (c == NULL)
 	return DB_FAILED;
 
-    tname = db_get_string(name);
+    tname = (SQLCHAR *)db_get_string(name);
 
     ret = SQLTables(c->stmt, NULL, 0, NULL, 0, tname, sizeof(tname), NULL, 0);
     if ((ret != SQL_SUCCESS) && (ret != SQL_SUCCESS_WITH_INFO)) {
@@ -166,10 +166,10 @@ int db__driver_drop_table(dbString * name)
     ret = SQLFetchScroll(c->stmt, SQL_FETCH_NEXT, 0);
     ret = SQLGetData(c->stmt, 4, SQL_C_CHAR, ttype, sizeof(ttype), NULL);
 
-    if (strcmp(ttype, "TABLE") == 0) {
+    if (strcmp((const char *)ttype, "TABLE") == 0) {
 	sprintf(cmd, "DROP TABLE %s", tname);
     }
-    else if (strcmp(ttype, "VIEW") == 0) {
+    else if (strcmp((const char *)ttype, "VIEW") == 0) {
 	sprintf(cmd, "DROP VIEW %s", tname);
     }
     else {
@@ -182,7 +182,7 @@ int db__driver_drop_table(dbString * name)
 
     SQLCloseCursor(c->stmt);
 
-    ret = SQLExecDirect(c->stmt, cmd, SQL_NTS);
+    ret = SQLExecDirect(c->stmt, (SQLCHAR *)cmd, SQL_NTS);
     if ((ret != SQL_SUCCESS) && (ret != SQL_SUCCESS_WITH_INFO)) {
 	SQLGetDiagRec(SQL_HANDLE_STMT, c->stmt, 1, NULL, &err, msg,
 		      sizeof(msg), NULL);

visualization/ximgview/main.c

@@ -248,7 +248,7 @@ static int read_bmp_header(const unsigned char *p)
 
 static void map_file(const char *filename)
 {
-    char header[HEADER_SIZE];
+    unsigned char header[HEADER_SIZE];
     size_t size;
     void *ptr;
     int fd;