diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-12-17 14:11:39 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-09 13:56:07 +0100 |
| commit | 694a948ae7e29b6bd1000c293727ad3651fb270f (patch) | |
| tree | 88e321a6046fd1545eb0d31f677d44602a3f2bca /tools/msibuild.c | |
| parent | 05a8ed1e4f43536bc8e3f2cba3ff67f04d81eb89 (diff) | |
| download | msitools-694a948ae7e29b6bd1000c293727ad3651fb270f.tar.gz msitools-694a948ae7e29b6bd1000c293727ad3651fb270f.tar.xz msitools-694a948ae7e29b6bd1000c293727ad3651fb270f.zip | |
database: remove libmsi_database_get_summary_info()
Diffstat (limited to 'tools/msibuild.c')
| -rw-r--r-- | tools/msibuild.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/msibuild.c b/tools/msibuild.c index 50cbd6a..ff69cc4 100644 --- a/tools/msibuild.c +++ b/tools/msibuild.c @@ -82,7 +82,7 @@ static gboolean init_suminfo(LibmsiSummaryInfo *si, GError **error) static LibmsiResult open_database(const char *msifile, LibmsiDatabase **db, LibmsiSummaryInfo **si, GError **error) { - LibmsiResult r; + LibmsiResult r = LIBMSI_RESULT_SUCCESS; struct stat st; if (stat(msifile, &st) == -1) @@ -91,11 +91,11 @@ static LibmsiResult open_database(const char *msifile, LibmsiDatabase **db, if (!*db) return LIBMSI_RESULT_FUNCTION_FAILED; - r = libmsi_database_get_summary_info(*db, INT_MAX, si); - if (r != LIBMSI_RESULT_SUCCESS) + *si = libmsi_summary_info_new(*db, INT_MAX, error); + if (!*si) { - fprintf(stderr, "failed to open summary info (%u)\n", r); - return r; + fprintf(stderr, "failed to open summary info\n"); + return LIBMSI_RESULT_FUNCTION_FAILED; } if (!init_suminfo(*si, error)) @@ -115,11 +115,11 @@ static LibmsiResult open_database(const char *msifile, LibmsiDatabase **db, if (!*db) return LIBMSI_RESULT_FUNCTION_FAILED; - r = libmsi_database_get_summary_info(*db, INT_MAX, si); - if (r != LIBMSI_RESULT_SUCCESS) + *si = libmsi_summary_info_new(*db, INT_MAX, error); + if (!*si) { - fprintf(stderr, "failed to open summary info (%u)\n", r); - return r; + fprintf(stderr, "failed to open summary info\n"); + return LIBMSI_RESULT_FUNCTION_FAILED; } } |