diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-04-11 19:41:07 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-04-11 19:41:07 +0200 |
| commit | ba398147de0a985f33f3bba7a2d4c5732b231603 (patch) | |
| tree | a1ff712b6e14c2565298e59b1cadd1eca9b0c536 /libmsi | |
| parent | aa318c46b490807ecde198b90ab7c12f69ecd2dc (diff) | |
| download | msitools-ba398147de0a985f33f3bba7a2d4c5732b231603.tar.gz msitools-ba398147de0a985f33f3bba7a2d4c5732b231603.tar.xz msitools-ba398147de0a985f33f3bba7a2d4c5732b231603.zip | |
build-sys: silence gcc warnings
Diffstat (limited to 'libmsi')
| -rw-r--r-- | libmsi/alter.c | 2 | ||||
| -rw-r--r-- | libmsi/debug.h | 10 | ||||
| -rw-r--r-- | libmsi/libmsi-summary-info.c | 3 | ||||
| -rw-r--r-- | libmsi/msipriv.h | 4 |
4 files changed, 8 insertions, 11 deletions
diff --git a/libmsi/alter.c b/libmsi/alter.c index e6e56e6..0c7a21c 100644 --- a/libmsi/alter.c +++ b/libmsi/alter.c @@ -115,7 +115,7 @@ static unsigned alter_add_column(LibmsiAlterView *av) return LIBMSI_RESULT_BAD_QUERY_SYNTAX; } - r = _libmsi_query_open(av->db, &view, query, av->colinfo->table, av->colinfo->column); + r = _libmsi_query_open(av->db, &view, query, av->colinfo->table); if (r == LIBMSI_RESULT_SUCCESS) { r = _libmsi_query_iterate_records(view, NULL, count_iter, &colnum); diff --git a/libmsi/debug.h b/libmsi/debug.h index 1f9acc0..8991942 100644 --- a/libmsi/debug.h +++ b/libmsi/debug.h @@ -28,9 +28,7 @@ #include <stdio.h> #include <glib.h> -#ifdef __cplusplus -extern "C" { -#endif +G_BEGIN_DECLS /* * Internal definitions (do not use these directly) @@ -59,7 +57,7 @@ static inline const char *wine_dbgstr_an( const char * s, int n ) return s; } -const char *wine_dbg_sprintf( const char *format, ...); +const char *wine_dbg_sprintf( const char *format, ...) G_GNUC_PRINTF (1, 2);; #define wine_dbg_printf(format,...) (printf(format, ## __VA_ARGS__), fflush(stdout)) #define WINE_DPRINTF(class, function, format, ...) \ @@ -100,8 +98,6 @@ static inline const char *debugstr_a( const char *s ) { return wine_dbgstr_an( } \ }G_STMT_END -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* __WINE_WINE_DEBUG_H */ diff --git a/libmsi/libmsi-summary-info.c b/libmsi/libmsi-summary-info.c index 4108352..4c18b52 100644 --- a/libmsi/libmsi-summary-info.c +++ b/libmsi/libmsi-summary-info.c @@ -311,7 +311,7 @@ static void read_properties_from_data( LibmsiOLEVariant *prop, const uint8_t *da unsigned i; LibmsiOLEVariant *property; uint32_t idofs, len; - char *str; + char *str = NULL; idofs = 8; @@ -387,6 +387,7 @@ static void read_properties_from_data( LibmsiOLEVariant *prop, const uint8_t *da else if (type == proptype) ; else if( proptype == OLEVT_LPSTR) { + g_return_if_fail(str != NULL); if( type == OLEVT_I2 || type == OLEVT_I4) { property->intval = atoi( str ); } else if( type == OLEVT_FILETIME) { diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h index c94aa20..f7a80a6 100644 --- a/libmsi/msipriv.h +++ b/libmsi/msipriv.h @@ -404,10 +404,10 @@ unsigned msi_open_storage( LibmsiDatabase *db, const char *stname ); void msi_destroy_storage( LibmsiDatabase *db, const char *stname ); extern unsigned msi_enum_db_storages(LibmsiDatabase *, unsigned (*fn)(const char *, GsfInfile *, void *), void *); extern unsigned _libmsi_database_open_query(LibmsiDatabase *, const char *, LibmsiQuery **); -extern unsigned _libmsi_query_open( LibmsiDatabase *, LibmsiQuery **, const char *, ... ); +extern unsigned _libmsi_query_open( LibmsiDatabase *, LibmsiQuery **, const char *, ... ) G_GNUC_PRINTF(3,4); typedef unsigned (*record_func)( LibmsiRecord *, void *); extern unsigned _libmsi_query_iterate_records( LibmsiQuery *, unsigned *, record_func, void *); -extern LibmsiRecord *_libmsi_query_get_record( LibmsiDatabase *db, const char *query, ... ); +extern LibmsiRecord *_libmsi_query_get_record( LibmsiDatabase *db, const char *query, ... ) G_GNUC_PRINTF(2,3); extern unsigned _libmsi_database_get_primary_keys( LibmsiDatabase *, const char *, LibmsiRecord **); /* view internals */ |