Remove unnecessary casts

src/libmdb/backend.c

@@ -399,7 +399,7 @@ void mdb_register_backend(MdbHandle *mdb, char *backend_name, guint32 capabiliti
         const char *per_table_comment_statement,
         gchar* (*quote_schema_name)(const gchar*, const gchar*))
 {
-	MdbBackend *backend = (MdbBackend *) g_malloc0(sizeof(MdbBackend));
+	MdbBackend *backend = g_malloc0(sizeof(MdbBackend));
 	backend->capabilities = capabilities;
 	backend->types_table = backend_type;
 	backend->type_shortdate = type_shortdate;
@@ -666,7 +666,7 @@ mdb_get_relationships(MdbHandle *mdb, const gchar *dbnamespace, const char* tabl
 
 		mdb_read_columns(mdb->relationships_table);
 		for (i=0;i<5;i++) {
-			bound[i] = (char *) g_malloc0(mdb->bind_size);
+			bound[i] = g_malloc0(mdb->bind_size);
 		}
 		mdb_bind_column_by_name(mdb->relationships_table, "szColumn", bound[0], NULL);
 		mdb_bind_column_by_name(mdb->relationships_table, "szObject", bound[1], NULL);

src/libmdb/catalog.c

@@ -129,7 +129,7 @@ GPtrArray *mdb_read_catalog (MdbHandle *mdb, int objtype)
 		if (objtype==MDB_ANY || type == objtype) {
 			//fprintf(stderr, "obj_id: %10ld objtype: %-3d (0x%04x) obj_name: %s\n",
 			//	(atol(obj_id) & 0x00FFFFFF), type, type, obj_name);
-			entry = (MdbCatalogEntry *) g_malloc0(sizeof(MdbCatalogEntry));
+			entry = g_malloc0(sizeof(MdbCatalogEntry));
 			entry->mdb = mdb;
 			snprintf(entry->object_name, sizeof(entry->object_name), "%s", obj_name);
 			entry->object_type = (type & 0x7F);

src/libmdb/data.c

@@ -497,7 +497,7 @@ void mdb_data_dump(MdbTableDef *table)
 	char **bound_values = calloc(table->num_cols, sizeof(char *));
 
 	for (i=0;i<table->num_cols;i++) {
-		bound_values[i] = (char *) g_malloc(MDB_BIND_SIZE);
+		bound_values[i] = g_malloc(MDB_BIND_SIZE);
 		ret = mdb_bind_column(table, i+1, bound_values[i], NULL);
 		if (ret == -1) {
 			fprintf(stderr, "error binding column %d\n", i+1);
@@ -744,7 +744,7 @@ static char *mdb_memo_to_string(MdbHandle *mdb, int start, int size)
 	gint32 row_start, pg_row;
 	size_t len;
 	void *buf, *pg_buf = mdb->pg_buf;
-	char *text = (char *) g_malloc(mdb->bind_size);
+	char *text = g_malloc(mdb->bind_size);
 
 	if (size<MDB_MEMO_OVERHEAD) {
 		strcpy(text, "");
@@ -788,7 +788,7 @@ static char *mdb_memo_to_string(MdbHandle *mdb, int start, int size)
 		guint32 tmpoff = 0;
 		char *tmp;
 
-		tmp = (char *) g_malloc(memo_len);
+		tmp = g_malloc(memo_len);
 		pg_row = mdb_get_int32(pg_buf, start+4);
 		do {
 #if MDB_DEBUG
@@ -919,7 +919,7 @@ static char *
 mdb_date_to_string(MdbHandle *mdb, const char *fmt, void *buf, int start)
 {
 	struct tm t = { 0 };
-	char *text = (char *) g_malloc(mdb->bind_size);
+	char *text = g_malloc(mdb->bind_size);
 	double td = mdb_get_double(buf, start);
 
 	mdb_date_to_tm(td, &t);
@@ -1019,7 +1019,7 @@ char *mdb_col_to_string(MdbHandle *mdb, void *buf, int start, int datatype, int
 			if (size<0) {
 				text = g_strdup("");
 			} else {
-				text = (char *) g_malloc(mdb->bind_size);
+				text = g_malloc(mdb->bind_size);
 				mdb_unicode2ascii(mdb, (char*)buf + start,
 					size, text, mdb->bind_size);
 			}

src/libmdb/file.c

@@ -180,7 +180,7 @@ static char *mdb_find_file(const char *file_name)
  * Return value: The handle on success, NULL on failure
  */
 static MdbHandle *mdb_handle_from_stream(FILE *stream, MdbFileFlags flags) {
-	MdbHandle *mdb = (MdbHandle *) g_malloc0(sizeof(MdbHandle));
+	MdbHandle *mdb = g_malloc0(sizeof(MdbHandle));
 	mdb_set_default_backend(mdb, "access");
     mdb_set_date_fmt(mdb, "%x %X");
     mdb_set_shortdate_fmt(mdb, "%x");
@@ -192,7 +192,7 @@ static MdbHandle *mdb_handle_from_stream(FILE *stream, MdbFileFlags flags) {
 #endif
 	/* need something to bootstrap with, reassign after page 0 is read */
 	mdb->fmt = &MdbJet3Constants;
-	mdb->f = (MdbFile *) g_malloc0(sizeof(MdbFile));
+	mdb->f = g_malloc0(sizeof(MdbFile));
 	mdb->f->refs = 1;
 	mdb->f->stream = stream;
 	if (flags & MDB_WRITABLE) {

src/libmdb/iconv.c

@@ -145,7 +145,7 @@ mdb_unicode2ascii(MdbHandle *mdb, const char *src, size_t slen, char *dest, size
 	/* Uncompress 'Unicode Compressed' string into tmp */
 	if (!IS_JET3(mdb) && (slen>=2)
 			&& ((src[0]&0xff)==0xff) && ((src[1]&0xff)==0xfe)) {
-		tmp = (char *)g_malloc(slen*2);
+		tmp = g_malloc(slen*2);
 		len_in = decompress_unicode(src + 2, slen - 2, tmp, slen * 2);
 		in_ptr = tmp;
 	} else {

src/libmdb/index.c

@@ -236,12 +236,12 @@ mdb_read_indices(MdbTableDef *table)
 	//fprintf(stderr, "num_idxs:%d num_real_idxs:%d\n", table->num_idxs, table->num_real_idxs);
 
 	table->num_real_idxs = 0;
-	tmpbuf = (gchar *) g_malloc(idx2_sz);
+	tmpbuf = g_malloc(idx2_sz);
 	for (i=0;i<table->num_idxs;i++) {
 		read_pg_if_n(mdb, tmpbuf, &cur_pos, idx2_sz);
                 //fprintf(stderr, "Index defn: ");
                 //hexdump((unsigned char *)tmpbuf, idx2_sz);
-		pidx = (MdbIndex *) g_malloc0(sizeof(MdbIndex));
+		pidx = g_malloc0(sizeof(MdbIndex));
 		pidx->table = table;
 		pidx->index_num = mdb_get_int16(tmpbuf, 4);
 		pidx->index_type = tmpbuf[type_offset];

src/libmdb/money.c

@@ -137,7 +137,7 @@ static char *array_to_string(unsigned char *array, size_t len, unsigned int scal
        for (top=len;(top>0) && (top-1>scale) && !array[top-1];top--);
 
        /* allocate enough space for all digits + minus sign + decimal point + trailing NULL byte */
-       s = (char *) g_malloc(len+3);
+       s = g_malloc(len+3);
 
 	if (neg)
 		s[j++] = '-';

src/libmdb/table.c

@@ -30,9 +30,7 @@ static gint mdb_col_comparer(MdbColumn **a, MdbColumn **b)
 
 MdbTableDef *mdb_alloc_tabledef(MdbCatalogEntry *entry)
 {
-	MdbTableDef *table;
+	MdbTableDef *table = g_malloc0(sizeof(MdbTableDef));
-
-	table = (MdbTableDef *) g_malloc0(sizeof(MdbTableDef));
 	table->entry=entry;
 	snprintf(table->name, sizeof(table->name), "%s", entry->object_name);
 
@@ -231,7 +229,7 @@ GPtrArray *mdb_read_columns(MdbTableDef *table)
 	
 	table->columns = g_ptr_array_new();
 
-	col = (unsigned char *) g_malloc(fmt->tab_col_entry_size);
+	col = g_malloc(fmt->tab_col_entry_size);
 
 	cur_pos = fmt->tab_cols_start_offset + 
 		(table->num_real_idxs * fmt->tab_ridx_entry_size);
@@ -247,7 +245,7 @@ GPtrArray *mdb_read_columns(MdbTableDef *table)
 	mdb_buffer_dump(mdb->pg_buf, cur_pos, fmt->tab_col_entry_size); */
 #endif
 		read_pg_if_n(mdb, col, &cur_pos, fmt->tab_col_entry_size);
-		pcol = (MdbColumn *) g_malloc0(sizeof(MdbColumn));
+		pcol = g_malloc0(sizeof(MdbColumn));
 
 		pcol->table = table;
 
@@ -304,7 +302,7 @@ GPtrArray *mdb_read_columns(MdbTableDef *table)
 			name_sz = read_pg_if_8(mdb, &cur_pos);
 		else
 			name_sz = read_pg_if_16(mdb, &cur_pos);
-		tmp_buf = (char *) g_malloc(name_sz);
+		tmp_buf = g_malloc(name_sz);
 		read_pg_if_n(mdb, tmp_buf, &cur_pos, name_sz);
 		mdb_unicode2ascii(mdb, tmp_buf, name_sz, pcol->name, sizeof(pcol->name));
 		g_free(tmp_buf);

src/libmdb/worktable.c

@@ -53,7 +53,7 @@ mdb_create_temp_table(MdbHandle *mdb, char *name)
 	MdbTableDef *table;
 
 	/* dummy up a catalog entry */
-	entry = (MdbCatalogEntry *) g_malloc0(sizeof(MdbCatalogEntry));
+	entry = g_malloc0(sizeof(MdbCatalogEntry));
 	entry->mdb = mdb;
 	entry->object_type = MDB_TABLE;
 	entry->table_pg = 0;

src/libmdb/write.c

@@ -212,7 +212,7 @@ mdb_crack_row(MdbTableDef *table, int row_start, size_t row_size, MdbField *fiel
 		row_var_cols = IS_JET3(mdb) ?
 			mdb_get_byte(pg_buf, row_end - bitmask_sz) :
 			mdb_get_int16(pg_buf, row_end - bitmask_sz - 1);
-		var_col_offsets = (unsigned int *)g_malloc((row_var_cols+1)*sizeof(int));
+		var_col_offsets = g_malloc((row_var_cols+1)*sizeof(int));
         int success = 0;
 		if (IS_JET3(mdb)) {
 			success = mdb_crack_row3(mdb, row_start, row_end, bitmask_sz,
@@ -401,7 +401,7 @@ mdb_pack_row3(MdbTableDef *table, unsigned char *row_buffer, unsigned int num_fi
 		}
 	}
 
-	offset_high = (unsigned char *) g_malloc(var_cols+1);
+	offset_high = g_malloc(var_cols+1);
 	offset_high[0] = (pos >> 8) & 0xff;
 	j = 1;
 	

src/odbc/connectparams.c

@@ -54,7 +54,7 @@ static void cleanup (gpointer key, gpointer value, gpointer user_data);
 
 ConnectParams* NewConnectParams ()
 {
-   ConnectParams* params = (ConnectParams *) g_malloc(sizeof (ConnectParams));
+   ConnectParams* params = g_malloc(sizeof(ConnectParams));
    if (!params)
       return params;
    
@@ -298,7 +298,7 @@ static void cleanup (gpointer key, gpointer value, gpointer user_data)
 int
 ODBCINSTGetProperties(HODBCINSTPROPERTY hLastProperty)
 {
-	hLastProperty->pNext = (HODBCINSTPROPERTY) malloc(sizeof(ODBCINSTPROPERTY));
+	hLastProperty->pNext = malloc(sizeof(ODBCINSTPROPERTY));
 	hLastProperty = hLastProperty->pNext;
 	memset(hLastProperty, 0, sizeof(ODBCINSTPROPERTY));
 	hLastProperty->nPromptType = ODBCINST_PROMPTTYPE_FILENAME;

src/odbc/odbc.c

@@ -478,7 +478,7 @@ struct _hdbc* dbc;
 
 	TRACE("SQLAllocConnect");
 	env = (struct _henv *) henv;
-	dbc = (SQLHDBC) g_malloc0(sizeof(struct _hdbc));
+	dbc = g_malloc0(sizeof(struct _hdbc));
 	dbc->henv=env;
 	g_ptr_array_add(env->connections, dbc);
 	dbc->params = NewConnectParams ();
@@ -498,7 +498,7 @@ SQLRETURN SQL_API SQLAllocEnv(
 struct _henv *env;
 
 	TRACE("SQLAllocEnv");
-	env = (SQLHENV) g_malloc0(sizeof(struct _henv));
+	env = g_malloc0(sizeof(struct _henv));
 	env->connections = g_ptr_array_new();
 	*phenv=env;
 	return SQL_SUCCESS;
@@ -514,7 +514,7 @@ SQLRETURN SQL_API SQLAllocStmt(
 	TRACE("SQLAllocStmt");
 	dbc = (struct _hdbc *) hdbc;
 
-	stmt = (SQLHSTMT) g_malloc0(sizeof(struct _hstmt));
+	stmt = g_malloc0(sizeof(struct _hstmt));
 	stmt->hdbc=dbc;
 	g_ptr_array_add(dbc->statements, stmt);
 	stmt->sql = mdb_sql_init();
@@ -572,7 +572,7 @@ SQLRETURN SQL_API SQLBindCol(
    		cur->varaddr = (char *) rgbValue;
 	} else {
 		/* didn't find it create a new one */
-		newitem = (struct _sql_bind_info *) g_malloc0(sizeof(struct _sql_bind_info));
+		newitem = g_malloc0(sizeof(struct _sql_bind_info));
 		newitem->column_number = icol;
 		newitem->column_bindtype = fCType;
    		newitem->column_bindlen = cbValueMax;

src/sql/mdbsql.c

@@ -63,9 +63,7 @@ va_list ap;
 
 MdbSQL *mdb_sql_init()
 {
-MdbSQL *sql;
+MdbSQL *sql = g_malloc0(sizeof(MdbSQL));
-
-	sql = (MdbSQL *) g_malloc0(sizeof(MdbSQL));
 	sql->columns = g_ptr_array_new();
 	sql->tables = g_ptr_array_new();
 	sql->bound_values = g_ptr_array_new();
@@ -512,9 +510,7 @@ mdb_sql_sel_count(MdbSQL *sql)
 
 int mdb_sql_add_column(MdbSQL *sql, char *column_name)
 {
-	MdbSQLColumn *c;
+	MdbSQLColumn *c = g_malloc0(sizeof(MdbSQLColumn));
-
-	c = (MdbSQLColumn *) g_malloc0(sizeof(MdbSQLColumn));
 	c->name = g_strdup(column_name);
 	g_ptr_array_add(sql->columns, c);
 	sql->num_columns++;
@@ -544,9 +540,7 @@ int mdb_sql_add_function1(MdbSQL *sql, char *func_name, char *arg1)
 }
 int mdb_sql_add_table(MdbSQL *sql, char *table_name)
 {
-	MdbSQLTable *t;
+	MdbSQLTable *t = g_malloc0(sizeof(MdbSQLTable));
-
-	t = (MdbSQLTable *) g_malloc0(sizeof(MdbSQLTable));
 	t->name = g_strdup(table_name);
 	t->alias = NULL;
 	g_ptr_array_add(sql->tables, t);

src/util/mdb-export.c

@@ -168,11 +168,11 @@ main(int argc, char **argv)
 	mdb_read_columns(table);
 	mdb_rewind_table(table);
 
-	bound_values = (char **) g_malloc(table->num_cols * sizeof(char *));
+	bound_values = g_malloc(table->num_cols * sizeof(char *));
-	bound_lens = (int *) g_malloc(table->num_cols * sizeof(int));
+	bound_lens = g_malloc(table->num_cols * sizeof(int));
 	for (i = 0; i < table->num_cols; i++) {
 		/* bind columns */
-		bound_values[i] = (char *) g_malloc0(EXPORT_BIND_SIZE);
+		bound_values[i] = g_malloc0(EXPORT_BIND_SIZE);
 		ret = mdb_bind_column(table, i + 1, bound_values[i], &bound_lens[i]);
 		if (ret == -1) {
 			fprintf(stderr, "Failed to bind column %d\n", i + 1);

src/util/mdb-json.c

@@ -162,11 +162,11 @@ main(int argc, char **argv)
 	mdb_read_columns(table);
 	mdb_rewind_table(table);
 
-	bound_values = (char **) g_malloc(table->num_cols * sizeof(char *));
+	bound_values = g_malloc(table->num_cols * sizeof(char *));
-	bound_lens = (int *) g_malloc(table->num_cols * sizeof(int));
+	bound_lens = g_malloc(table->num_cols * sizeof(int));
 	for (i=0;i<table->num_cols;i++) {
 		/* bind columns */
-		bound_values[i] = (char *) g_malloc0(EXPORT_BIND_SIZE);
+		bound_values[i] = g_malloc0(EXPORT_BIND_SIZE);
 		ret = mdb_bind_column(table, i+1, bound_values[i], &bound_lens[i]);
 		if (ret == -1) {
 			fprintf(stderr, "Failed to bind column %d\n", i + 1);

src/util/mdb-sql.c

@@ -398,7 +398,7 @@ main(int argc, char **argv)
 
 	/* give the buffer an initial size */
 	bufsz = 4096;
-	mybuf = (char *) g_malloc(bufsz);
+	mybuf = g_malloc(bufsz);
 	mybuf[0]='\0';
 
 	while (1) {