Merge branch 'pre-gsf'

4 files changed, 10 insertions, 10 deletions

diff --git a/libmsi/libmsi-database.c b/libmsi/libmsi-database.c
index 765be66..596fc0c 100644
--- a/libmsi/libmsi-database.c
+++ b/libmsi/libmsi-database.c
@@ -2404,7 +2404,7 @@ static unsigned msi_primary_key_iterator( LibmsiRecord *rec, void *param )
     const char *table;
     unsigned type;
 
-    type = libmsi_record_get_integer( rec, 4 );
+    type = libmsi_record_get_int( rec, 4 );
     if( type & MSITYPE_KEY )
     {
         info->n++;
diff --git a/libmsi/libmsi-record.c b/libmsi/libmsi-record.c
index a725049..12e96aa 100644
--- a/libmsi/libmsi-record.c
+++ b/libmsi/libmsi-record.c
@@ -212,7 +212,7 @@ unsigned _libmsi_record_copy_field( LibmsiRecord *in_rec, unsigned in_n,
     return r;
 }
 
-int libmsi_record_get_integer( const LibmsiRecord *rec, unsigned iField)
+int libmsi_record_get_int( const LibmsiRecord *rec, unsigned iField)
 {
     int ret = 0;
 
@@ -239,7 +239,7 @@ int libmsi_record_get_integer( const LibmsiRecord *rec, unsigned iField)
     return LIBMSI_NULL_INT;
 }
 
-LibmsiResult libmsi_record_clear_data( LibmsiRecord *rec )
+LibmsiResult libmsi_record_clear( LibmsiRecord *rec )
 {
     unsigned i;
 
diff --git a/libmsi/table.c b/libmsi/table.c
index 03d1646..c7a7e36 100644
--- a/libmsi/table.c
+++ b/libmsi/table.c
@@ -1286,7 +1286,7 @@ static unsigned get_table_value_from_record( LibmsiTableView *tv, LibmsiRecord *
     }
     else if ( bytes_per_column( tv->db, &columninfo, LONG_STR_BYTES ) == 2 )
     {
-        *pvalue = 0x8000 + libmsi_record_get_integer( rec, iField );
+        *pvalue = 0x8000 + libmsi_record_get_int( rec, iField );
         if ( *pvalue & 0xffff0000 )
         {
             ERR("field %u value %d out of range\n", iField, *pvalue - 0x8000);
@@ -1295,7 +1295,7 @@ static unsigned get_table_value_from_record( LibmsiTableView *tv, LibmsiRecord *
     }
     else
     {
-        int ival = libmsi_record_get_integer( rec, iField );
+        int ival = libmsi_record_get_int( rec, iField );
         *pvalue = ival ^ 0x80000000;
     }
 
@@ -1545,7 +1545,7 @@ static unsigned table_validate_new( LibmsiTableView *tv, LibmsiRecord *rec, unsi
         {
             unsigned n;
 
-            n = libmsi_record_get_integer( rec, i+1 );
+            n = libmsi_record_get_int( rec, i+1 );
             if (n == LIBMSI_NULL_INT)
             {
                 if (column) *column = i;
@@ -2242,7 +2242,7 @@ static void dump_record( LibmsiRecord *rec )
         else if( (sval = _libmsi_record_get_string_raw( rec, i )) )
             TRACE("row -> [%s]\n", debugstr_a(sval));
         else
-            TRACE("row -> [0x%08x]\n", libmsi_record_get_integer( rec, i ) );
+            TRACE("row -> [0x%08x]\n", libmsi_record_get_int( rec, i ) );
     }
 }
 
@@ -2292,7 +2292,7 @@ static unsigned* msi_record_to_row( const LibmsiTableView *tv, LibmsiRecord *rec
         }
         else
         {
-            data[i] = libmsi_record_get_integer( rec, i+1 );
+            data[i] = libmsi_record_get_int( rec, i+1 );
 
             if (data[i] == LIBMSI_NULL_INT)
                 data[i] = 0;
@@ -2464,7 +2464,7 @@ static unsigned msi_table_load_transform( LibmsiDatabase *db, GsfInfile *stg,
             if (!strcmp( name, szColumns ))
             {
                 _libmsi_record_get_string( rec, 1, table, &sz );
-                number = libmsi_record_get_integer( rec, 2 );
+                number = libmsi_record_get_int( rec, 2 );
 
                 /*
                  * Native msi seems writes nul into the Number (2nd) column of
diff --git a/libmsi/where.c b/libmsi/where.c
index 18473ec..fac7fa1 100644
--- a/libmsi/where.c
+++ b/libmsi/where.c
@@ -580,7 +580,7 @@ static unsigned where_view_evaluate( LibmsiWhereView *wv, const unsigned rows[],
         return expr_eval_strcmp( wv, rows, &cond->u.expr, val, record );
 
     case EXPR_WILDCARD:
-        *val = libmsi_record_get_integer( record, ++wv->rec_index );
+        *val = libmsi_record_get_int( record, ++wv->rec_index );
         return LIBMSI_RESULT_SUCCESS;
 
     default: