diff options
author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-12-11 22:18:16 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-09 13:56:06 +0100 |
commit | f0b2662c42d6c0d4ed27eed1d4d5eb86cc5ffb29 (patch) | |
tree | 5caba3aca55578fa19e5c84533c16ccb380c6caf /tools | |
parent | 5fe3c5109cf2ecd77dd40173f491722689d5af27 (diff) | |
download | msitools-f0b2662c42d6c0d4ed27eed1d4d5eb86cc5ffb29.tar.gz msitools-f0b2662c42d6c0d4ed27eed1d4d5eb86cc5ffb29.tar.xz msitools-f0b2662c42d6c0d4ed27eed1d4d5eb86cc5ffb29.zip |
record: make API more GObject like
Use TRUE for success.
GErrors doesn't seem useful for LibmsiRecord.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/msibuild.c | 3 | ||||
-rw-r--r-- | tools/msiinfo.c | 16 |
2 files changed, 8 insertions, 11 deletions
diff --git a/tools/msibuild.c b/tools/msibuild.c index 28d55a1..d0bafb2 100644 --- a/tools/msibuild.c +++ b/tools/msibuild.c @@ -182,8 +182,7 @@ static int add_stream(const char *stream, const char *file) rec = libmsi_record_new(2); libmsi_record_set_string(rec, 1, stream); - r = libmsi_record_load_stream(rec, 2, file); - if (r != LIBMSI_RESULT_SUCCESS) + if (!libmsi_record_load_stream(rec, 2, file)) fprintf(stderr, "failed to load stream (%u)\n", r); r = libmsi_database_open_query(db, diff --git a/tools/msiinfo.c b/tools/msiinfo.c index fdf963c..576a8d7 100644 --- a/tools/msiinfo.c +++ b/tools/msiinfo.c @@ -406,10 +406,8 @@ static int cmd_extract(struct Command *cmd, int argc, char **argv) print_libmsi_error(r); } - r = libmsi_record_save_stream(rec, 1, NULL, &size); - if (r) { - print_libmsi_error(r); - } + if (!libmsi_record_save_stream(rec, 1, NULL, &size)) + exit(1); bufsize = (size > 1048576 ? 1048576 : size); buf = g_malloc(bufsize); @@ -437,9 +435,9 @@ static unsigned export_create_table(const char *table, LibmsiRecord *types, LibmsiRecord *keys) { - int num_columns = libmsi_record_get_field_count(names); - int num_keys = libmsi_record_get_field_count(keys); - int i, len; + guint num_columns = libmsi_record_get_field_count(names); + guint num_keys = libmsi_record_get_field_count(keys); + guint i, len; unsigned r; char size[20], extra[30]; gchar *name, *type; @@ -532,9 +530,9 @@ static unsigned export_insert(const char *table, LibmsiRecord *types, LibmsiRecord *vals) { - int num_columns = libmsi_record_get_field_count(names); + guint num_columns = libmsi_record_get_field_count(names); gchar *name, *type; - int i; + guint i; unsigned r; unsigned sz; char *s; |