adapt code more to GObject standards

3 files changed, 54 insertions, 59 deletions

diff --git a/libmsi/libmsi-database.c b/libmsi/libmsi-database.c
index 2069994..fe91d7b 100644
--- a/libmsi/libmsi-database.c
+++ b/libmsi/libmsi-database.c
@@ -90,12 +90,12 @@ libmsi_db_error_quark (void)
 }
 
 static void
-libmsi_database_init (LibmsiDatabase *p)
+libmsi_database_init (LibmsiDatabase *self)
 {
-    list_init (&p->tables);
-    list_init (&p->transforms);
-    list_init (&p->streams);
-    list_init (&p->storages);
+    list_init (&self->tables);
+    list_init (&self->transforms);
+    list_init (&self->streams);
+    list_init (&self->storages);
 }
 
 static void
@@ -120,13 +120,12 @@ static void
 libmsi_database_finalize (GObject *object)
 {
     LibmsiDatabase *self = LIBMSI_DATABASE (object);
-    LibmsiDatabase *p = self;
 
     _libmsi_database_close (self, false);
     free_cached_tables (self);
     free_transforms (self);
 
-    g_free (p->path);
+    g_free (self->path);
 
     G_OBJECT_CLASS (libmsi_database_parent_class)->finalize (object);
 }
@@ -135,23 +134,23 @@ static void
 libmsi_database_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
     g_return_if_fail (LIBMSI_IS_DATABASE (object));
-    LibmsiDatabase *p = LIBMSI_DATABASE (object);
+    LibmsiDatabase *self = LIBMSI_DATABASE (object);
 
     switch (prop_id) {
     case PROP_PATH:
-        g_return_if_fail (p->path == NULL);
-        p->path = g_value_dup_string (value);
+        g_return_if_fail (self->path == NULL);
+        self->path = g_value_dup_string (value);
         break;
     case PROP_MODE:
-        g_return_if_fail (p->mode == NULL);
-        p->mode = (const char*)g_value_get_int (value);
+        g_return_if_fail (self->mode == NULL);
+        self->mode = (const char*)g_value_get_int (value);
         break;
     case PROP_OUTPATH:
-        g_return_if_fail (p->outpath == NULL);
-        p->outpath = (const char*)g_value_dup_string (value);
+        g_return_if_fail (self->outpath == NULL);
+        self->outpath = (const char*)g_value_dup_string (value);
         break;
     case PROP_PATCH:
-        p->patch = g_value_get_boolean (value);
+        self->patch = g_value_get_boolean (value);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -163,20 +162,20 @@ static void
 libmsi_database_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
     g_return_if_fail (LIBMSI_IS_DATABASE (object));
-    LibmsiDatabase *p = LIBMSI_DATABASE (object);
+    LibmsiDatabase *self = LIBMSI_DATABASE (object);
 
     switch (prop_id) {
     case PROP_PATH:
-        g_value_set_string (value, p->path);
+        g_value_set_string (value, self->path);
         break;
     case PROP_MODE:
-        g_value_set_int (value, (int)p->mode);
+        g_value_set_int (value, (int)self->mode);
         break;
     case PROP_OUTPATH:
-        g_value_set_string (value, p->outpath);
+        g_value_set_string (value, self->outpath);
         break;
     case PROP_PATCH:
-        g_value_set_boolean (value, p->patch);
+        g_value_set_boolean (value, self->patch);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -2448,21 +2447,20 @@ LibmsiCondition libmsi_database_is_table_persistent(
 static gboolean
 init (LibmsiDatabase *self, GError **error)
 {
-    LibmsiDatabase *p = LIBMSI_DATABASE (self);
     LibmsiResult ret;
 
-    if (p->mode == LIBMSI_DB_OPEN_CREATE) {
-        p->strings = msi_init_string_table (&p->bytes_per_strref);
+    if (self->mode == LIBMSI_DB_OPEN_CREATE) {
+        self->strings = msi_init_string_table (&self->bytes_per_strref);
     } else {
         if (_libmsi_database_open(self))
             return FALSE;
     }
 
-    p->media_transform_offset = MSI_INITIAL_MEDIA_TRANSFORM_OFFSET;
-    p->media_transform_disk_id = MSI_INITIAL_MEDIA_TRANSFORM_DISKID;
+    self->media_transform_offset = MSI_INITIAL_MEDIA_TRANSFORM_OFFSET;
+    self->media_transform_disk_id = MSI_INITIAL_MEDIA_TRANSFORM_DISKID;
 
     if (TRACE_ON(msi))
-        enum_stream_names (p->infile);
+        enum_stream_names (self->infile);
 
     ret = _libmsi_database_start_transaction (self);
 
diff --git a/libmsi/libmsi-query.c b/libmsi/libmsi-query.c
index d0c8a3b..ecb3f14 100644
--- a/libmsi/libmsi-query.c
+++ b/libmsi/libmsi-query.c
@@ -38,29 +38,28 @@ enum
 G_DEFINE_TYPE (LibmsiQuery, libmsi_query, G_TYPE_OBJECT);
 
 static void
-libmsi_query_init (LibmsiQuery *p)
+libmsi_query_init (LibmsiQuery *self)
 {
-    list_init (&p->mem);
+    list_init (&self->mem);
 }
 
 static void
 libmsi_query_finalize (GObject *object)
 {
     LibmsiQuery *self = LIBMSI_QUERY (object);
-    LibmsiQuery *p = self;
     struct list *ptr, *t;
 
-    if (p->view && p->view->ops->delete)
-        p->view->ops->delete (p->view);
+    if (self->view && self->view->ops->delete)
+        self->view->ops->delete (self->view);
 
-    if (p->database)
-        g_object_unref (p->database);
+    if (self->database)
+        g_object_unref (self->database);
 
-    LIST_FOR_EACH_SAFE (ptr, t, &p->mem) {
+    LIST_FOR_EACH_SAFE (ptr, t, &self->mem) {
         msi_free (ptr);
     }
 
-    g_free (p->query);
+    g_free (self->query);
 
     G_OBJECT_CLASS (libmsi_query_parent_class)->finalize (object);
 }
@@ -68,17 +67,17 @@ libmsi_query_finalize (GObject *object)
 static void
 libmsi_query_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
-    LibmsiQuery *p = LIBMSI_QUERY (object);
     g_return_if_fail (LIBMSI_IS_QUERY (object));
+    LibmsiQuery *self = LIBMSI_QUERY (object);
 
     switch (prop_id) {
     case PROP_DATABASE:
-        g_return_if_fail (p->database == NULL);
-        p->database = g_value_dup_object (value);
+        g_return_if_fail (self->database == NULL);
+        self->database = g_value_dup_object (value);
         break;
     case PROP_QUERY:
-        g_return_if_fail (p->query == NULL);
-        p->query = g_value_dup_string (value);
+        g_return_if_fail (self->query == NULL);
+        self->query = g_value_dup_string (value);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -89,15 +88,15 @@ libmsi_query_set_property (GObject *object, guint prop_id, const GValue *value,
 static void
 libmsi_query_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-    LibmsiQuery *p = LIBMSI_QUERY (object);
     g_return_if_fail (LIBMSI_IS_QUERY (object));
+    LibmsiQuery *self = LIBMSI_QUERY (object);
 
     switch (prop_id) {
     case PROP_DATABASE:
-        g_value_set_object (value, p->database);
+        g_value_set_object (value, self->database);
         break;
     case PROP_QUERY:
-        g_value_set_string (value, p->query);
+        g_value_set_string (value, self->query);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -136,10 +135,9 @@ libmsi_query_class_init (LibmsiQueryClass *klass)
 static gboolean
 init (LibmsiQuery *self, GError **error)
 {
-    LibmsiQuery *p = self;
     unsigned r;
 
-    r = _libmsi_parse_sql (p->database, p->query, &p->view, &p->mem);
+    r = _libmsi_parse_sql (self->database, self->query, &self->view, &self->mem);
 
     return r == LIBMSI_RESULT_SUCCESS;
 }
diff --git a/libmsi/libmsi-summary-info.c b/libmsi/libmsi-summary-info.c
index f9582cc..11ebc89 100644
--- a/libmsi/libmsi-summary-info.c
+++ b/libmsi/libmsi-summary-info.c
@@ -46,7 +46,7 @@ static const uint8_t fmtid_SummaryInformation[16] =
 static unsigned load_summary_info( LibmsiSummaryInfo *si, GsfInput *stm );
 
 static void
-libmsi_summary_info_init (LibmsiSummaryInfo *p)
+libmsi_summary_info_init (LibmsiSummaryInfo *self)
 {
 }
 
@@ -61,14 +61,14 @@ free_prop (LibmsiOLEVariant *prop)
 static void
 libmsi_summary_info_finalize (GObject *object)
 {
-    LibmsiSummaryInfo *p = LIBMSI_SUMMARY_INFO (object);
+    LibmsiSummaryInfo *self = LIBMSI_SUMMARY_INFO (object);
     unsigned i;
 
     for (i = 0; i < MSI_MAX_PROPS; i++)
-        free_prop (&p->property[i]);
+        free_prop (&self->property[i]);
 
-    if (p->database)
-        g_object_unref (p->database);
+    if (self->database)
+        g_object_unref (self->database);
 
     G_OBJECT_CLASS (libmsi_summary_info_parent_class)->finalize (object);
 }
@@ -77,15 +77,15 @@ static void
 summary_info_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
     g_return_if_fail (LIBMSI_IS_SUMMARY_INFO (object));
-    LibmsiSummaryInfo *p = LIBMSI_SUMMARY_INFO (object);
+    LibmsiSummaryInfo *self = LIBMSI_SUMMARY_INFO (object);
 
     switch (prop_id) {
     case PROP_DATABASE:
-        g_return_if_fail (p->database == NULL);
-        p->database = g_value_dup_object (value);
+        g_return_if_fail (self->database == NULL);
+        self->database = g_value_dup_object (value);
         break;
     case PROP_UPDATE_COUNT:
-        p->update_count = g_value_get_uint (value);
+        self->update_count = g_value_get_uint (value);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -97,14 +97,14 @@ static void
 summary_info_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
     g_return_if_fail (LIBMSI_IS_SUMMARY_INFO (object));
-    LibmsiSummaryInfo *p = LIBMSI_SUMMARY_INFO (object);
+    LibmsiSummaryInfo *self = LIBMSI_SUMMARY_INFO (object);
 
     switch (prop_id) {
     case PROP_DATABASE:
-        g_value_set_object (value, p->database);
+        g_value_set_object (value, self->database);
         break;
     case PROP_UPDATE_COUNT:
-        g_value_set_uint (value, p->update_count);
+        g_value_set_uint (value, self->update_count);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -116,12 +116,11 @@ static void
 libmsi_summary_info_constructed (GObject *object)
 {
     LibmsiSummaryInfo *self = LIBMSI_SUMMARY_INFO (object);
-    LibmsiSummaryInfo *p = self;
     GsfInput *stm = NULL;
     unsigned r;
 
     /* read the stream... if we fail, we'll start with an empty property set */
-    r = msi_get_raw_stream (p->database, szSumInfo, &stm);
+    r = msi_get_raw_stream (self->database, szSumInfo, &stm);
     if (r == 0) {
         load_summary_info (self, stm);
         g_object_unref (G_OBJECT (stm));