Module: wine Branch: master Commit: 175c407bfc7dd565bd4613b98e28711443f1791c URL: http://source.winehq.org/git/wine.git/?a=commit;h=175c407bfc7dd565bd4613b98e...
Author: Mike McCormack mike@codeweavers.com Date: Tue Oct 10 20:03:09 2006 +0900
msi: Make msi_makestring static.
---
dlls/msi/msipriv.h | 1 - dlls/msi/table.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 8ea81e5..945509f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -325,7 +325,6 @@ extern BOOL msi_addstringW( string_table extern UINT msi_id2stringW( string_table *st, UINT string_no, LPWSTR buffer, UINT *sz ); extern UINT msi_id2stringA( string_table *st, UINT string_no, LPSTR buffer, UINT *sz );
-extern LPWSTR MSI_makestring( MSIDATABASE *db, UINT stringid); extern UINT msi_string2idW( string_table *st, LPCWSTR buffer, UINT *id ); extern UINT msi_string2idA( string_table *st, LPCSTR str, UINT *id ); extern string_table *msi_init_stringtable( int entries, UINT codepage ); diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 4c0075a..38697aa 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -917,7 +917,7 @@ static void msi_free_colinfo( MSICOLUMNI } }
-LPWSTR MSI_makestring( MSIDATABASE *db, UINT stringid) +static LPWSTR msi_makestring( MSIDATABASE *db, UINT stringid) { return strdupW(msi_string_lookup_id( db->strings, stringid )); } @@ -958,9 +958,9 @@ static UINT get_tablecolumns( MSIDATABAS if( colinfo ) { UINT id = table->data[ i ] [ 2 ]; - colinfo[n].tablename = MSI_makestring( db, table_id ); + colinfo[n].tablename = msi_makestring( db, table_id ); colinfo[n].number = table->data[ i ][ 1 ] - (1<<15); - colinfo[n].colname = MSI_makestring( db, id ); + colinfo[n].colname = msi_makestring( db, id ); colinfo[n].type = table->data[ i ] [ 3 ] ^ 0x8000; colinfo[n].hash_table = NULL; /* this assumes that columns are in order in the table */