database: rename get_state() to is_readonly()

3 files changed, 6 insertions, 20 deletions

diff --git a/include/libmsi-database.h b/include/libmsi-database.h
index a933281..7a4ed54 100644
--- a/include/libmsi-database.h
+++ b/include/libmsi-database.h
@@ -46,7 +46,7 @@ LibmsiDatabase *    libmsi_database_new                 (const gchar *path,
                                                          const char *persist,
                                                          GError **error);
 
-LibmsiDBState       libmsi_database_get_state           (LibmsiDatabase *db);
+gboolean            libmsi_database_is_readonly         (LibmsiDatabase *db);
 LibmsiRecord *      libmsi_database_get_primary_keys    (LibmsiDatabase *db,
                                                          const char *table,
                                                          GError **error);
diff --git a/include/libmsi-types.h b/include/libmsi-types.h
index b0ab310..1d0c4ca 100644
--- a/include/libmsi-types.h
+++ b/include/libmsi-types.h
@@ -119,13 +119,6 @@ typedef enum LibmsiDBError
     LIBMSI_DB_ERROR_BADLOCALIZEATTRIB
 } LibmsiDBError;
 
-typedef enum LibmsiDBState
-{
-    LIBMSI_DB_STATE_ERROR = -1,
-    LIBMSI_DB_STATE_READ = 0,
-    LIBMSI_DB_STATE_WRITE = 1
-} LibmsiDBState;
-
 typedef enum LibmsiProperty
 {
     LIBMSI_PROPERTY_DICTIONARY = 0,
diff --git a/libmsi/libmsi-database.c b/libmsi/libmsi-database.c
index 580cb7e..df4a26d 100644
--- a/libmsi/libmsi-database.c
+++ b/libmsi/libmsi-database.c
@@ -2037,21 +2037,14 @@ done:
     return r == LIBMSI_RESULT_SUCCESS;
 }
 
-LibmsiDBState libmsi_database_get_state( LibmsiDatabase *db )
+gboolean
+libmsi_database_is_readonly (LibmsiDatabase *db)
 {
-    LibmsiDBState ret = LIBMSI_DB_STATE_READ;
-
-    TRACE("%d\n", db);
-
-    if( !db )
-        return LIBMSI_RESULT_INVALID_HANDLE;
+    TRACE("%p\n", db);
 
-    g_object_ref(db);
-    if (db->mode != LIBMSI_DB_OPEN_READONLY )
-        ret = LIBMSI_DB_STATE_WRITE;
-    g_object_unref(db);
+    g_return_val_if_fail (LIBMSI_IS_DATABASE (db), TRUE);
 
-    return ret;
+    return db->mode == LIBMSI_DB_OPEN_READONLY;
 }
 
 static void cache_infile_structure( LibmsiDatabase *db )