lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-03-10 00:20:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow CFLGAS="-std=c99 -D_POSIX_C_SOURCE=2"

Browse Source 
Use glib function:
strcasecmp -> g_ascii_strcasecmp
bzero -> memset
strdup -> g_strdump

Don't use arithmetic void*+int
This commit is contained in:
Nirgal Vourgère
2014-12-28 12:36:55 +01:00
parent 4b52d6bfd9
commit 2a70e16a8b
14 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/odbc/connectparams.c
View File

@@ -119,7 +119,7 @@ static int LoadDSN (
{
while (GetNextItem (stream, &name, &value))
{
g_hash_table_insert (table, strdup (name), strdup (value));
g_hash_table_insert (table, g_strdup (name), g_strdup (value));
}
}
@@ -535,7 +535,7 @@ ODBCINSTGetProperties(HODBCINSTPROPERTY hLastProperty)
hLastProperty->nPromptType = ODBCINST_PROMPTTYPE_FILENAME;
strncpy(hLastProperty->szName, "Database", INI_MAX_PROPERTY_NAME);
strncpy(hLastProperty->szValue, "", INI_MAX_PROPERTY_VALUE);
hLastProperty->pszHelp = (char *) strdup("Filename and Path of MDB file to connect to.\n"
hLastProperty->pszHelp = (char *) g_strdup("Filename and Path of MDB file to connect to.\n"
"Use the full path to the database file.");

12
src/odbc/odbc.c
View File

@@ -765,7 +765,7 @@ static SQLRETURN SQL_API _SQLDescribeCol(
table = sql->cur_table;
for (i=0;i<table->num_cols;i++) {
col=g_ptr_array_index(table->columns,i);
if (!strcasecmp(sqlcol->name, col->name)) {
if (!g_ascii_strcasecmp(sqlcol->name, col->name)) {
break;
}
}
@@ -899,7 +899,7 @@ static SQLRETURN SQL_API _SQLColAttributes(
table = sql->cur_table;
for (i=0;i<table->num_cols;i++) {
col=g_ptr_array_index(table->columns,i);
if (!strcasecmp(sqlcol->name, col->name)) {
if (!g_ascii_strcasecmp(sqlcol->name, col->name)) {
break;
}
}
@@ -1484,7 +1484,7 @@ static SQLRETURN SQL_API _SQLColumns(
for (i=0; i<mdb->num_catalog; i++) {
entry = g_ptr_array_index(mdb->catalog, i);
/* TODO: Do more advanced matching */
if (strcasecmp((char*)szTableName, entry->object_name) != 0)
if (g_ascii_strcasecmp((char*)szTableName, entry->object_name) != 0)
continue;
table = mdb_read_table(entry);
mdb_read_columns(table);
@@ -1607,7 +1607,7 @@ static SQLRETURN SQL_API _SQLGetData(
table = sql->cur_table;
for (i=0;i<table->num_cols;i++) {
col=g_ptr_array_index(table->columns,i);
if (!strcasecmp(sqlcol->name, col->name)) {
if (!g_ascii_strcasecmp(sqlcol->name, col->name)) {
break;
}
}
@@ -1866,7 +1866,7 @@ SQLRETURN SQL_API SQLGetFunctions(
switch (fFunction) {
#if ODBCVER >= 0x0300
case SQL_API_ODBC3_ALL_FUNCTIONS:
bzero(pfExists, SQL_API_ODBC3_ALL_FUNCTIONS_SIZE);
memset(pfExists, 0, SQL_API_ODBC3_ALL_FUNCTIONS_SIZE);
_set_func_exists(pfExists,SQL_API_SQLALLOCCONNECT);
_set_func_exists(pfExists,SQL_API_SQLALLOCENV);
_set_func_exists(pfExists,SQL_API_SQLALLOCHANDLE);
@@ -1927,7 +1927,7 @@ SQLRETURN SQL_API SQLGetFunctions(
break;
#endif
case SQL_API_ALL_FUNCTIONS:
bzero(pfExists, 100); // 100 by spec
memset(pfExists, 0, 100); // 100 by spec
_set_func_exists(pfExists,SQL_API_SQLALLOCCONNECT);
_set_func_exists(pfExists,SQL_API_SQLALLOCENV);
_set_func_exists(pfExists,SQL_API_SQLALLOCSTMT);