diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-02-08 02:19:23 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-02-08 02:19:23 +0100 |
| commit | f8d862dc4b35aee2d194168faee7cea89f5e7bc8 (patch) | |
| tree | 08d8a6d95c52220f4ced66675387610faeea2b2c /libmsi | |
| parent | 3e89e06d3bb31122d64ace6c523f8e3f6e828544 (diff) | |
| download | msitools-f8d862dc4b35aee2d194168faee7cea89f5e7bc8.tar.gz msitools-f8d862dc4b35aee2d194168faee7cea89f5e7bc8.tar.xz msitools-f8d862dc4b35aee2d194168faee7cea89f5e7bc8.zip | |
Fix up Wmaybe-uninitialized, and remove loop optim warnings
Diffstat (limited to 'libmsi')
| -rw-r--r-- | libmsi/libmsi-database.c | 5 | ||||
| -rw-r--r-- | libmsi/libmsi-query.c | 2 | ||||
| -rw-r--r-- | libmsi/libmsi-summary-info.c | 3 | ||||
| -rw-r--r-- | libmsi/table.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libmsi/libmsi-database.c b/libmsi/libmsi-database.c index 350ae62..c3f614a 100644 --- a/libmsi/libmsi-database.c +++ b/libmsi/libmsi-database.c @@ -917,7 +917,7 @@ static unsigned msi_add_table_to_db(LibmsiDatabase *db, char **columns, char **t { unsigned r = LIBMSI_RESULT_OUTOFMEMORY; unsigned size; - LibmsiQuery *view; + LibmsiQuery *view = NULL; char *create_sql = NULL; char *prelude; char *columns_sql; @@ -952,7 +952,8 @@ done: g_critical ("%s", error->message); g_clear_error (&error); - g_object_unref(view); + if (view) + g_object_unref(view); msi_free(prelude); msi_free(columns_sql); msi_free(postlude); diff --git a/libmsi/libmsi-query.c b/libmsi/libmsi-query.c index 6653bbc..759613c 100644 --- a/libmsi/libmsi-query.c +++ b/libmsi/libmsi-query.c @@ -253,7 +253,7 @@ LibmsiRecord *_libmsi_query_get_record( LibmsiDatabase *db, const char *fmt, ... { LibmsiRecord *rec = NULL; LibmsiQuery *view = NULL; - unsigned r; + unsigned r = LIBMSI_RESULT_SUCCESS; va_list va; char *query; GError *error = NULL; // FIXME: move error to caller diff --git a/libmsi/libmsi-summary-info.c b/libmsi/libmsi-summary-info.c index a7a9571..4108352 100644 --- a/libmsi/libmsi-summary-info.c +++ b/libmsi/libmsi-summary-info.c @@ -703,8 +703,7 @@ static void _summary_info_get_property (LibmsiSummaryInfo *si, unsigned uiProper type = LIBMSI_PROPERTY_TYPE_EMPTY; break; default: - g_warn_if_reached (); - break; + g_return_if_reached (); } if (puiDataType) diff --git a/libmsi/table.c b/libmsi/table.c index 6414e14..5058ad1 100644 --- a/libmsi/table.c +++ b/libmsi/table.c @@ -1227,7 +1227,7 @@ static unsigned _libmsi_add_stream( LibmsiDatabase *db, const char *name, GsfInp "INSERT INTO `_Streams`(`Name`, `Data`) VALUES (?, ?)"; LibmsiQuery *query = NULL; LibmsiRecord *rec; - unsigned r; + unsigned r = LIBMSI_RESULT_SUCCESS; TRACE("%p %s %p\n", db, debugstr_a(name), data); |