mirror of
https://github.com/mdbtools/mdbtools.git
synced 2026-03-10 00:20:54 +08:00
Lots more gcc warnings fixes
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
int j;
|
||||
unsigned int j;
|
||||
MdbHandle *mdb;
|
||||
MdbTableDef *table;
|
||||
MdbColumn *col;
|
||||
|
||||
@@ -49,7 +49,7 @@ print_col(gchar *col_val, int quote_text, int col_type)
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
int j;
|
||||
unsigned int j;
|
||||
MdbHandle *mdb;
|
||||
MdbTableDef *table;
|
||||
MdbColumn *col;
|
||||
|
||||
@@ -35,7 +35,7 @@ void copy_header (FILE *f)
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
int i, j, k;
|
||||
unsigned int i, j, k;
|
||||
MdbHandle *mdb;
|
||||
MdbCatalogEntry *entry;
|
||||
MdbTableDef *table;
|
||||
|
||||
@@ -109,7 +109,7 @@ prep_row(MdbTableDef *table, unsigned char *line, MdbField *fields, char *delim)
|
||||
MdbColumn *col;
|
||||
char delims[20];
|
||||
char *s;
|
||||
int file_cols;
|
||||
unsigned int file_cols;
|
||||
|
||||
/*
|
||||
* pull apart the row and turn it into something respectable
|
||||
|
||||
@@ -30,7 +30,7 @@ static void generate_table_schema(MdbCatalogEntry *entry, char *namespace, int s
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
int i;
|
||||
unsigned int i;
|
||||
MdbHandle *mdb;
|
||||
MdbCatalogEntry *entry;
|
||||
char *the_relation;
|
||||
@@ -131,7 +131,7 @@ generate_table_schema(MdbCatalogEntry *entry, char *namespace, int sanitize)
|
||||
{
|
||||
MdbTableDef *table;
|
||||
MdbHandle *mdb = entry->mdb;
|
||||
int i;
|
||||
unsigned int i;
|
||||
MdbColumn *col;
|
||||
|
||||
/* make sure it's a table (may be redundant) */
|
||||
|
||||
@@ -167,12 +167,12 @@ do_set_cmd(MdbSQL *sql, char *s)
|
||||
}
|
||||
|
||||
int
|
||||
read_file(char *s, int line, int *bufsz, char *mybuf)
|
||||
read_file(char *s, int line, unsigned int *bufsz, char *mybuf)
|
||||
{
|
||||
char *fname;
|
||||
FILE *in;
|
||||
char buf[256];
|
||||
int cursz = 0;
|
||||
unsigned int cursz = 0;
|
||||
int lines = 0;
|
||||
|
||||
fname = s;
|
||||
@@ -252,12 +252,9 @@ int i;
|
||||
void
|
||||
dump_results(MdbSQL *sql)
|
||||
{
|
||||
int j;
|
||||
unsigned int j;
|
||||
MdbSQLColumn *sqlcol;
|
||||
unsigned long row_count = 0;
|
||||
int rows, rc, i;
|
||||
MdbHandle *mdb = sql->mdb;
|
||||
MdbFormatConstants *fmt = mdb->fmt;
|
||||
|
||||
if (headers) {
|
||||
for (j=0;j<sql->num_columns-1;j++) {
|
||||
@@ -292,12 +289,14 @@ dump_results(MdbSQL *sql)
|
||||
void
|
||||
dump_results_pp(MdbSQL *sql)
|
||||
{
|
||||
int j;
|
||||
unsigned int j;
|
||||
MdbSQLColumn *sqlcol;
|
||||
unsigned long row_count = 0;
|
||||
/*
|
||||
int rows, rc, i;
|
||||
MdbHandle *mdb = sql->mdb;
|
||||
MdbFormatConstants *fmt = mdb->fmt;
|
||||
*/
|
||||
|
||||
/* print header */
|
||||
if (headers) {
|
||||
@@ -381,7 +380,7 @@ char *s;
|
||||
char prompt[20];
|
||||
int line = 1;
|
||||
char *mybuf;
|
||||
int bufsz = 4096;
|
||||
unsigned int bufsz = 4096;
|
||||
int done = 0;
|
||||
MdbSQL *sql;
|
||||
int opt;
|
||||
@@ -475,7 +474,7 @@ char *histpath;
|
||||
} else {
|
||||
while (strlen(mybuf) + strlen(s) > bufsz) {
|
||||
bufsz *= 2;
|
||||
mybuf = (char *) realloc(mybuf, bufsz);
|
||||
mybuf = (char *) g_realloc(mybuf, bufsz);
|
||||
}
|
||||
/* don't record blank lines */
|
||||
if (strlen(s)) add_history(s);
|
||||
|
||||
@@ -78,7 +78,7 @@ get_obj_type(char *typename, int *ret)
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
int i;
|
||||
unsigned int i;
|
||||
MdbHandle *mdb;
|
||||
MdbCatalogEntry *entry;
|
||||
char *delimiter = NULL;
|
||||
|
||||
@@ -26,7 +26,7 @@ void walk_index(MdbHandle *mdb, MdbIndex *idx);
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
int j;
|
||||
unsigned int j;
|
||||
MdbHandle *mdb;
|
||||
MdbTableDef *table;
|
||||
MdbIndex *idx;
|
||||
|
||||
@@ -65,7 +65,7 @@ main(int argc, char **argv)
|
||||
|
||||
void dump_ole(MdbTableDef *table, char *colname, char *sargname)
|
||||
{
|
||||
int i, found = 0;
|
||||
unsigned int i, found = 0;
|
||||
char ole_data[200000];
|
||||
int len;
|
||||
MdbColumn *col;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
int i;
|
||||
unsigned int i;
|
||||
MdbHandle *mdb;
|
||||
MdbCatalogEntry *entry;
|
||||
int found = 0;
|
||||
|
||||
@@ -72,8 +72,8 @@ int len;
|
||||
|
||||
int bind_column(MdbTableDef *table, char *colname, unsigned char *data, int *len)
|
||||
{
|
||||
int i, found = 0;
|
||||
MdbColumn *col;
|
||||
unsigned int i, found = 0;
|
||||
MdbColumn *col;
|
||||
|
||||
for (i=0;i<table->num_cols;i++) {
|
||||
col=g_ptr_array_index(table->columns,i);
|
||||
@@ -91,7 +91,7 @@ void read_to_row(MdbTableDef *table, char *sargname)
|
||||
{
|
||||
static MdbSargNode sarg;
|
||||
char *sargcol, *sargop, *sargval;
|
||||
int i;
|
||||
unsigned int i;
|
||||
MdbColumn *col;
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user