summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2012-12-17 13:09:29 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-01-09 13:56:07 +0100
commit05a8ed1e4f43536bc8e3f2cba3ff67f04d81eb89 (patch)
tree92a7b832587be13aa01a7ab1320c1d93c2fa66da /include
parent9b1b206a8881205b285db07733487283b6a8a806 (diff)
downloadmsitools-05a8ed1e4f43536bc8e3f2cba3ff67f04d81eb89.tar.gz
msitools-05a8ed1e4f43536bc8e3f2cba3ff67f04d81eb89.tar.xz
msitools-05a8ed1e4f43536bc8e3f2cba3ff67f04d81eb89.zip
database: make merge() GObject-like
Diffstat (limited to 'include')
-rw-r--r--include/libmsi-database.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/libmsi-database.h b/include/libmsi-database.h
index bd1e5f3..a43d86e 100644
--- a/include/libmsi-database.h
+++ b/include/libmsi-database.h
@@ -61,8 +61,12 @@ gboolean libmsi_database_import (LibmsiDatabase *db,
const char *folder,
const char *filename,
GError **error);
-LibmsiCondition libmsi_database_is_table_persistent (LibmsiDatabase *, const char *);
-LibmsiResult libmsi_database_merge (LibmsiDatabase *, LibmsiDatabase *, const char *);
+LibmsiCondition libmsi_database_is_table_persistent (LibmsiDatabase *db,
+ const char *table);
+gboolean libmsi_database_merge (LibmsiDatabase *db,
+ LibmsiDatabase *merge,
+ const char *table,
+ GError **error);
LibmsiResult libmsi_database_get_summary_info (LibmsiDatabase *, unsigned, LibmsiSummaryInfo **);
LibmsiResult libmsi_database_commit (LibmsiDatabase *);