ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Remove table_find_insert_idx(). 

The function table_find_insert_idx() is replaced by the more generic
function find_insert_index().
This commit is contained in:
Hib Eris 2009-10-20 14:30:46 +02:00 committed by Alexandre Julliard
parent f6ae2507ef
commit 47ec8ab0f3
1 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/msi/table.c
View File

@ -121,7 +121,6 @@ static void table_calc_column_offsets( MSIDATABASE *db, MSICOLUMNINFO *colinfo,
static UINT get_tablecolumns( MSIDATABASE *db,
LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz);
static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count );
static UINT table_find_insert_idx (MSIVIEW *view, LPCWSTR name, INT *pidx);
static inline UINT bytes_per_column( MSIDATABASE *db, const MSICOLUMNINFO *col )
{
@ -627,7 +626,6 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info,
column_info *col;
MSITABLE *table;
UINT i;
INT idx;
/* only add tables that don't exist already */
if( TABLE_Exists(db, name ) )
@ -693,11 +691,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info,
if( r )
goto err;
r = table_find_insert_idx (tv, name, &idx);
if (r != ERROR_SUCCESS)
idx = -1;
r = tv->ops->insert_row( tv, rec, idx, persistent == MSICONDITION_FALSE );
r = tv->ops->insert_row( tv, rec, -1, persistent == MSICONDITION_FALSE );
TRACE("insert_row returned %x\n", r);
if( r )
goto err;
@ -747,11 +741,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info,
if( r )
goto err;
r = table_find_insert_idx (tv, name, &idx);
if (r != ERROR_SUCCESS)
idx = -1;
r = tv->ops->insert_row( tv, rec, idx, FALSE );
r = tv->ops->insert_row( tv, rec, -1, FALSE );
if( r )
goto err;
@ -3033,29 +3023,3 @@ void msi_free_transforms( MSIDATABASE *db )
msi_free( t );
}
}
static UINT table_find_insert_idx (MSIVIEW *view, LPCWSTR name, INT *pidx)
{
UINT r, name_id, row_id;
INT idx;
MSITABLEVIEW *tv = (MSITABLEVIEW *)view;
TRACE ("%p %s\n", view, debugstr_w(name));
r = msi_string2idW(tv->db->strings, name, &name_id);
if (r != ERROR_SUCCESS)
{
*pidx = -1;
return r;
}
for( idx = 0; idx < tv->table->row_count; idx++ )
{
r = TABLE_fetch_int( &tv->view, idx, 1, &row_id );
if (row_id > name_id)
break;
}
*pidx = idx;
return ERROR_SUCCESS;
}