diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-12-11 01:31:17 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-12 09:56:18 +0100 |
| commit | a779cc4642e9bbfa56766c66b5c296e1c62dba82 (patch) | |
| tree | 7f5a471254f321e7d756c3ac0b621a7a8d6d2943 | |
| parent | e1ed313618e53ebe0549ef255662e5a496090242 (diff) | |
| download | msitools-a779cc4642e9bbfa56766c66b5c296e1c62dba82.tar.gz msitools-a779cc4642e9bbfa56766c66b5c296e1c62dba82.tar.xz msitools-a779cc4642e9bbfa56766c66b5c296e1c62dba82.zip | |
Introduce GError types
| -rw-r--r-- | include/libmsi-types.h | 16 | ||||
| -rw-r--r-- | libmsi/libmsi-database.c | 12 |
2 files changed, 24 insertions, 4 deletions
diff --git a/include/libmsi-types.h b/include/libmsi-types.h index a47f190..f23398e 100644 --- a/include/libmsi-types.h +++ b/include/libmsi-types.h @@ -23,6 +23,12 @@ G_BEGIN_DECLS +#define LIBMSI_RESULT_ERROR libmsi_result_error_quark () +GQuark libmsi_result_error_quark (void); + +#define LIBMSI_DB_ERROR libmsi_db_error_quark () +GQuark libmsi_db_error_quark (void); + typedef struct _LibmsiDatabase LibmsiDatabase; typedef struct _LibmsiQuery LibmsiQuery; typedef struct _LibmsiRecord LibmsiRecord; @@ -36,9 +42,9 @@ typedef enum LibmsiCondition LIBMSI_CONDITION_ERROR = 3, } LibmsiCondition; -typedef enum LibmsiResult +typedef enum LibmsiResultError { - LIBMSI_RESULT_SUCCESS, + LIBMSI_RESULT_SUCCESS, // FIXME: remove me LIBMSI_RESULT_ACCESS_DENIED, LIBMSI_RESULT_INVALID_HANDLE, LIBMSI_RESULT_NOT_ENOUGH_MEMORY, @@ -58,7 +64,9 @@ typedef enum LibmsiResult LIBMSI_RESULT_INVALID_TABLE, LIBMSI_RESULT_DATATYPE_MISMATCH, LIBMSI_RESULT_INVALID_DATATYPE -} LibmsiResult; +} LibmsiResultError; + +typedef LibmsiResultError LibmsiResult; // FIXME: remove me typedef enum LibmsiPropertyType { @@ -84,7 +92,7 @@ typedef enum LibmsiColInfo typedef enum LibmsiDBError { - LIBMSI_DB_ERROR_SUCCESS, + LIBMSI_DB_ERROR_SUCCESS, // FIXME: remove me LIBMSI_DB_ERROR_INVALIDARG, LIBMSI_DB_ERROR_MOREDATA, LIBMSI_DB_ERROR_FUNCTIONERROR, diff --git a/libmsi/libmsi-database.c b/libmsi/libmsi-database.c index ce85457..7547643 100644 --- a/libmsi/libmsi-database.c +++ b/libmsi/libmsi-database.c @@ -87,6 +87,18 @@ typedef struct _LibmsiStream { IStream *stm; } LibmsiStream; +GQuark +libmsi_result_error_quark (void) +{ + return g_quark_from_static_string ("libmsi-result-error-quark"); +} + +GQuark +libmsi_db_error_quark (void) +{ + return g_quark_from_static_string ("libmsi-db-error-quark"); +} + static void libmsi_database_init (LibmsiDatabase *p) { |