diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-12-16 22:18:02 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-09 13:56:06 +0100 |
| commit | 4509fd0a9f3b17e0c099efa6c235c4e80bf6a97d (patch) | |
| tree | f2da8e056badf2f5e4bc2a79d77840f98be820ea /tools/msiinfo.c | |
| parent | f3baac8ba0bd0bb1c2c33f0f272d19baae65d297 (diff) | |
| download | msitools-4509fd0a9f3b17e0c099efa6c235c4e80bf6a97d.tar.gz msitools-4509fd0a9f3b17e0c099efa6c235c4e80bf6a97d.tar.xz msitools-4509fd0a9f3b17e0c099efa6c235c4e80bf6a97d.zip | |
database: remove libmsi_database_open()
Diffstat (limited to 'tools/msiinfo.c')
| -rw-r--r-- | tools/msiinfo.c | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/tools/msiinfo.c b/tools/msiinfo.c index db2066b..71fcba3 100644 --- a/tools/msiinfo.c +++ b/tools/msiinfo.c @@ -196,10 +196,9 @@ static int cmd_streams(struct Command *cmd, int argc, char **argv, GError **erro cmd_usage(stderr, cmd); } - r = libmsi_database_open(argv[1], LIBMSI_DB_OPEN_READONLY, &db); - if (r) { - print_libmsi_error(r); - } + db = libmsi_database_new(argv[1], LIBMSI_DB_OPEN_READONLY, error); + if (!db) + return 1; r = libmsi_database_open_query(db, "SELECT `Name` FROM `_Streams`", &query); if (r) { @@ -229,10 +228,9 @@ static int cmd_tables(struct Command *cmd, int argc, char **argv, GError **error cmd_usage(stderr, cmd); } - r = libmsi_database_open(argv[1], LIBMSI_DB_OPEN_READONLY, &db); - if (r) { - print_libmsi_error(r); - } + db = libmsi_database_new(argv[1], LIBMSI_DB_OPEN_READONLY, error); + if (!db) + return 1; r = libmsi_database_open_query(db, "SELECT `Name` FROM `_Tables`", &query); if (r) { @@ -315,10 +313,9 @@ static int cmd_suminfo(struct Command *cmd, int argc, char **argv, GError **erro cmd_usage(stderr, cmd); } - r = libmsi_database_open(argv[1], LIBMSI_DB_OPEN_READONLY, &db); - if (r) { - print_libmsi_error(r); - } + db = libmsi_database_new(argv[1], LIBMSI_DB_OPEN_READONLY, error); + if (!db) + return 1; r = libmsi_database_get_summary_info(db, 0, &si); if (r) { @@ -376,10 +373,9 @@ static int cmd_extract(struct Command *cmd, int argc, char **argv, GError **erro cmd_usage(stderr, cmd); } - r = libmsi_database_open(argv[1], LIBMSI_DB_OPEN_READONLY, &db); - if (r) { - print_libmsi_error(r); - } + db = libmsi_database_new(argv[1], LIBMSI_DB_OPEN_READONLY, error); + if (!db) + return 1; r = libmsi_database_open_query(db, "SELECT `Data` FROM `_Streams` WHERE `Name` = ?", &query); if (r) { @@ -672,10 +668,9 @@ static int cmd_export(struct Command *cmd, int argc, char **argv, GError **error cmd_usage(stderr, cmd); } - r = libmsi_database_open(argv[1], LIBMSI_DB_OPEN_READONLY, &db); - if (r) { - print_libmsi_error(r); - } + db = libmsi_database_new(argv[1], LIBMSI_DB_OPEN_READONLY, error); + if (!db) + return 1; if (sql) { r = export_sql(db, argv[2], error); |