Merge branch 'pre-gsf'

9 files changed, 20 insertions, 20 deletions

diff --git a/libmsi/insert.c b/libmsi/insert.c
index 1bb34c1..9ad48a7 100644
--- a/libmsi/insert.c
+++ b/libmsi/insert.c
@@ -60,7 +60,7 @@ LibmsiRecord *msi_query_merge_record( unsigned fields, const column_info *vl, Li
     LibmsiRecord *merged;
     unsigned wildcard_count = 1, i;
 
-    merged = libmsi_record_create( fields );
+    merged = libmsi_record_new( fields );
     for( i=1; i <= fields; i++ )
     {
         if( !vl )
@@ -137,7 +137,7 @@ static unsigned msi_arrange_record(LibmsiInsertView *iv, LibmsiRecord **values)
     if (col_count == val_count && msi_columns_in_order(iv, col_count))
         return LIBMSI_RESULT_SUCCESS;
 
-    padded = libmsi_record_create(col_count);
+    padded = libmsi_record_new(col_count);
     if (!padded)
         return LIBMSI_RESULT_OUTOFMEMORY;
 
diff --git a/libmsi/libmsi-database.c b/libmsi/libmsi-database.c
index e4a99a9..450e512 100644
--- a/libmsi/libmsi-database.c
+++ b/libmsi/libmsi-database.c
@@ -1061,7 +1061,7 @@ static unsigned construct_record(unsigned num_columns, char **types,
 {
     unsigned i;
 
-    *rec = libmsi_record_create(num_columns);
+    *rec = libmsi_record_new(num_columns);
     if (!*rec)
         return LIBMSI_RESULT_OUTOFMEMORY;
 
@@ -2385,7 +2385,7 @@ unsigned _libmsi_database_get_primary_keys( LibmsiDatabase *db,
         TRACE("Found %d primary keys\n", info.n );
 
         /* allocate a record and fill in the names of the tables */
-        info.rec = libmsi_record_create( info.n );
+        info.rec = libmsi_record_new( info.n );
         info.n = 0;
         r = _libmsi_query_iterate_records( query, 0, msi_primary_key_iterator, &info );
         if( r == LIBMSI_RESULT_SUCCESS )
diff --git a/libmsi/libmsi-query.c b/libmsi/libmsi-query.c
index 6b9b8a3..b76b859 100644
--- a/libmsi/libmsi-query.c
+++ b/libmsi/libmsi-query.c
@@ -234,7 +234,7 @@ unsigned msi_view_get_row(LibmsiDatabase *db, LibmsiView *view, unsigned row, Li
     if (row >= row_count)
         return LIBMSI_RESULT_NO_MORE_ITEMS;
 
-    *rec = libmsi_record_create(col_count);
+    *rec = libmsi_record_new(col_count);
     if (!*rec)
         return LIBMSI_RESULT_FUNCTION_FAILED;
 
@@ -449,7 +449,7 @@ unsigned _libmsi_query_get_column_info( LibmsiQuery *query, LibmsiColInfo info,
     if( !count )
         return LIBMSI_RESULT_INVALID_PARAMETER;
 
-    rec = libmsi_record_create( count );
+    rec = libmsi_record_new( count );
     if( !rec )
         return LIBMSI_RESULT_FUNCTION_FAILED;
 
diff --git a/libmsi/libmsi-record.c b/libmsi/libmsi-record.c
index 1f6b344..abdf9e8 100644
--- a/libmsi/libmsi-record.c
+++ b/libmsi/libmsi-record.c
@@ -59,7 +59,7 @@ void _libmsi_record_destroy( LibmsiObject *arg )
         _libmsi_free_field( &rec->fields[i] );
 }
 
-LibmsiRecord *libmsi_record_create( unsigned cParams )
+LibmsiRecord *libmsi_record_new( unsigned cParams )
 {
     LibmsiRecord *rec;
     unsigned len;
@@ -594,7 +594,7 @@ LibmsiRecord *_libmsi_record_clone(LibmsiRecord *rec)
     unsigned r, i, count;
 
     count = libmsi_record_get_field_count(rec);
-    clone = libmsi_record_create(count);
+    clone = libmsi_record_new(count);
     if (!clone)
         return NULL;
 
diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h
index 3264ff8..e660424 100644
--- a/libmsi/msipriv.h
+++ b/libmsi/msipriv.h
@@ -131,7 +131,7 @@ typedef struct _LibmsiField
 typedef struct _LibmsiRecord
 {
     LibmsiObject hdr;
-    unsigned count;       /* as passed to libmsi_record_create */
+    unsigned count;       /* as passed to libmsi_record_new */
     LibmsiField fields[1]; /* nb. array size is count+1 */
 } LibmsiRecord;
 
diff --git a/libmsi/select.c b/libmsi/select.c
index ad24053..e0967b4 100644
--- a/libmsi/select.c
+++ b/libmsi/select.c
@@ -115,7 +115,7 @@ static unsigned select_view_set_row( LibmsiView *view, unsigned row, LibmsiRecor
         return r;
 
     /* expand the record to the right size for the underlying table */
-    expanded = libmsi_record_create( col_count );
+    expanded = libmsi_record_new( col_count );
     if ( !expanded )
         return LIBMSI_RESULT_FUNCTION_FAILED;
 
@@ -152,7 +152,7 @@ static unsigned select_view_insert_row( LibmsiView *view, LibmsiRecord *record,
     if (r != LIBMSI_RESULT_SUCCESS)
         return r;
 
-    outrec = libmsi_record_create( table_cols + 1 );
+    outrec = libmsi_record_new( table_cols + 1 );
 
     for (i=0; i<sv->num_cols; i++)
     {
diff --git a/libmsi/table.c b/libmsi/table.c
index 4b54edf..da6c376 100644
--- a/libmsi/table.c
+++ b/libmsi/table.c
@@ -783,7 +783,7 @@ unsigned msi_create_table( LibmsiDatabase *db, const char *name, column_info *co
     if( r )
         goto err;
 
-    rec = libmsi_record_create( 1 );
+    rec = libmsi_record_new( 1 );
     if( !rec )
         goto err;
 
@@ -814,7 +814,7 @@ unsigned msi_create_table( LibmsiDatabase *db, const char *name, column_info *co
         if( r )
             goto err;
 
-        rec = libmsi_record_create( 4 );
+        rec = libmsi_record_new( 4 );
         if( !rec )
             goto err;
 
@@ -1233,7 +1233,7 @@ static unsigned _libmsi_add_stream( LibmsiDatabase *db, const char *name, GsfInp
 
     TRACE("%p %s %p\n", db, debugstr_a(name), data);
 
-    rec = libmsi_record_create( 2 );
+    rec = libmsi_record_new( 2 );
     if ( !rec )
         return LIBMSI_RESULT_OUTOFMEMORY;
 
@@ -1807,7 +1807,7 @@ static unsigned table_view_remove_column(LibmsiView *view, const char *table, un
     LibmsiView *columns = NULL;
     unsigned row, r;
 
-    rec = libmsi_record_create(2);
+    rec = libmsi_record_new(2);
     if (!rec)
         return LIBMSI_RESULT_OUTOFMEMORY;
 
@@ -1879,7 +1879,7 @@ static unsigned table_view_add_column(LibmsiView *view, const char *table, unsig
     LibmsiRecord *rec;
     unsigned r, i;
 
-    rec = libmsi_record_create(4);
+    rec = libmsi_record_new(4);
     if (!rec)
         return LIBMSI_RESULT_OUTOFMEMORY;
 
@@ -1930,7 +1930,7 @@ static unsigned table_view_drop(LibmsiView *view)
             return r;
     }
 
-    rec = libmsi_record_create(1);
+    rec = libmsi_record_new(1);
     if (!rec)
         return LIBMSI_RESULT_OUTOFMEMORY;
 
@@ -2155,7 +2155,7 @@ static LibmsiRecord *msi_get_transform_record( const LibmsiTableView *tv, const
     mask = rawdata[0] | (rawdata[1] << 8);
     rawdata += 2;
 
-    rec = libmsi_record_create( tv->num_cols );
+    rec = libmsi_record_new( tv->num_cols );
     if( !rec )
         return rec;
 
diff --git a/libmsi/update.c b/libmsi/update.c
index c552825..9b63fd6 100644
--- a/libmsi/update.c
+++ b/libmsi/update.c
@@ -72,7 +72,7 @@ static unsigned update_view_execute( LibmsiView *view, LibmsiRecord *record )
 
         if (where_count > 0)
         {
-            where = libmsi_record_create(where_count);
+            where = libmsi_record_new(where_count);
 
             if (where)
                 for (i = 1; i <= where_count; i++)
diff --git a/libmsi/where.c b/libmsi/where.c
index 003679b..154a22a 100644
--- a/libmsi/where.c
+++ b/libmsi/where.c
@@ -316,7 +316,7 @@ static unsigned where_view_set_row( LibmsiView *view, unsigned row, LibmsiRecord
             continue;
         }
 
-        reduced = libmsi_record_create(col_count);
+        reduced = libmsi_record_new(col_count);
         if (!reduced)
             return LIBMSI_RESULT_FUNCTION_FAILED;