Signed-off-by: Giuseppe Scrivano <gscrivan@xxxxxxxxxx>
---
osinfo/osinfo_avatar_format.c | 16 +-
osinfo/osinfo_datamap.c | 18 +-
osinfo/osinfo_datamaplist.c | 18 +-
osinfo/osinfo_db.c | 48 ++--
osinfo/osinfo_deployment.c | 28 +--
osinfo/osinfo_deploymentlist.c | 18 +-
osinfo/osinfo_device.c | 20 +-
osinfo/osinfo_device_driver.c | 28 +--
osinfo/osinfo_device_driverlist.c | 18 +-
osinfo/osinfo_devicelink.c | 24 +-
osinfo/osinfo_devicelinkfilter.c | 26 +--
osinfo/osinfo_devicelinklist.c | 20 +-
osinfo/osinfo_devicelist.c | 18 +-
osinfo/osinfo_entity.c | 44 ++--
osinfo/osinfo_filter.c | 22 +-
osinfo/osinfo_install_config.c | 14 +-
osinfo/osinfo_install_config_param.c | 24 +-
osinfo/osinfo_install_config_paramlist.c | 18 +-
osinfo/osinfo_install_script.c | 28 +--
osinfo/osinfo_install_scriptlist.c | 18 +-
osinfo/osinfo_list.c | 24 +-
osinfo/osinfo_loader.c | 108 ++++-----
osinfo/osinfo_media.c | 382 +++++++++++++++----------------
osinfo/osinfo_medialist.c | 18 +-
osinfo/osinfo_os.c | 84 +++----
osinfo/osinfo_os_variant.c | 48 ++--
osinfo/osinfo_os_variantlist.c | 12 +-
osinfo/osinfo_oslist.c | 18 +-
osinfo/osinfo_platform.c | 20 +-
osinfo/osinfo_platformlist.c | 18 +-
osinfo/osinfo_product.c | 138 +++++------
osinfo/osinfo_productfilter.c | 24 +-
osinfo/osinfo_productlist.c | 18 +-
osinfo/osinfo_resources.c | 178 +++++++-------
osinfo/osinfo_resourceslist.c | 18 +-
osinfo/osinfo_tree.c | 12 +-
osinfo/osinfo_treelist.c | 22 +-
37 files changed, 805 insertions(+), 805 deletions(-)
diff --git a/osinfo/osinfo_avatar_format.c b/osinfo/osinfo_avatar_format.c
index 7928c41..4e0b9d9 100644
--- a/osinfo/osinfo_avatar_format.c
+++ b/osinfo/osinfo_avatar_format.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
* Copyright (C) 2012 Fabiano Fidêncio
*
* This library is free software; you can redistribute it and/or
@@ -28,10 +28,10 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoAvatarFormat, osinfo_avatar_format, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoAvatarFormat, osinfo_avatar_format, OSINFO_TYPE_ENTITY);
#define OSINFO_AVATAR_FORMAT_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
+ (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
OSINFO_TYPE_AVATAR_FORMAT, \
OsinfoAvatarFormatPrivate))
@@ -56,7 +56,7 @@ osinfo_avatar_format_get_property(GObject *object,
GValue *value,
GParamSpec *pspec)
{
- OsinfoAvatarFormat *avatar = OSINFO_AVATAR_FORMAT (object);
+ OsinfoAvatarFormat *avatar = OSINFO_AVATAR_FORMAT(object);
switch (property_id)
{
@@ -82,16 +82,16 @@ osinfo_avatar_format_get_property(GObject *object,
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
/* Init functions */
static void
-osinfo_avatar_format_class_init (OsinfoAvatarFormatClass *klass)
+osinfo_avatar_format_class_init(OsinfoAvatarFormatClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
g_klass->get_property = osinfo_avatar_format_get_property;
@@ -164,7 +164,7 @@ osinfo_avatar_format_class_init (OsinfoAvatarFormatClass *klass)
}
static void
-osinfo_avatar_format_init (OsinfoAvatarFormat *avatar)
+osinfo_avatar_format_init(OsinfoAvatarFormat *avatar)
{
}
diff --git a/osinfo/osinfo_datamap.c b/osinfo/osinfo_datamap.c
index efd5d1d..beea6e8 100644
--- a/osinfo/osinfo_datamap.c
+++ b/osinfo/osinfo_datamap.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -30,9 +30,9 @@
#include <libxslt/xsltutils.h>
#include <libxslt/xsltInternals.h>
-G_DEFINE_TYPE (OsinfoDatamap, osinfo_datamap, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoDatamap, osinfo_datamap, OSINFO_TYPE_ENTITY);
-#define OSINFO_DATAMAP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_DATAMAP, OsinfoDatamapPrivate))
+#define OSINFO_DATAMAP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_DATAMAP, OsinfoDatamapPrivate))
/**
* SECTION:osinfo_datamap
@@ -51,7 +51,7 @@ struct _OsinfoDatamapPrivate
};
static void
-osinfo_datamap_finalize (GObject *object)
+osinfo_datamap_finalize(GObject *object)
{
OsinfoDatamap *map = OSINFO_DATAMAP(object);
@@ -59,22 +59,22 @@ osinfo_datamap_finalize (GObject *object)
g_hash_table_unref(map->priv->reverse_map);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_datamap_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_datamap_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_datamap_class_init (OsinfoDatamapClass *klass)
+osinfo_datamap_class_init(OsinfoDatamapClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_datamap_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoDatamapPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoDatamapPrivate));
}
static void
-osinfo_datamap_init (OsinfoDatamap *list)
+osinfo_datamap_init(OsinfoDatamap *list)
{
list->priv = OSINFO_DATAMAP_GET_PRIVATE(list);
list->priv->map = g_hash_table_new_full(g_str_hash,
diff --git a/osinfo/osinfo_datamaplist.c b/osinfo/osinfo_datamaplist.c
index 01b58f1..6d56d9c 100644
--- a/osinfo/osinfo_datamaplist.c
+++ b/osinfo/osinfo_datamaplist.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,9 +26,9 @@
#include <osinfo/osinfo.h>
-G_DEFINE_TYPE (OsinfoDatamapList, osinfo_datamaplist, OSINFO_TYPE_LIST);
+G_DEFINE_TYPE(OsinfoDatamapList, osinfo_datamaplist, OSINFO_TYPE_LIST);
-#define OSINFO_DATAMAPLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_DATAMAPLIST, OsinfoDatamapListPrivate))
+#define OSINFO_DATAMAPLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_DATAMAPLIST, OsinfoDatamapListPrivate))
/**
* SECTION:osinfo_datamaplist
@@ -45,24 +45,24 @@ struct _OsinfoDatamapListPrivate
};
static void
-osinfo_datamaplist_finalize (GObject *object)
+osinfo_datamaplist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_datamaplist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_datamaplist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_datamaplist_class_init (OsinfoDatamapListClass *klass)
+osinfo_datamaplist_class_init(OsinfoDatamapListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_datamaplist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoDatamapListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoDatamapListPrivate));
}
static void
-osinfo_datamaplist_init (OsinfoDatamapList *list)
+osinfo_datamaplist_init(OsinfoDatamapList *list)
{
list->priv = OSINFO_DATAMAPLIST_GET_PRIVATE(list);
}
diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
index db04033..241ee47 100644
--- a/osinfo/osinfo_db.c
+++ b/osinfo/osinfo_db.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -30,9 +30,9 @@
#include <string.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoDb, osinfo_db, G_TYPE_OBJECT);
+G_DEFINE_TYPE(OsinfoDb, osinfo_db, G_TYPE_OBJECT);
-#define OSINFO_DB_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_DB, OsinfoDbPrivate))
+#define OSINFO_DB_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_DB, OsinfoDbPrivate))
#define match_regex(pattern, str) \
(((pattern) == NULL) || \
@@ -138,12 +138,12 @@ struct _OsinfoDbPrivate
OsinfoInstallScriptList *scripts;
};
-static void osinfo_db_finalize (GObject *object);
+static void osinfo_db_finalize(GObject *object);
static void
-osinfo_db_finalize (GObject *object)
+osinfo_db_finalize(GObject *object)
{
- OsinfoDb *db = OSINFO_DB (object);
+ OsinfoDb *db = OSINFO_DB(object);
g_object_unref(db->priv->devices);
g_object_unref(db->priv->platforms);
@@ -153,24 +153,24 @@ osinfo_db_finalize (GObject *object)
g_object_unref(db->priv->scripts);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_db_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_db_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_db_class_init (OsinfoDbClass *klass)
+osinfo_db_class_init(OsinfoDbClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_db_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoDbPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoDbPrivate));
}
static void
-osinfo_db_init (OsinfoDb *db)
+osinfo_db_init(OsinfoDb *db)
{
db->priv = OSINFO_DB_GET_PRIVATE(db);
db->priv->devices = osinfo_devicelist_new();
@@ -518,7 +518,7 @@ void osinfo_db_add_install_script(OsinfoDb *db, OsinfoInstallScript *script)
}
-static gint media_volume_compare (gconstpointer a, gconstpointer b)
+static gint media_volume_compare(gconstpointer a, gconstpointer b)
{
OsinfoMedia *media_a = OSINFO_MEDIA(a);
OsinfoMedia *media_b = OSINFO_MEDIA(b);
@@ -573,10 +573,10 @@ osinfo_db_guess_os_from_media_internal(OsinfoDb *db,
const gchar *os_publisher = osinfo_media_get_publisher_id(os_media);
const gchar *os_application = osinfo_media_get_application_id(os_media);
- if (match_regex (os_volume, media_volume) &&
- match_regex (os_application, media_application) &&
- match_regex (os_system, media_system) &&
- match_regex (os_publisher, media_publisher)) {
+ if (match_regex(os_volume, media_volume) &&
+ match_regex(os_application, media_application) &&
+ match_regex(os_system, media_system) &&
+ match_regex(os_publisher, media_publisher)) {
ret = os;
if (matched_media != NULL)
*matched_media = os_media;
@@ -614,7 +614,7 @@ OsinfoOs *osinfo_db_guess_os_from_media(OsinfoDb *db,
return osinfo_db_guess_os_from_media_internal(db, media, matched_media);
}
-static void fill_media (OsinfoDb *db, OsinfoMedia *media,
+static void fill_media(OsinfoDb *db, OsinfoMedia *media,
OsinfoMedia *matched_media,
OsinfoOs *os)
{
@@ -751,10 +751,10 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db,
const gchar *os_version = osinfo_tree_get_treeinfo_version(os_tree);
const gchar *os_arch = osinfo_tree_get_treeinfo_arch(os_tree);
- if (match_regex (os_family, tree_family) &&
- match_regex (os_variant, tree_variant) &&
- match_regex (os_version, tree_version) &&
- match_regex (os_arch, tree_arch)) {
+ if (match_regex(os_family, tree_family) &&
+ match_regex(os_variant, tree_variant) &&
+ match_regex(os_version, tree_version) &&
+ match_regex(os_arch, tree_arch)) {
ret = os;
if (matched_tree != NULL)
*matched_tree = os_tree;
@@ -908,7 +908,7 @@ static void __osinfoAddProductIfRelationship(gpointer data, gpointer opaque)
OsinfoProductList *thisList = osinfo_product_get_related(product, args->relshp);
int i;
- for (i = 0 ; i < osinfo_list_get_length(OSINFO_LIST(thisList)) ; i++) {
+ for (i = 0; i < osinfo_list_get_length(OSINFO_LIST(thisList)); i++) {
OsinfoEntity *entity = osinfo_list_get_nth(OSINFO_LIST(thisList), i);
osinfo_list_add(newList, entity);
}
@@ -931,7 +931,7 @@ OsinfoOsList *osinfo_db_unique_values_for_os_relationship(OsinfoDb *db, OsinfoPr
g_return_val_if_fail(OSINFO_IS_DB(db), NULL);
OsinfoOsList *newList = osinfo_oslist_new();
- struct __osinfoProductCheckRelationshipArgs args = {OSINFO_LIST (newList), relshp};
+ struct __osinfoProductCheckRelationshipArgs args = {OSINFO_LIST(newList), relshp};
GList *entities = osinfo_list_get_elements(OSINFO_LIST(db->priv->oses));
g_list_foreach(entities, __osinfoAddProductIfRelationship, &args);
@@ -956,7 +956,7 @@ OsinfoPlatformList *osinfo_db_unique_values_for_platform_relationship(OsinfoDb *
g_return_val_if_fail(OSINFO_IS_DB(db), NULL);
OsinfoPlatformList *newList = osinfo_platformlist_new();
- struct __osinfoProductCheckRelationshipArgs args = {OSINFO_LIST (newList), relshp};
+ struct __osinfoProductCheckRelationshipArgs args = {OSINFO_LIST(newList), relshp};
GList *entities = osinfo_list_get_elements(OSINFO_LIST(db->priv->platforms));
g_list_foreach(entities, __osinfoAddProductIfRelationship, &args);
diff --git a/osinfo/osinfo_deployment.c b/osinfo/osinfo_deployment.c
index a00497d..7191ac3 100644
--- a/osinfo/osinfo_deployment.c
+++ b/osinfo/osinfo_deployment.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoDeployment, osinfo_deployment, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoDeployment, osinfo_deployment, OSINFO_TYPE_ENTITY);
-#define OSINFO_DEPLOYMENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_DEPLOYMENT, OsinfoDeploymentPrivate))
+#define OSINFO_DEPLOYMENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_DEPLOYMENT, OsinfoDeploymentPrivate))
/**
* SECTION:osinfo_deployment
@@ -64,7 +64,7 @@ osinfo_deployment_set_property(GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- OsinfoDeployment *deployment = OSINFO_DEPLOYMENT (object);
+ OsinfoDeployment *deployment = OSINFO_DEPLOYMENT(object);
switch (property_id)
{
@@ -84,7 +84,7 @@ osinfo_deployment_set_property(GObject *object,
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
@@ -95,7 +95,7 @@ osinfo_deployment_get_property(GObject *object,
GValue *value,
GParamSpec *pspec)
{
- OsinfoDeployment *deployment = OSINFO_DEPLOYMENT (object);
+ OsinfoDeployment *deployment = OSINFO_DEPLOYMENT(object);
switch (property_id)
{
@@ -107,7 +107,7 @@ osinfo_deployment_get_property(GObject *object,
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
@@ -120,9 +120,9 @@ static void osinfo_device_link_free(gpointer data, gpointer opaque G_GNUC_UNUSED
}
static void
-osinfo_deployment_finalize (GObject *object)
+osinfo_deployment_finalize(GObject *object)
{
- OsinfoDeployment *deployment = OSINFO_DEPLOYMENT (object);
+ OsinfoDeployment *deployment = OSINFO_DEPLOYMENT(object);
g_list_foreach(deployment->priv->deviceLinks, osinfo_device_link_free, NULL);
g_list_free(deployment->priv->deviceLinks);
@@ -131,14 +131,14 @@ osinfo_deployment_finalize (GObject *object)
g_object_unref(deployment->priv->platform);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_deployment_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_deployment_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_deployment_class_init (OsinfoDeploymentClass *klass)
+osinfo_deployment_class_init(OsinfoDeploymentClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
g_klass->set_property = osinfo_deployment_set_property;
@@ -176,11 +176,11 @@ osinfo_deployment_class_init (OsinfoDeploymentClass *klass)
pspec);
g_klass->finalize = osinfo_deployment_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoDeploymentPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoDeploymentPrivate));
}
static void
-osinfo_deployment_init (OsinfoDeployment *deployment)
+osinfo_deployment_init(OsinfoDeployment *deployment)
{
deployment->priv = OSINFO_DEPLOYMENT_GET_PRIVATE(deployment);
deployment->priv->deviceLinks = NULL;
diff --git a/osinfo/osinfo_deploymentlist.c b/osinfo/osinfo_deploymentlist.c
index acf5e6e..b50febd 100644
--- a/osinfo/osinfo_deploymentlist.c
+++ b/osinfo/osinfo_deploymentlist.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoDeploymentList, osinfo_deploymentlist, OSINFO_TYPE_LIST);
+G_DEFINE_TYPE(OsinfoDeploymentList, osinfo_deploymentlist, OSINFO_TYPE_LIST);
-#define OSINFO_DEPLOYMENTLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_DEPLOYMENTLIST, OsinfoDeploymentListPrivate))
+#define OSINFO_DEPLOYMENTLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_DEPLOYMENTLIST, OsinfoDeploymentListPrivate))
/**
* SECTION:osinfo_deploymentlist
@@ -46,24 +46,24 @@ struct _OsinfoDeploymentListPrivate
};
static void
-osinfo_deploymentlist_finalize (GObject *object)
+osinfo_deploymentlist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_deploymentlist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_deploymentlist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_deploymentlist_class_init (OsinfoDeploymentListClass *klass)
+osinfo_deploymentlist_class_init(OsinfoDeploymentListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_deploymentlist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoDeploymentListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoDeploymentListPrivate));
}
static void
-osinfo_deploymentlist_init (OsinfoDeploymentList *list)
+osinfo_deploymentlist_init(OsinfoDeploymentList *list)
{
list->priv = OSINFO_DEPLOYMENTLIST_GET_PRIVATE(list);
}
diff --git a/osinfo/osinfo_device.c b/osinfo/osinfo_device.c
index 8308817..6389878 100644
--- a/osinfo/osinfo_device.c
+++ b/osinfo/osinfo_device.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,9 +28,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoDevice, osinfo_device, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoDevice, osinfo_device, OSINFO_TYPE_ENTITY);
-#define OSINFO_DEVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_DEVICE, OsinfoDevicePrivate))
+#define OSINFO_DEVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_DEVICE, OsinfoDevicePrivate))
/**
* SECTION:osinfo_device
@@ -48,27 +48,27 @@ struct _OsinfoDevicePrivate
};
-static void osinfo_device_finalize (GObject *object);
+static void osinfo_device_finalize(GObject *object);
static void
-osinfo_device_finalize (GObject *object)
+osinfo_device_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_device_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_device_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_device_class_init (OsinfoDeviceClass *klass)
+osinfo_device_class_init(OsinfoDeviceClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_device_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoDevicePrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoDevicePrivate));
}
static void
-osinfo_device_init (OsinfoDevice *device)
+osinfo_device_init(OsinfoDevice *device)
{
device->priv = OSINFO_DEVICE_GET_PRIVATE(device);
}
diff --git a/osinfo/osinfo_device_driver.c b/osinfo/osinfo_device_driver.c
index 6aa8de3..e9c81ab 100644
--- a/osinfo/osinfo_device_driver.c
+++ b/osinfo/osinfo_device_driver.c
@@ -1,7 +1,7 @@
/*
* libosinfo: Device driver
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -31,12 +31,12 @@
#include "osinfo_device_driver_private.h"
-G_DEFINE_TYPE (OsinfoDeviceDriver, osinfo_device_driver, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoDeviceDriver, osinfo_device_driver, OSINFO_TYPE_ENTITY);
#define OSINFO_DEVICE_DRIVER_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- OSINFO_TYPE_DEVICE_DRIVER, \
- OsinfoDeviceDriverPrivate))
+ (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
+ OSINFO_TYPE_DEVICE_DRIVER, \
+ OsinfoDeviceDriverPrivate))
/**
* SECTION:osinfo_device_driver
@@ -53,38 +53,38 @@ struct _OsinfoDeviceDriverPrivate
};
static void
-osinfo_device_driver_finalize (GObject *object)
+osinfo_device_driver_finalize(GObject *object)
{
- OsinfoDeviceDriver *driver = OSINFO_DEVICE_DRIVER (object);
+ OsinfoDeviceDriver *driver = OSINFO_DEVICE_DRIVER(object);
g_object_unref(driver->priv->devices);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_device_driver_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_device_driver_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_device_driver_class_init (OsinfoDeviceDriverClass *klass)
+osinfo_device_driver_class_init(OsinfoDeviceDriverClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_device_driver_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoDeviceDriverPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoDeviceDriverPrivate));
}
static void
-osinfo_device_driver_init (OsinfoDeviceDriver *driver)
+osinfo_device_driver_init(OsinfoDeviceDriver *driver)
{
driver->priv = OSINFO_DEVICE_DRIVER_GET_PRIVATE(driver);
- driver->priv->devices = osinfo_devicelist_new ();
+ driver->priv->devices = osinfo_devicelist_new();
}
OsinfoDeviceDriver *osinfo_device_driver_new(const gchar *id)
{
OsinfoDeviceDriver *driver;
- driver = g_object_new (OSINFO_TYPE_DEVICE_DRIVER,
+ driver = g_object_new(OSINFO_TYPE_DEVICE_DRIVER,
"id", id,
NULL);
diff --git a/osinfo/osinfo_device_driverlist.c b/osinfo/osinfo_device_driverlist.c
index f802e38..73c0021 100644
--- a/osinfo/osinfo_device_driverlist.c
+++ b/osinfo/osinfo_device_driverlist.c
@@ -1,7 +1,7 @@
/*
* libosinfo: Device driver list
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,9 +28,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoDeviceDriverList, osinfo_device_driverlist, OSINFO_TYPE_LIST);
+G_DEFINE_TYPE(OsinfoDeviceDriverList, osinfo_device_driverlist, OSINFO_TYPE_LIST);
-#define OSINFO_DEVICE_DRIVERLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_DEVICE_DRIVERLIST, OsinfoDeviceDriverListPrivate))
+#define OSINFO_DEVICE_DRIVERLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_DEVICE_DRIVERLIST, OsinfoDeviceDriverListPrivate))
/**
* SECTION:osinfo_device_driverlist
@@ -47,24 +47,24 @@ struct _OsinfoDeviceDriverListPrivate
};
static void
-osinfo_device_driverlist_finalize (GObject *object)
+osinfo_device_driverlist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_device_driverlist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_device_driverlist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_device_driverlist_class_init (OsinfoDeviceDriverListClass *klass)
+osinfo_device_driverlist_class_init(OsinfoDeviceDriverListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_device_driverlist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoDeviceDriverListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoDeviceDriverListPrivate));
}
static void
-osinfo_device_driverlist_init (OsinfoDeviceDriverList *list)
+osinfo_device_driverlist_init(OsinfoDeviceDriverList *list)
{
list->priv = OSINFO_DEVICE_DRIVERLIST_GET_PRIVATE(list);
}
diff --git a/osinfo/osinfo_devicelink.c b/osinfo/osinfo_devicelink.c
index fd72a1b..41ebd56 100644
--- a/osinfo/osinfo_devicelink.c
+++ b/osinfo/osinfo_devicelink.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoDeviceLink, osinfo_devicelink, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoDeviceLink, osinfo_devicelink, OSINFO_TYPE_ENTITY);
-#define OSINFO_DEVICELINK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_DEVICELINK, OsinfoDeviceLinkPrivate))
+#define OSINFO_DEVICELINK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_DEVICELINK, OsinfoDeviceLinkPrivate))
/**
* SECTION:osinfo_devicelink
@@ -58,7 +58,7 @@ osinfo_devicelink_set_property(GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- OsinfoDeviceLink *devlink = OSINFO_DEVICELINK (object);
+ OsinfoDeviceLink *devlink = OSINFO_DEVICELINK(object);
switch (property_id)
{
@@ -71,7 +71,7 @@ osinfo_devicelink_set_property(GObject *object,
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
@@ -82,7 +82,7 @@ osinfo_devicelink_get_property(GObject *object,
GValue *value,
GParamSpec *pspec)
{
- OsinfoDeviceLink *devlink = OSINFO_DEVICELINK (object);
+ OsinfoDeviceLink *devlink = OSINFO_DEVICELINK(object);
switch (property_id)
{
@@ -91,7 +91,7 @@ osinfo_devicelink_get_property(GObject *object,
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
@@ -106,14 +106,14 @@ osinfo_devicelink_finalize(GObject *object)
g_object_unref(devlink->priv->target);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_devicelink_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_devicelink_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_devicelink_class_init (OsinfoDeviceLinkClass *klass)
+osinfo_devicelink_class_init(OsinfoDeviceLinkClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
g_klass->set_property = osinfo_devicelink_set_property;
@@ -137,11 +137,11 @@ osinfo_devicelink_class_init (OsinfoDeviceLinkClass *klass)
g_klass->finalize = osinfo_devicelink_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoDeviceLinkPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoDeviceLinkPrivate));
}
static void
-osinfo_devicelink_init (OsinfoDeviceLink *devlink)
+osinfo_devicelink_init(OsinfoDeviceLink *devlink)
{
devlink->priv = OSINFO_DEVICELINK_GET_PRIVATE(devlink);
}
diff --git a/osinfo/osinfo_devicelinkfilter.c b/osinfo/osinfo_devicelinkfilter.c
index 2c84009..5ecb09b 100644
--- a/osinfo/osinfo_devicelinkfilter.c
+++ b/osinfo/osinfo_devicelinkfilter.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoDeviceLinkFilter, osinfo_devicelinkfilter, OSINFO_TYPE_FILTER);
+G_DEFINE_TYPE(OsinfoDeviceLinkFilter, osinfo_devicelinkfilter, OSINFO_TYPE_FILTER);
-#define OSINFO_DEVICELINKFILTER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_DEVICELINKFILTER, OsinfoDeviceLinkFilterPrivate))
+#define OSINFO_DEVICELINKFILTER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_DEVICELINKFILTER, OsinfoDeviceLinkFilterPrivate))
/**
* SECTION:osinfo_devicelinkfilter
@@ -62,7 +62,7 @@ osinfo_devicelinkfilter_set_property(GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- OsinfoDeviceLinkFilter *filter = OSINFO_DEVICELINKFILTER (object);
+ OsinfoDeviceLinkFilter *filter = OSINFO_DEVICELINKFILTER(object);
switch (property_id)
{
@@ -75,7 +75,7 @@ osinfo_devicelinkfilter_set_property(GObject *object,
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
@@ -95,26 +95,26 @@ osinfo_devicelinkfilter_get_property(GObject *object,
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
static void
-osinfo_devicelinkfilter_finalize (GObject *object)
+osinfo_devicelinkfilter_finalize(GObject *object)
{
- OsinfoDeviceLinkFilter *filter = OSINFO_DEVICELINKFILTER (object);
+ OsinfoDeviceLinkFilter *filter = OSINFO_DEVICELINKFILTER(object);
g_object_unref(filter->priv->targetFilter);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_devicelinkfilter_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_devicelinkfilter_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_devicelinkfilter_class_init (OsinfoDeviceLinkFilterClass *klass)
+osinfo_devicelinkfilter_class_init(OsinfoDeviceLinkFilterClass *klass)
{
GObjectClass *g_klass = G_OBJECT_CLASS(klass);
OsinfoFilterClass *filter_klass = OSINFO_FILTER_CLASS(klass);
@@ -140,7 +140,7 @@ osinfo_devicelinkfilter_class_init (OsinfoDeviceLinkFilterClass *klass)
PROP_TARGET_FILTER,
pspec);
- g_type_class_add_private (klass, sizeof (OsinfoDeviceLinkFilterPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoDeviceLinkFilterPrivate));
filter_klass->matches = osinfo_devicelinkfilter_matches_default;
}
@@ -164,7 +164,7 @@ OsinfoDeviceLinkFilter *osinfo_devicelinkfilter_new(OsinfoFilter *filter)
static void
-osinfo_devicelinkfilter_init (OsinfoDeviceLinkFilter *devicelinkfilter)
+osinfo_devicelinkfilter_init(OsinfoDeviceLinkFilter *devicelinkfilter)
{
devicelinkfilter->priv = OSINFO_DEVICELINKFILTER_GET_PRIVATE(devicelinkfilter);
}
@@ -191,7 +191,7 @@ static gboolean osinfo_devicelinkfilter_matches_default(OsinfoFilter *filter, Os
g_return_val_if_fail(OSINFO_IS_DEVICELINK(entity), FALSE);
OsinfoDeviceLinkFilter *linkfilter = OSINFO_DEVICELINKFILTER(filter);
- if (!OSINFO_FILTER_CLASS (osinfo_devicelinkfilter_parent_class)->matches(filter, entity))
+ if (!OSINFO_FILTER_CLASS(osinfo_devicelinkfilter_parent_class)->matches(filter, entity))
return FALSE;
if (!osinfo_filter_matches(linkfilter->priv->targetFilter,
diff --git a/osinfo/osinfo_devicelinklist.c b/osinfo/osinfo_devicelinklist.c
index 14f1a7f..8e72119 100644
--- a/osinfo/osinfo_devicelinklist.c
+++ b/osinfo/osinfo_devicelinklist.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoDeviceLinkList, osinfo_devicelinklist, OSINFO_TYPE_LIST);
+G_DEFINE_TYPE(OsinfoDeviceLinkList, osinfo_devicelinklist, OSINFO_TYPE_LIST);
-#define OSINFO_DEVICELINKLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_DEVICELINKLIST, OsinfoDeviceLinkListPrivate))
+#define OSINFO_DEVICELINKLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_DEVICELINKLIST, OsinfoDeviceLinkListPrivate))
/**
* SECTION:osinfo_devicelinklist
@@ -46,24 +46,24 @@ struct _OsinfoDeviceLinkListPrivate
};
static void
-osinfo_devicelinklist_finalize (GObject *object)
+osinfo_devicelinklist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_devicelinklist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_devicelinklist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_devicelinklist_class_init (OsinfoDeviceLinkListClass *klass)
+osinfo_devicelinklist_class_init(OsinfoDeviceLinkListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_devicelinklist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoDeviceLinkListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoDeviceLinkListPrivate));
}
static void
-osinfo_devicelinklist_init (OsinfoDeviceLinkList *list)
+osinfo_devicelinklist_init(OsinfoDeviceLinkList *list)
{
list->priv = OSINFO_DEVICELINKLIST_GET_PRIVATE(list);
}
@@ -178,7 +178,7 @@ OsinfoDeviceList *osinfo_devicelinklist_get_devices(OsinfoDeviceLinkList *list,
{
OsinfoDeviceList *newList = osinfo_devicelist_new();
int i;
- for (i = 0 ; i < osinfo_list_get_length(OSINFO_LIST(list)) ; i++) {
+ for (i = 0; i < osinfo_list_get_length(OSINFO_LIST(list)); i++) {
OsinfoEntity *ent = osinfo_list_get_nth(OSINFO_LIST(list), i);
if (!filter || osinfo_filter_matches(filter, ent))
osinfo_list_add(OSINFO_LIST(newList), ent);
diff --git a/osinfo/osinfo_devicelist.c b/osinfo/osinfo_devicelist.c
index f390ba5..fd293b5 100644
--- a/osinfo/osinfo_devicelist.c
+++ b/osinfo/osinfo_devicelist.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoDeviceList, osinfo_devicelist, OSINFO_TYPE_LIST);
+G_DEFINE_TYPE(OsinfoDeviceList, osinfo_devicelist, OSINFO_TYPE_LIST);
-#define OSINFO_DEVICELIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_DEVICELIST, OsinfoDeviceListPrivate))
+#define OSINFO_DEVICELIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_DEVICELIST, OsinfoDeviceListPrivate))
/**
* SECTION:osinfo_devicelist
@@ -46,24 +46,24 @@ struct _OsinfoDeviceListPrivate
};
static void
-osinfo_devicelist_finalize (GObject *object)
+osinfo_devicelist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_devicelist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_devicelist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_devicelist_class_init (OsinfoDeviceListClass *klass)
+osinfo_devicelist_class_init(OsinfoDeviceListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_devicelist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoDeviceListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoDeviceListPrivate));
}
static void
-osinfo_devicelist_init (OsinfoDeviceList *list)
+osinfo_devicelist_init(OsinfoDeviceList *list)
{
list->priv = OSINFO_DEVICELIST_GET_PRIVATE(list);
}
diff --git a/osinfo/osinfo_entity.c b/osinfo/osinfo_entity.c
index 5c062bc..871c307 100644
--- a/osinfo/osinfo_entity.c
+++ b/osinfo/osinfo_entity.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_ABSTRACT_TYPE (OsinfoEntity, osinfo_entity, G_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE(OsinfoEntity, osinfo_entity, G_TYPE_OBJECT);
-#define OSINFO_ENTITY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_ENTITY, OsinfoEntityPrivate))
+#define OSINFO_ENTITY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_ENTITY, OsinfoEntityPrivate))
/**
* SECTION:osinfo_entity
@@ -52,7 +52,7 @@ struct _OsinfoEntityPrivate
GHashTable *params;
};
-static void osinfo_entity_finalize (GObject *object);
+static void osinfo_entity_finalize(GObject *object);
enum {
PROP_0,
@@ -61,63 +61,63 @@ enum {
};
static void
-osinfo_entity_set_property (GObject *object,
+osinfo_entity_set_property(GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
- OsinfoEntity *entity = OSINFO_ENTITY (object);
+ OsinfoEntity *entity = OSINFO_ENTITY(object);
switch (property_id)
{
case PROP_ID:
g_free(entity->priv->id);
- entity->priv->id = g_value_dup_string (value);
+ entity->priv->id = g_value_dup_string(value);
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
static void
-osinfo_entity_get_property (GObject *object,
+osinfo_entity_get_property(GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
- OsinfoEntity *entity = OSINFO_ENTITY (object);
+ OsinfoEntity *entity = OSINFO_ENTITY(object);
switch (property_id)
{
case PROP_ID:
- g_value_set_string (value, entity->priv->id);
+ g_value_set_string(value, entity->priv->id);
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
static void
-osinfo_entity_finalize (GObject *object)
+osinfo_entity_finalize(GObject *object)
{
- OsinfoEntity *entity = OSINFO_ENTITY (object);
+ OsinfoEntity *entity = OSINFO_ENTITY(object);
g_free(entity->priv->id);
g_hash_table_destroy(entity->priv->params);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_entity_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_entity_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_entity_class_init (OsinfoEntityClass *klass)
+osinfo_entity_class_init(OsinfoEntityClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
g_klass->set_property = osinfo_entity_set_property;
@@ -131,19 +131,19 @@ osinfo_entity_class_init (OsinfoEntityClass *klass)
* This parameter must be set at time of construction as no
* default value is provided.
*/
- pspec = g_param_spec_string ("id",
+ pspec = g_param_spec_string("id",
"ID",
_("Unique identifier"),
NULL /* default value */,
G_PARAM_CONSTRUCT |
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass,
+ g_object_class_install_property(g_klass,
PROP_ID,
pspec);
g_klass->finalize = osinfo_entity_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoEntityPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoEntityPrivate));
}
static void osinfo_entity_param_value_free(gpointer value, gpointer opaque G_GNUC_UNUSED)
@@ -159,7 +159,7 @@ static void osinfo_entity_param_values_free(gpointer values)
static void
-osinfo_entity_init (OsinfoEntity *entity)
+osinfo_entity_init(OsinfoEntity *entity)
{
entity->priv = OSINFO_ENTITY_GET_PRIVATE(entity);
entity->priv->params = g_hash_table_new_full(g_str_hash,
@@ -212,7 +212,7 @@ void osinfo_entity_set_param_enum(OsinfoEntity *entity, const gchar *key, gint v
GEnumClass *enum_class;
GEnumValue *enum_value;
- g_return_if_fail(G_TYPE_IS_ENUM (enum_type));
+ g_return_if_fail(G_TYPE_IS_ENUM(enum_type));
enum_class = g_type_class_ref(enum_type);
enum_value = g_enum_get_value(enum_class, value);
diff --git a/osinfo/osinfo_filter.c b/osinfo/osinfo_filter.c
index a3d5840..7f06d43 100644
--- a/osinfo/osinfo_filter.c
+++ b/osinfo/osinfo_filter.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoFilter, osinfo_filter, G_TYPE_OBJECT);
+G_DEFINE_TYPE(OsinfoFilter, osinfo_filter, G_TYPE_OBJECT);
-#define OSINFO_FILTER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_FILTER, OsinfoFilterPrivate))
+#define OSINFO_FILTER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_FILTER, OsinfoFilterPrivate))
/**
* SECTION:osinfo_filter
@@ -48,28 +48,28 @@ struct _OsinfoFilterPrivate
};
-static void osinfo_filter_finalize (GObject *object);
+static void osinfo_filter_finalize(GObject *object);
static gboolean osinfo_filter_matches_default(OsinfoFilter *filter, OsinfoEntity *entity);
static void
-osinfo_filter_finalize (GObject *object)
+osinfo_filter_finalize(GObject *object)
{
- OsinfoFilter *filter = OSINFO_FILTER (object);
+ OsinfoFilter *filter = OSINFO_FILTER(object);
g_hash_table_unref(filter->priv->propertyConstraints);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_filter_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_filter_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_filter_class_init (OsinfoFilterClass *klass)
+osinfo_filter_class_init(OsinfoFilterClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_filter_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoFilterPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoFilterPrivate));
klass->matches = osinfo_filter_matches_default;
}
@@ -103,7 +103,7 @@ osinfo_filter_prop_constraints_free(gpointer props)
static void
-osinfo_filter_init (OsinfoFilter *filter)
+osinfo_filter_init(OsinfoFilter *filter)
{
filter->priv = OSINFO_FILTER_GET_PRIVATE(filter);
diff --git a/osinfo/osinfo_install_config.c b/osinfo/osinfo_install_config.c
index 9cdceb0..abe37bd 100644
--- a/osinfo/osinfo_install_config.c
+++ b/osinfo/osinfo_install_config.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,9 +26,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoInstallConfig, osinfo_install_config, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoInstallConfig, osinfo_install_config, OSINFO_TYPE_ENTITY);
-#define OSINFO_INSTALL_CONFIG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_INSTALL_CONFIG, OsinfoInstallConfigPrivate))
+#define OSINFO_INSTALL_CONFIG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_INSTALL_CONFIG, OsinfoInstallConfigPrivate))
/**
* SECTION:osinfo_install_config
@@ -48,9 +48,9 @@ struct _OsinfoInstallConfigPrivate
/* Init functions */
static void
-osinfo_install_config_class_init (OsinfoInstallConfigClass *klass)
+osinfo_install_config_class_init(OsinfoInstallConfigClass *klass)
{
- g_type_class_add_private (klass, sizeof (OsinfoInstallConfigPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoInstallConfigPrivate));
}
static const gchar valid[] = {
@@ -65,7 +65,7 @@ static const gchar valid[] = {
static void
-osinfo_install_config_init (OsinfoInstallConfig *config)
+osinfo_install_config_init(OsinfoInstallConfig *config)
{
gchar pass[9];
gsize i;
@@ -82,7 +82,7 @@ osinfo_install_config_init (OsinfoInstallConfig *config)
OSINFO_INSTALL_CONFIG_PROP_L10N_LANGUAGE,
"en_US");
- for (i = 0 ; i < sizeof(pass)-1 ; i++) {
+ for (i = 0; i < sizeof(pass)-1; i++) {
gint val = g_random_int_range(0, sizeof(valid));
pass[i] = valid[val];
}
diff --git a/osinfo/osinfo_install_config_param.c b/osinfo/osinfo_install_config_param.c
index 401279f..f74a802 100644
--- a/osinfo/osinfo_install_config_param.c
+++ b/osinfo/osinfo_install_config_param.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
* Copyright (C) 2012 Fabiano Fidêncio
*
* This library is free software; you can redistribute it and/or
@@ -28,9 +28,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoInstallConfigParam, osinfo_install_config_param, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoInstallConfigParam, osinfo_install_config_param, OSINFO_TYPE_ENTITY);
-#define OSINFO_INSTALL_CONFIG_PARAM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_INSTALL_CONFIG_PARAM, OsinfoInstallConfigParamPrivate))
+#define OSINFO_INSTALL_CONFIG_PARAM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_INSTALL_CONFIG_PARAM, OsinfoInstallConfigParamPrivate))
/**
* SECTION:osinfo_install_config_param
@@ -64,7 +64,7 @@ osinfo_install_config_param_set_property(GObject *object,
GParamSpec *pspec)
{
OsinfoInstallConfigParam *config_param =
- OSINFO_INSTALL_CONFIG_PARAM (object);
+ OSINFO_INSTALL_CONFIG_PARAM(object);
switch (property_id) {
case PROP_NAME:
@@ -80,7 +80,7 @@ osinfo_install_config_param_set_property(GObject *object,
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
@@ -92,7 +92,7 @@ osinfo_install_config_param_get_property(GObject *object,
GParamSpec *pspec)
{
OsinfoInstallConfigParam *config_param =
- OSINFO_INSTALL_CONFIG_PARAM (object);
+ OSINFO_INSTALL_CONFIG_PARAM(object);
switch (property_id) {
case PROP_NAME:
@@ -116,7 +116,7 @@ osinfo_install_config_param_get_property(GObject *object,
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
@@ -129,14 +129,14 @@ osinfo_install_config_param_finalize(GObject *object)
g_clear_object(&config_param->priv->value_map);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_install_config_param_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_install_config_param_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_install_config_param_class_init (OsinfoInstallConfigParamClass *klass)
+osinfo_install_config_param_class_init(OsinfoInstallConfigParamClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
g_klass->set_property = osinfo_install_config_param_set_property;
@@ -190,11 +190,11 @@ osinfo_install_config_param_class_init (OsinfoInstallConfigParamClass *klass)
pspec);
g_klass->finalize = osinfo_install_config_param_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoInstallConfigParamPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoInstallConfigParamPrivate));
}
static void
-osinfo_install_config_param_init (OsinfoInstallConfigParam *config_param)
+osinfo_install_config_param_init(OsinfoInstallConfigParam *config_param)
{
config_param->priv = OSINFO_INSTALL_CONFIG_PARAM_GET_PRIVATE(config_param);
}
diff --git a/osinfo/osinfo_install_config_paramlist.c b/osinfo/osinfo_install_config_paramlist.c
index df44b58..060cbdb 100644
--- a/osinfo/osinfo_install_config_paramlist.c
+++ b/osinfo/osinfo_install_config_paramlist.c
@@ -1,7 +1,7 @@
/*
* libosinfo: a list of installation configuration parameters
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,9 +28,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoInstallConfigParamList, osinfo_install_config_paramlist, OSINFO_TYPE_LIST);
+G_DEFINE_TYPE(OsinfoInstallConfigParamList, osinfo_install_config_paramlist, OSINFO_TYPE_LIST);
-#define OSINFO_INSTALL_CONFIG_PARAMLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_INSTALL_CONFIG_PARAMLIST, OsinfoInstallConfigParamListPrivate))
+#define OSINFO_INSTALL_CONFIG_PARAMLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_INSTALL_CONFIG_PARAMLIST, OsinfoInstallConfigParamListPrivate))
/**
* SECTION:osinfo_install_config_paramlist
@@ -47,24 +47,24 @@ struct _OsinfoInstallConfigParamListPrivate
};
static void
-osinfo_install_config_paramlist_finalize (GObject *object)
+osinfo_install_config_paramlist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_install_config_paramlist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_install_config_paramlist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_install_config_paramlist_class_init (OsinfoInstallConfigParamListClass *klass)
+osinfo_install_config_paramlist_class_init(OsinfoInstallConfigParamListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_install_config_paramlist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoInstallConfigParamListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoInstallConfigParamListPrivate));
}
static void
-osinfo_install_config_paramlist_init (OsinfoInstallConfigParamList *list)
+osinfo_install_config_paramlist_init(OsinfoInstallConfigParamList *list)
{
list->priv = OSINFO_INSTALL_CONFIG_PARAMLIST_GET_PRIVATE(list);
}
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index b6fe1ab..fca1267 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -32,9 +32,9 @@
#include <glib/gi18n-lib.h>
#include "osinfo_install_script_private.h"
-G_DEFINE_TYPE (OsinfoInstallScript, osinfo_install_script, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoInstallScript, osinfo_install_script, OSINFO_TYPE_ENTITY);
-#define OSINFO_INSTALL_SCRIPT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_INSTALL_SCRIPT, OsinfoInstallScriptPrivate))
+#define OSINFO_INSTALL_SCRIPT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_INSTALL_SCRIPT, OsinfoInstallScriptPrivate))
/**
* SECTION:osinfo_install_script
@@ -107,7 +107,7 @@ osinfo_install_script_set_property(GObject *object,
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
@@ -153,16 +153,16 @@ osinfo_install_script_get_property(GObject *object,
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
static void
-osinfo_install_script_finalize (GObject *object)
+osinfo_install_script_finalize(GObject *object)
{
- OsinfoInstallScript *script = OSINFO_INSTALL_SCRIPT (object);
+ OsinfoInstallScript *script = OSINFO_INSTALL_SCRIPT(object);
g_free(script->priv->output_prefix);
g_free(script->priv->output_filename);
@@ -173,14 +173,14 @@ osinfo_install_script_finalize (GObject *object)
g_object_unref(script->priv->avatar);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_install_script_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_install_script_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_install_script_class_init (OsinfoInstallScriptClass *klass)
+osinfo_install_script_class_init(OsinfoInstallScriptClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
g_klass->get_property = osinfo_install_script_get_property;
@@ -254,7 +254,7 @@ osinfo_install_script_class_init (OsinfoInstallScriptClass *klass)
PROP_AVATAR_FORMAT,
pspec);
- g_type_class_add_private (klass, sizeof (OsinfoInstallScriptPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoInstallScriptPrivate));
}
void osinfo_install_script_add_config_param(OsinfoInstallScript *script, OsinfoInstallConfigParam *param)
@@ -335,7 +335,7 @@ osinfo_install_script_get_config_param(const OsinfoInstallScript *script,
}
static void
-osinfo_install_script_init (OsinfoInstallScript *list)
+osinfo_install_script_init(OsinfoInstallScript *list)
{
list->priv = OSINFO_INSTALL_SCRIPT_GET_PRIVATE(list);
list->priv->config_params = osinfo_install_config_paramlist_new();
@@ -1077,14 +1077,14 @@ static void osinfo_install_script_generate_output_write_file(GObject *src,
OsinfoInstallScriptGenerateOutputData *data = user_data;
if (data->stream == NULL)
- data->stream = g_file_replace_finish(G_FILE (src), res, &data->error);
+ data->stream = g_file_replace_finish(G_FILE(src), res, &data->error);
else
data->output_pos += g_output_stream_write_finish(G_OUTPUT_STREAM(data->stream),
res,
&data->error);
if (data->output_pos < data->output_len) {
- g_output_stream_write_async(G_OUTPUT_STREAM (data->stream),
+ g_output_stream_write_async(G_OUTPUT_STREAM(data->stream),
data->output + data->output_pos,
data->output_len - data->output_pos,
G_PRIORITY_DEFAULT,
@@ -1093,7 +1093,7 @@ static void osinfo_install_script_generate_output_write_file(GObject *src,
data);
} else {
- g_output_stream_close_async(G_OUTPUT_STREAM (data->stream),
+ g_output_stream_close_async(G_OUTPUT_STREAM(data->stream),
G_PRIORITY_DEFAULT,
data->cancellable,
osinfo_install_script_generate_output_close_file,
diff --git a/osinfo/osinfo_install_scriptlist.c b/osinfo/osinfo_install_scriptlist.c
index c870ddf..3146619 100644
--- a/osinfo/osinfo_install_scriptlist.c
+++ b/osinfo/osinfo_install_scriptlist.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoInstallScriptList, osinfo_install_scriptlist, OSINFO_TYPE_LIST);
+G_DEFINE_TYPE(OsinfoInstallScriptList, osinfo_install_scriptlist, OSINFO_TYPE_LIST);
-#define OSINFO_INSTALL_SCRIPTLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_INSTALL_SCRIPTLIST, OsinfoInstallScriptListPrivate))
+#define OSINFO_INSTALL_SCRIPTLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_INSTALL_SCRIPTLIST, OsinfoInstallScriptListPrivate))
/**
* SECTION:osinfo_install_scriptlist
@@ -46,24 +46,24 @@ struct _OsinfoInstallScriptListPrivate
};
static void
-osinfo_install_scriptlist_finalize (GObject *object)
+osinfo_install_scriptlist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_install_scriptlist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_install_scriptlist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_install_scriptlist_class_init (OsinfoInstallScriptListClass *klass)
+osinfo_install_scriptlist_class_init(OsinfoInstallScriptListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_install_scriptlist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoInstallScriptListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoInstallScriptListPrivate));
}
static void
-osinfo_install_scriptlist_init (OsinfoInstallScriptList *list)
+osinfo_install_scriptlist_init(OsinfoInstallScriptList *list)
{
list->priv = OSINFO_INSTALL_SCRIPTLIST_GET_PRIVATE(list);
}
diff --git a/osinfo/osinfo_list.c b/osinfo/osinfo_list.c
index c3fe92f..6e32387 100644
--- a/osinfo/osinfo_list.c
+++ b/osinfo/osinfo_list.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,9 +28,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_ABSTRACT_TYPE (OsinfoList, osinfo_list, G_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE(OsinfoList, osinfo_list, G_TYPE_OBJECT);
-#define OSINFO_LIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_LIST, OsinfoListPrivate))
+#define OSINFO_LIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_LIST, OsinfoListPrivate))
/**
* SECTION:osinfo_list
@@ -71,7 +71,7 @@ osinfo_list_set_property(GObject *object,
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
@@ -91,29 +91,29 @@ osinfo_list_get_property(GObject *object,
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
static void
-osinfo_list_finalize (GObject *object)
+osinfo_list_finalize(GObject *object)
{
- OsinfoList *list = OSINFO_LIST (object);
+ OsinfoList *list = OSINFO_LIST(object);
g_ptr_array_free(list->priv->array, TRUE);
g_hash_table_unref(list->priv->entities);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_list_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_list_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_list_class_init (OsinfoListClass *klass)
+osinfo_list_class_init(OsinfoListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
g_klass->set_property = osinfo_list_set_property;
@@ -139,11 +139,11 @@ osinfo_list_class_init (OsinfoListClass *klass)
PROP_ELEMENT_TYPE,
pspec);
- g_type_class_add_private (klass, sizeof (OsinfoListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoListPrivate));
}
static void
-osinfo_list_init (OsinfoList *list)
+osinfo_list_init(OsinfoList *list)
{
list->priv = OSINFO_LIST_GET_PRIVATE(list);
list->priv->array = g_ptr_array_new_with_free_func(NULL);
diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
index 685352b..3f0ca54 100644
--- a/osinfo/osinfo_loader.c
+++ b/osinfo/osinfo_loader.c
@@ -38,9 +38,9 @@
#include "osinfo_install_script_private.h"
#include "osinfo_device_driver_private.h"
-G_DEFINE_TYPE (OsinfoLoader, osinfo_loader, G_TYPE_OBJECT);
+G_DEFINE_TYPE(OsinfoLoader, osinfo_loader, G_TYPE_OBJECT);
-#define OSINFO_LOADER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_LOADER, OsinfoLoaderPrivate))
+#define OSINFO_LOADER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_LOADER, OsinfoLoaderPrivate))
/**
* SECTION:osinfo_loader
@@ -65,32 +65,32 @@ struct _OsinfoEntityKey
typedef struct _OsinfoEntityKey OsinfoEntityKey;
static void
-osinfo_loader_finalize (GObject *object)
+osinfo_loader_finalize(GObject *object)
{
- OsinfoLoader *loader = OSINFO_LOADER (object);
+ OsinfoLoader *loader = OSINFO_LOADER(object);
g_object_unref(loader->priv->db);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_loader_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_loader_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_loader_class_init (OsinfoLoaderClass *klass)
+osinfo_loader_class_init(OsinfoLoaderClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
g_klass->finalize = osinfo_loader_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoLoaderPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoLoaderPrivate));
}
static void
-osinfo_loader_init (OsinfoLoader *loader)
+osinfo_loader_init(OsinfoLoader *loader)
{
loader->priv = OSINFO_LOADER_GET_PRIVATE(loader);
loader->priv->db = osinfo_db_new();
@@ -205,7 +205,7 @@ osinfo_loader_boolean(const char *xpath,
if (count < 0) {
return FALSE;
}
- for (i = 0 ; i < count ; i++) {
+ for (i = 0; i < count; i++) {
xmlNodePtr node = nodes[i];
if (!node->children) {
@@ -275,10 +275,10 @@ static void osinfo_loader_entity(OsinfoLoader *loader,
GError **err)
{
int i = 0;
- const gchar * const *langs = g_get_language_names ();
+ const gchar * const *langs = g_get_language_names();
/* Standard well-known keys first, allow single value only */
- for (i = 0 ; keys != NULL && keys[i].name != NULL; i++) {
+ for (i = 0; keys != NULL && keys[i].name != NULL; i++) {
gchar *value_str = NULL;
gboolean value_bool = FALSE;
gchar *xpath = NULL;
@@ -343,7 +343,7 @@ static void osinfo_loader_entity(OsinfoLoader *loader,
if (error_is_set(err))
return;
- for (i = 0 ; i < ncustom ; i++) {
+ for (i = 0; i < ncustom; i++) {
xmlNodePtr param = custom[i];
if (!param->children ||
@@ -462,7 +462,7 @@ static void osinfo_loader_device_link(OsinfoLoader *loader,
if (error_is_set(err))
return;
- for (i = 0 ; i < nrelated ; i++) {
+ for (i = 0; i < nrelated; i++) {
const OsinfoEntityKey keys[] = {
{ OSINFO_DEVICELINK_PROP_DRIVER, G_TYPE_STRING },
{ NULL, G_TYPE_INVALID }
@@ -510,7 +510,7 @@ static void osinfo_loader_product_relshp(OsinfoLoader *loader,
if (error_is_set(err))
return;
- for (i = 0 ; i < nrelated ; i++) {
+ for (i = 0; i < nrelated; i++) {
gchar *id = (gchar *)xmlGetProp(related[i], BAD_CAST "id");
if (!id) {
OSINFO_ERROR(err, _("Missing product upgrades id property"));
@@ -676,7 +676,7 @@ static void osinfo_loader_datamap(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
gchar *inval = (gchar *)xmlGetProp(nodes[i], BAD_CAST "inval");
gchar *outval;
@@ -707,7 +707,7 @@ static void osinfo_loader_install_config_params(OsinfoLoader *loader,
if (error_is_set(err))
return;
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
gchar *name = (gchar *)xmlGetProp(nodes[i], BAD_CAST OSINFO_INSTALL_CONFIG_PARAM_PROP_NAME);
gchar *policy = (gchar *)xmlGetProp(nodes[i], BAD_CAST OSINFO_INSTALL_CONFIG_PARAM_PROP_POLICY);
gchar *mapid = (gchar *)xmlGetProp(nodes[i], BAD_CAST OSINFO_INSTALL_CONFIG_PARAM_PROP_DATAMAP);
@@ -750,7 +750,7 @@ static OsinfoAvatarFormat *osinfo_loader_avatar_format(OsinfoLoader *loader,
osinfo_loader_entity(loader, OSINFO_ENTITY(avatar_format), keys, ctxt, root, err);
if (error_is_set(err)) {
- g_object_unref (avatar_format);
+ g_object_unref(avatar_format);
return NULL;
}
@@ -842,7 +842,7 @@ static void osinfo_loader_install_script(OsinfoLoader *loader,
goto error;
flags_class = g_type_class_ref(OSINFO_TYPE_INSTALL_SCRIPT_INJECTION_METHOD);
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
const gchar *nick = (const gchar *) nodes[i]->children->content;
injection_methods |= g_flags_get_value_by_nick(flags_class, nick)->value;
}
@@ -864,7 +864,7 @@ static void osinfo_loader_install_script(OsinfoLoader *loader,
g_object_unref(installScript);
}
-static OsinfoMedia *osinfo_loader_media (OsinfoLoader *loader,
+static OsinfoMedia *osinfo_loader_media(OsinfoLoader *loader,
xmlXPathContextPtr ctxt,
xmlNodePtr root,
const gchar *id,
@@ -916,7 +916,7 @@ static OsinfoMedia *osinfo_loader_media (OsinfoLoader *loader,
return NULL;
}
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
gchar *variant_id = (gchar *)xmlGetProp(nodes[i], BAD_CAST "id");
osinfo_entity_add_param(OSINFO_ENTITY(media),
OSINFO_MEDIA_PROP_VARIANT,
@@ -931,7 +931,7 @@ static OsinfoMedia *osinfo_loader_media (OsinfoLoader *loader,
return NULL;
}
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
if (!nodes[i]->children ||
nodes[i]->children->type != XML_TEXT_NODE ||
(strcmp((const gchar *)nodes[i]->name,
@@ -978,7 +978,7 @@ static OsinfoMedia *osinfo_loader_media (OsinfoLoader *loader,
return media;
}
-static OsinfoTree *osinfo_loader_tree (OsinfoLoader *loader,
+static OsinfoTree *osinfo_loader_tree(OsinfoLoader *loader,
xmlXPathContextPtr ctxt,
xmlNodePtr root,
const gchar *id,
@@ -1007,7 +1007,7 @@ static OsinfoTree *osinfo_loader_tree (OsinfoLoader *loader,
return NULL;
}
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
if (!nodes[i]->children ||
nodes[i]->children->type != XML_TEXT_NODE)
continue;
@@ -1039,10 +1039,10 @@ static OsinfoTree *osinfo_loader_tree (OsinfoLoader *loader,
return tree;
}
-static OsinfoOsVariant *osinfo_loader_os_variant (OsinfoLoader *loader,
- xmlXPathContextPtr ctxt,
- xmlNodePtr root,
- GError **err)
+static OsinfoOsVariant *osinfo_loader_os_variant(OsinfoLoader *loader,
+ xmlXPathContextPtr ctxt,
+ xmlNodePtr root,
+ GError **err)
{
const OsinfoEntityKey keys[] = {
{ OSINFO_OS_VARIANT_PROP_NAME, G_TYPE_STRING },
@@ -1078,7 +1078,7 @@ static OsinfoResources *osinfo_loader_resources(OsinfoLoader *loader,
resources = osinfo_resources_new(id, arch);
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
if (!nodes[i]->children ||
nodes[i]->children->type != XML_TEXT_NODE ||
(strcmp((const gchar *)nodes[i]->name,
@@ -1181,7 +1181,7 @@ static OsinfoDeviceDriver *osinfo_loader_driver(OsinfoLoader *loader,
return NULL;
}
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
if (nodes[i]->children &&
nodes[i]->children->type == XML_TEXT_NODE &&
(strcmp((const gchar *)nodes[i]->name,
@@ -1247,18 +1247,18 @@ static void osinfo_loader_os(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
xmlNodePtr saved = ctxt->node;
ctxt->node = nodes[i];
- gchar *media_id = g_strdup_printf ("%s:%u", id, i);
+ gchar *media_id = g_strdup_printf("%s:%u", id, i);
OsinfoMedia *media = osinfo_loader_media(loader, ctxt, nodes[i], media_id, err);
- g_free (media_id);
+ g_free(media_id);
ctxt->node = saved;
if (error_is_set(err))
goto cleanup;
- osinfo_os_add_media (os, media);
- g_object_unref (media);
+ osinfo_os_add_media(os, media);
+ g_object_unref(media);
}
g_free(nodes);
@@ -1267,17 +1267,17 @@ static void osinfo_loader_os(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
xmlNodePtr saved = ctxt->node;
ctxt->node = nodes[i];
- gchar *tree_id = g_strdup_printf ("%s:%u", id, i);
+ gchar *tree_id = g_strdup_printf("%s:%u", id, i);
OsinfoTree *tree = osinfo_loader_tree(loader, ctxt, nodes[i], tree_id, err);
- g_free (tree_id);
+ g_free(tree_id);
ctxt->node = saved;
if (error_is_set(err))
goto cleanup;
- osinfo_os_add_tree (os, tree);
+ osinfo_os_add_tree(os, tree);
g_object_unref(G_OBJECT(tree));
}
@@ -1287,7 +1287,7 @@ static void osinfo_loader_os(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
xmlNodePtr saved = ctxt->node;
ctxt->node = nodes[i];
OsinfoOsVariant *variant = osinfo_loader_os_variant(loader,
@@ -1298,7 +1298,7 @@ static void osinfo_loader_os(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- osinfo_os_add_variant (os, variant);
+ osinfo_os_add_variant(os, variant);
g_object_unref(G_OBJECT(variant));
}
@@ -1308,10 +1308,10 @@ static void osinfo_loader_os(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
xmlNodePtr saved = ctxt->node;
ctxt->node = nodes[i];
- gchar *resources_id = g_strdup_printf ("%s:%u", id, i);
+ gchar *resources_id = g_strdup_printf("%s:%u", id, i);
osinfo_loader_resources_list(loader,
ctxt,
@@ -1319,7 +1319,7 @@ static void osinfo_loader_os(OsinfoLoader *loader,
resources_id,
os,
err);
- g_free (resources_id);
+ g_free(resources_id);
ctxt->node = saved;
}
@@ -1330,7 +1330,7 @@ static void osinfo_loader_os(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
gchar *scriptid = (gchar *)xmlGetProp(nodes[i], BAD_CAST "id");
if (!scriptid) {
OSINFO_ERROR(err, _("Missing OS install script property"));
@@ -1349,7 +1349,7 @@ static void osinfo_loader_os(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < nnodes ; i++) {
+ for (i = 0; i < nnodes; i++) {
xmlNodePtr saved = ctxt->node;
ctxt->node = nodes[i];
gchar *driver_id = g_strdup_printf("%s:%u", id, i);
@@ -1358,7 +1358,7 @@ static void osinfo_loader_os(OsinfoLoader *loader,
nodes[i],
driver_id,
err);
- g_free (driver_id);
+ g_free(driver_id);
ctxt->node = saved;
if (error_is_set(err))
break;
@@ -1416,7 +1416,7 @@ static void osinfo_loader_root(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < ndevice ; i++) {
+ for (i = 0; i < ndevice; i++) {
xmlNodePtr saved = ctxt->node;
ctxt->node = devices[i];
osinfo_loader_device(loader, ctxt, devices[i], err);
@@ -1429,7 +1429,7 @@ static void osinfo_loader_root(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < nplatform ; i++) {
+ for (i = 0; i < nplatform; i++) {
xmlNodePtr saved = ctxt->node;
ctxt->node = platforms[i];
osinfo_loader_platform(loader, ctxt, platforms[i], err);
@@ -1442,7 +1442,7 @@ static void osinfo_loader_root(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < nos ; i++) {
+ for (i = 0; i < nos; i++) {
xmlNodePtr saved = ctxt->node;
ctxt->node = oss[i];
osinfo_loader_os(loader, ctxt, oss[i], err);
@@ -1455,7 +1455,7 @@ static void osinfo_loader_root(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < ndeployment ; i++) {
+ for (i = 0; i < ndeployment; i++) {
xmlNodePtr saved = ctxt->node;
ctxt->node = deployments[i];
osinfo_loader_deployment(loader, ctxt, deployments[i], err);
@@ -1468,7 +1468,7 @@ static void osinfo_loader_root(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < ninstallScript ; i++) {
+ for (i = 0; i < ninstallScript; i++) {
xmlNodePtr saved = ctxt->node;
ctxt->node = installScripts[i];
osinfo_loader_install_script(loader, ctxt, installScripts[i], err);
@@ -1481,7 +1481,7 @@ static void osinfo_loader_root(OsinfoLoader *loader,
if (error_is_set(err))
goto cleanup;
- for (i = 0 ; i < ndataMaps ; i++) {
+ for (i = 0; i < ndataMaps; i++) {
xmlNodePtr saved = ctxt->node;
ctxt->node = dataMaps[i];
osinfo_loader_datamap(loader, ctxt, dataMaps[i], err);
diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
index 09555ea..96f9603 100644
--- a/osinfo/osinfo_media.c
+++ b/osinfo/osinfo_media.c
@@ -1,7 +1,7 @@
/*
* libosinfo: An installation media for a (guest) OS
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -109,22 +109,22 @@ static void create_from_location_data_free(CreateFromLocationData *data)
}
GQuark
-osinfo_media_error_quark (void)
+osinfo_media_error_quark(void)
{
static GQuark quark = 0;
if (!quark)
- quark = g_quark_from_static_string ("osinfo-media-error");
+ quark = g_quark_from_static_string("osinfo-media-error");
return quark;
}
-G_DEFINE_TYPE (OsinfoMedia, osinfo_media, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoMedia, osinfo_media, OSINFO_TYPE_ENTITY);
#define OSINFO_MEDIA_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- OSINFO_TYPE_MEDIA, \
- OsinfoMediaPrivate))
+ (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
+ OSINFO_TYPE_MEDIA, \
+ OsinfoMediaPrivate))
/**
* SECTION:osinfo_media
@@ -159,80 +159,80 @@ enum {
};
static void
-osinfo_media_get_property (GObject *object,
+osinfo_media_get_property(GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
- OsinfoMedia *media = OSINFO_MEDIA (object);
+ OsinfoMedia *media = OSINFO_MEDIA(object);
switch (property_id) {
case PROP_ARCHITECTURE:
- g_value_set_string (value,
- osinfo_media_get_architecture (media));
+ g_value_set_string(value,
+ osinfo_media_get_architecture(media));
break;
case PROP_URL:
- g_value_set_string (value,
- osinfo_media_get_url (media));
+ g_value_set_string(value,
+ osinfo_media_get_url(media));
break;
case PROP_VOLUME_ID:
- g_value_set_string (value,
- osinfo_media_get_volume_id (media));
+ g_value_set_string(value,
+ osinfo_media_get_volume_id(media));
break;
case PROP_PUBLISHER_ID:
- g_value_set_string (value,
- osinfo_media_get_publisher_id (media));
+ g_value_set_string(value,
+ osinfo_media_get_publisher_id(media));
break;
case PROP_APPLICATION_ID:
- g_value_set_string (value,
- osinfo_media_get_application_id (media));
+ g_value_set_string(value,
+ osinfo_media_get_application_id(media));
break;
case PROP_SYSTEM_ID:
- g_value_set_string (value,
- osinfo_media_get_system_id (media));
+ g_value_set_string(value,
+ osinfo_media_get_system_id(media));
break;
case PROP_KERNEL_PATH:
- g_value_set_string (value,
- osinfo_media_get_kernel_path (media));
+ g_value_set_string(value,
+ osinfo_media_get_kernel_path(media));
break;
case PROP_INITRD_PATH:
- g_value_set_string (value,
- osinfo_media_get_initrd_path (media));
+ g_value_set_string(value,
+ osinfo_media_get_initrd_path(media));
break;
case PROP_INSTALLER:
- g_value_set_boolean (value,
- osinfo_media_get_installer (media));
+ g_value_set_boolean(value,
+ osinfo_media_get_installer(media));
break;
case PROP_LIVE:
- g_value_set_boolean (value,
- osinfo_media_get_live (media));
+ g_value_set_boolean(value,
+ osinfo_media_get_live(media));
break;
case PROP_INSTALLER_REBOOTS:
- g_value_set_int (value,
- osinfo_media_get_installer_reboots (media));
+ g_value_set_int(value,
+ osinfo_media_get_installer_reboots(media));
break;
case PROP_OS:
- g_value_take_object (value, osinfo_media_get_os (media));
+ g_value_take_object(value, osinfo_media_get_os(media));
break;
case PROP_LANGUAGES:
- g_value_set_pointer (value, osinfo_media_get_languages (media));
+ g_value_set_pointer(value, osinfo_media_get_languages(media));
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
@@ -243,73 +243,73 @@ osinfo_media_set_property(GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- OsinfoMedia *media = OSINFO_MEDIA (object);
+ OsinfoMedia *media = OSINFO_MEDIA(object);
switch (property_id) {
case PROP_ARCHITECTURE:
- osinfo_entity_set_param (OSINFO_ENTITY(media),
- OSINFO_MEDIA_PROP_ARCHITECTURE,
- g_value_get_string (value));
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_ARCHITECTURE,
+ g_value_get_string(value));
break;
case PROP_URL:
- osinfo_entity_set_param (OSINFO_ENTITY(media),
- OSINFO_MEDIA_PROP_URL,
- g_value_get_string (value));
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_URL,
+ g_value_get_string(value));
break;
case PROP_VOLUME_ID:
- osinfo_entity_set_param (OSINFO_ENTITY(media),
- OSINFO_MEDIA_PROP_VOLUME_ID,
- g_value_get_string (value));
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_VOLUME_ID,
+ g_value_get_string(value));
break;
case PROP_PUBLISHER_ID:
- osinfo_entity_set_param (OSINFO_ENTITY(media),
- OSINFO_MEDIA_PROP_PUBLISHER_ID,
- g_value_get_string (value));
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_PUBLISHER_ID,
+ g_value_get_string(value));
break;
case PROP_APPLICATION_ID:
- osinfo_entity_set_param (OSINFO_ENTITY(media),
- OSINFO_MEDIA_PROP_APPLICATION_ID,
- g_value_get_string (value));
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_APPLICATION_ID,
+ g_value_get_string(value));
break;
case PROP_SYSTEM_ID:
- osinfo_entity_set_param (OSINFO_ENTITY(media),
- OSINFO_MEDIA_PROP_SYSTEM_ID,
- g_value_get_string (value));
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_SYSTEM_ID,
+ g_value_get_string(value));
break;
case PROP_KERNEL_PATH:
- osinfo_entity_set_param (OSINFO_ENTITY(media),
- OSINFO_MEDIA_PROP_KERNEL,
- g_value_get_string (value));
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_KERNEL,
+ g_value_get_string(value));
break;
case PROP_INITRD_PATH:
- osinfo_entity_set_param (OSINFO_ENTITY(media),
- OSINFO_MEDIA_PROP_INITRD,
- g_value_get_string (value));
+ osinfo_entity_set_param(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_INITRD,
+ g_value_get_string(value));
break;
case PROP_LIVE:
- osinfo_entity_set_param_boolean (OSINFO_ENTITY(media),
- OSINFO_MEDIA_PROP_LIVE,
- g_value_get_boolean (value));
+ osinfo_entity_set_param_boolean(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_LIVE,
+ g_value_get_boolean(value));
break;
case PROP_INSTALLER:
- osinfo_entity_set_param_boolean (OSINFO_ENTITY(media),
- OSINFO_MEDIA_PROP_INSTALLER,
- g_value_get_boolean (value));
+ osinfo_entity_set_param_boolean(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_INSTALLER,
+ g_value_get_boolean(value));
break;
case PROP_INSTALLER_REBOOTS:
- osinfo_entity_set_param_int64 (OSINFO_ENTITY(media),
- OSINFO_MEDIA_PROP_INSTALLER_REBOOTS,
- g_value_get_int (value));
+ osinfo_entity_set_param_int64(OSINFO_ENTITY(media),
+ OSINFO_MEDIA_PROP_INSTALLER_REBOOTS,
+ g_value_get_int(value));
break;
case PROP_OS:
@@ -322,16 +322,16 @@ osinfo_media_set_property(GObject *object,
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
static void
-osinfo_media_finalize (GObject *object)
+osinfo_media_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_media_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_media_parent_class)->finalize(object);
}
static void osinfo_media_dispose(GObject *obj)
@@ -346,146 +346,146 @@ static void osinfo_media_dispose(GObject *obj)
/* Init functions */
static void
-osinfo_media_class_init (OsinfoMediaClass *klass)
+osinfo_media_class_init(OsinfoMediaClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
g_klass->dispose = osinfo_media_dispose;
g_klass->finalize = osinfo_media_finalize;
g_klass->get_property = osinfo_media_get_property;
g_klass->set_property = osinfo_media_set_property;
- g_type_class_add_private (klass, sizeof (OsinfoMediaPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoMediaPrivate));
/**
* OsinfoMedia:architecture:
*
* The target hardware architecture of this media.
*/
- pspec = g_param_spec_string ("architecture",
- "ARCHITECTURE",
- _("CPU Architecture"),
- NULL /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_ARCHITECTURE, pspec);
+ pspec = g_param_spec_string("architecture",
+ "ARCHITECTURE",
+ _("CPU Architecture"),
+ NULL /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_ARCHITECTURE, pspec);
/**
* OsinfoMedia:url:
*
* The URL to this media.
*/
- pspec = g_param_spec_string ("url",
- "URL",
- _("The URL to this media"),
- NULL /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_URL, pspec);
+ pspec = g_param_spec_string("url",
+ "URL",
+ _("The URL to this media"),
+ NULL /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_URL, pspec);
/**
* OsinfoMedia:volume-id:
*
* Expected volume ID (regular expression) for ISO9660 image/device.
*/
- pspec = g_param_spec_string ("volume-id",
- "VolumeID",
- _("The expected ISO9660 volume ID"),
- NULL /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_VOLUME_ID, pspec);
+ pspec = g_param_spec_string("volume-id",
+ "VolumeID",
+ _("The expected ISO9660 volume ID"),
+ NULL /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_VOLUME_ID, pspec);
/**
* OsinfoMedia:publisher-id:
*
* Expected publisher ID (regular expression) for ISO9660 image/device.
*/
- pspec = g_param_spec_string ("publisher-id",
- "PublisherID",
- _("The expected ISO9660 publisher ID"),
- NULL /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_PUBLISHER_ID, pspec);
+ pspec = g_param_spec_string("publisher-id",
+ "PublisherID",
+ _("The expected ISO9660 publisher ID"),
+ NULL /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_PUBLISHER_ID, pspec);
/**
* OsinfoMedia:application-id:
*
* Expected application ID (regular expression) for ISO9660 image/device.
*/
- pspec = g_param_spec_string ("application-id",
- "ApplicationID",
- _("The expected ISO9660 application ID"),
- NULL /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_APPLICATION_ID, pspec);
+ pspec = g_param_spec_string("application-id",
+ "ApplicationID",
+ _("The expected ISO9660 application ID"),
+ NULL /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_APPLICATION_ID, pspec);
/**
* OsinfoMedia:system-id:
*
* Expected system ID (regular expression) for ISO9660 image/device.
*/
- pspec = g_param_spec_string ("system-id",
- "SystemID",
- _("The expected ISO9660 system ID"),
- NULL /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_SYSTEM_ID, pspec);
+ pspec = g_param_spec_string("system-id",
+ "SystemID",
+ _("The expected ISO9660 system ID"),
+ NULL /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_SYSTEM_ID, pspec);
/**
* OsinfoMedia:kernel-path:
*
* The path to the kernel image in the install tree.
*/
- pspec = g_param_spec_string ("kernel-path",
- "KernelPath",
- _("The path to the kernel image"),
- NULL /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_KERNEL_PATH, pspec);
+ pspec = g_param_spec_string("kernel-path",
+ "KernelPath",
+ _("The path to the kernel image"),
+ NULL /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_KERNEL_PATH, pspec);
/**
* OsinfoMedia:initrd-path:
*
* The path to the initrd image in the install tree.
*/
- pspec = g_param_spec_string ("initrd-path",
- "InitrdPath",
- _("The path to the initrd image"),
- NULL /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_INITRD_PATH, pspec);
+ pspec = g_param_spec_string("initrd-path",
+ "InitrdPath",
+ _("The path to the initrd image"),
+ NULL /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_INITRD_PATH, pspec);
/**
* OsinfoMedia:installer:
*
* Whether media provides an installer for an OS.
*/
- pspec = g_param_spec_boolean ("installer",
- "Installer",
- _("Media provides an installer"),
- TRUE /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_INSTALLER, pspec);
+ pspec = g_param_spec_boolean("installer",
+ "Installer",
+ _("Media provides an installer"),
+ TRUE /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_INSTALLER, pspec);
/**
* OsinfoMedia:live:
*
* Whether media can boot directly an OS without any installations.
*/
- pspec = g_param_spec_boolean ("live",
- "Live",
- _("Media can boot directly w/o installation"),
- FALSE /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_LIVE, pspec);
+ pspec = g_param_spec_boolean("live",
+ "Live",
+ _("Media can boot directly w/o installation"),
+ FALSE /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_LIVE, pspec);
/**
* OsinfoMedia:installer-reboots:
@@ -494,22 +494,22 @@ osinfo_media_class_init (OsinfoMediaClass *klass)
* the installer takes before installation is complete.
*
* This property is not applicable to media that has no installer. You can
- * use #osinfo_media_get_installer (or OsinfoMedia::installer) to check
+ * use #osinfo_media_get_installer(or OsinfoMedia::installer) to check
* that.
*
* Warning: Some media allow you to install from live sessions, in which
* case number of reboots *alone* is not a reliable method for tracking
* installation.
*/
- pspec = g_param_spec_int ("installer-reboots",
- "InstallerReboots",
- _("Number of installer reboots"),
- G_MININT,
- G_MAXINT,
- 1 /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_INSTALLER_REBOOTS, pspec);
+ pspec = g_param_spec_int("installer-reboots",
+ "InstallerReboots",
+ _("Number of installer reboots"),
+ G_MININT,
+ G_MAXINT,
+ 1 /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_INSTALLER_REBOOTS, pspec);
/**
* OsinfoMedia:os:
@@ -519,13 +519,13 @@ osinfo_media_class_init (OsinfoMediaClass *klass)
* the property will be filled after a successful call to
* osinfo_db_identify_media().
*/
- pspec = g_param_spec_object ("os",
- "Os",
- _("Information about the operating system on this media"),
- OSINFO_TYPE_OS,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_OS, pspec);
+ pspec = g_param_spec_object("os",
+ "Os",
+ _("Information about the operating system on this media"),
+ OSINFO_TYPE_OS,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_OS, pspec);
/**
* OsinfoMedia:languages:
@@ -535,22 +535,22 @@ osinfo_media_class_init (OsinfoMediaClass *klass)
*
* On media that are not installers, this property will indicate the
* languages that the user interface can be displayed in.
- * Use #osinfo_media_get_installer (or OsinfoMedia::installer) to know
+ * Use #osinfo_media_get_installer(or OsinfoMedia::installer) to know
* if the media is an installer or not.
*
* Type: GLib.List(utf8)
* Transfer: container
*/
- pspec = g_param_spec_pointer ("languages",
- "Languages",
- _("Supported languages"),
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_LANGUAGES, pspec);
+ pspec = g_param_spec_pointer("languages",
+ "Languages",
+ _("Supported languages"),
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_LANGUAGES, pspec);
}
static void
-osinfo_media_init (OsinfoMedia *media)
+osinfo_media_init(OsinfoMedia *media)
{
media->priv = OSINFO_MEDIA_GET_PRIVATE(media);
g_weak_ref_init(&media->priv->os, NULL);
@@ -572,7 +572,7 @@ OsinfoMedia *osinfo_media_new(const gchar *id,
return media;
}
-static void on_media_create_from_location_ready (GObject *source_object,
+static void on_media_create_from_location_ready(GObject *source_object,
GAsyncResult *res,
gpointer user_data)
{
@@ -604,7 +604,7 @@ OsinfoMedia *osinfo_media_create_from_location(const gchar *location,
OsinfoMedia *ret;
data = g_slice_new0(CreateFromLocationData);
- data->main_loop = g_main_loop_new (g_main_context_get_thread_default (),
+ data->main_loop = g_main_loop_new(g_main_context_get_thread_default(),
TRUE);
osinfo_media_create_from_location_async(location,
@@ -614,8 +614,8 @@ OsinfoMedia *osinfo_media_create_from_location(const gchar *location,
data);
/* Loop till we get a reply (or time out) */
- if (g_main_loop_is_running (data->main_loop))
- g_main_loop_run (data->main_loop);
+ if (g_main_loop_is_running(data->main_loop))
+ g_main_loop_run(data->main_loop);
ret = osinfo_media_create_from_location_finish(data->res, error);
create_from_location_data_free(data);
@@ -630,8 +630,8 @@ static gboolean is_str_empty(const gchar *str) {
if ((str == NULL) || (*str == 0))
return TRUE;
- for (i = 0; i < strlen (str); i++)
- if (!g_ascii_isspace (str[i])) {
+ for (i = 0; i < strlen(str); i++)
+ if (!g_ascii_isspace(str[i])) {
ret = FALSE;
break;
@@ -640,7 +640,7 @@ static gboolean is_str_empty(const gchar *str) {
return ret;
}
-static void on_svd_read (GObject *source,
+static void on_svd_read(GObject *source,
GAsyncResult *res,
gpointer user_data)
{
@@ -701,19 +701,19 @@ static void on_svd_read (GObject *source,
OSINFO_MEDIA_PROP_URL,
uri);
g_free(uri);
- if (!is_str_empty (data->pvd.volume))
+ if (!is_str_empty(data->pvd.volume))
osinfo_entity_set_param(OSINFO_ENTITY(media),
OSINFO_MEDIA_PROP_VOLUME_ID,
data->pvd.volume);
- if (!is_str_empty (data->pvd.system))
+ if (!is_str_empty(data->pvd.system))
osinfo_entity_set_param(OSINFO_ENTITY(media),
OSINFO_MEDIA_PROP_SYSTEM_ID,
data->pvd.system);
- if (!is_str_empty (data->pvd.publisher))
+ if (!is_str_empty(data->pvd.publisher))
osinfo_entity_set_param(OSINFO_ENTITY(media),
OSINFO_MEDIA_PROP_PUBLISHER_ID,
data->pvd.publisher);
- if (!is_str_empty (data->pvd.application))
+ if (!is_str_empty(data->pvd.application))
osinfo_entity_set_param(OSINFO_ENTITY(media),
OSINFO_MEDIA_PROP_APPLICATION_ID,
data->pvd.application);
@@ -723,13 +723,13 @@ EXIT:
g_simple_async_result_take_error(data->res, error);
else
g_simple_async_result_set_op_res_gpointer(data->res, media, NULL);
- g_simple_async_result_complete (data->res);
+ g_simple_async_result_complete(data->res);
g_object_unref(stream);
create_from_location_async_data_free(data);
}
-static void on_pvd_read (GObject *source,
+static void on_pvd_read(GObject *source,
GAsyncResult *res,
gpointer user_data)
{
@@ -795,7 +795,7 @@ static void on_pvd_read (GObject *source,
ON_ERROR:
g_simple_async_result_take_error(data->res, error);
- g_simple_async_result_complete (data->res);
+ g_simple_async_result_complete(data->res);
create_from_location_async_data_free(data);
}
@@ -814,11 +814,11 @@ static void on_location_skipped(GObject *source,
g_prefix_error(&error, _("Failed to skip %d bytes"), PVD_OFFSET);
else
g_set_error(&error,
- OSINFO_MEDIA_ERROR,
- OSINFO_MEDIA_ERROR_NO_DESCRIPTORS,
- _("No volume descriptors"));
+ OSINFO_MEDIA_ERROR,
+ OSINFO_MEDIA_ERROR_NO_DESCRIPTORS,
+ _("No volume descriptors"));
g_simple_async_result_take_error(data->res, error);
- g_simple_async_result_complete (data->res);
+ g_simple_async_result_complete(data->res);
create_from_location_async_data_free(data);
return;
@@ -850,7 +850,7 @@ static void on_location_read(GObject *source,
if (error != NULL) {
g_prefix_error(&error, _("Failed to open file"));
g_simple_async_result_take_error(data->res, error);
- g_simple_async_result_complete (data->res);
+ g_simple_async_result_complete(data->res);
create_from_location_async_data_free(data);
return;
@@ -1095,7 +1095,7 @@ gboolean osinfo_media_get_live(OsinfoMedia *media)
* installer takes before installation is complete.
*
* This function is not supposed to be called on media that has no installer.
- * You can use #osinfo_media_get_installer (or OsinfoMedia::installer) to check
+ * You can use #osinfo_media_get_installer(or OsinfoMedia::installer) to check
* that.
*
* Warning: Some media allow you to install from live sessions, in which case
@@ -1107,7 +1107,7 @@ gboolean osinfo_media_get_live(OsinfoMedia *media)
gint osinfo_media_get_installer_reboots(OsinfoMedia *media)
{
g_return_val_if_fail(OSINFO_IS_MEDIA(media), -1);
- g_return_val_if_fail(osinfo_media_get_installer (media), -1);
+ g_return_val_if_fail(osinfo_media_get_installer(media), -1);
return (gint) osinfo_entity_get_param_value_int64_with_default
(OSINFO_ENTITY(media), OSINFO_MEDIA_PROP_INSTALLER_REBOOTS, 1);
@@ -1183,7 +1183,7 @@ OsinfoOsVariantList *osinfo_media_get_os_variants(OsinfoMedia *media)
*
* On media that are not installers, this property will indicate the
* languages that the user interface can be displayed in.
- * Use #osinfo_media_get_installer (or OsinfoMedia::installer) to know
+ * Use #osinfo_media_get_installer(or OsinfoMedia::installer) to know
* if the media is an installer or not.
*
* Returns: (transfer container) (element-type utf8): a #GList
diff --git a/osinfo/osinfo_medialist.c b/osinfo/osinfo_medialist.c
index da018a6..d32ad27 100644
--- a/osinfo/osinfo_medialist.c
+++ b/osinfo/osinfo_medialist.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoMediaList, osinfo_medialist, OSINFO_TYPE_LIST);
+G_DEFINE_TYPE(OsinfoMediaList, osinfo_medialist, OSINFO_TYPE_LIST);
-#define OSINFO_MEDIALIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_MEDIALIST, OsinfoMediaListPrivate))
+#define OSINFO_MEDIALIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_MEDIALIST, OsinfoMediaListPrivate))
/**
* SECTION:osinfo_medialist
@@ -46,24 +46,24 @@ struct _OsinfoMediaListPrivate
};
static void
-osinfo_medialist_finalize (GObject *object)
+osinfo_medialist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_medialist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_medialist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_medialist_class_init (OsinfoMediaListClass *klass)
+osinfo_medialist_class_init(OsinfoMediaListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_medialist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoMediaListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoMediaListPrivate));
}
static void
-osinfo_medialist_init (OsinfoMediaList *list)
+osinfo_medialist_init(OsinfoMediaList *list)
{
list->priv = OSINFO_MEDIALIST_GET_PRIVATE(list);
}
diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
index c8b6ad5..ab97c67 100644
--- a/osinfo/osinfo_os.c
+++ b/osinfo/osinfo_os.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -29,9 +29,9 @@
#include "osinfo/osinfo_product_private.h"
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoOs, osinfo_os, OSINFO_TYPE_PRODUCT);
+G_DEFINE_TYPE(OsinfoOs, osinfo_os, OSINFO_TYPE_PRODUCT);
-#define OSINFO_OS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_OS, OsinfoOsPrivate))
+#define OSINFO_OS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_OS, OsinfoOsPrivate))
/**
* SECTION:osinfo_os
@@ -73,7 +73,7 @@ enum {
PROP_DISTRO,
};
-static void osinfo_os_finalize (GObject *object);
+static void osinfo_os_finalize(GObject *object);
static void osinfo_device_link_free(gpointer data, gpointer opaque G_GNUC_UNUSED)
{
@@ -81,36 +81,36 @@ static void osinfo_device_link_free(gpointer data, gpointer opaque G_GNUC_UNUSED
}
static void
-osinfo_os_get_property (GObject *object,
+osinfo_os_get_property(GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
- OsinfoEntity *entity = OSINFO_ENTITY (object);
+ OsinfoEntity *entity = OSINFO_ENTITY(object);
switch (property_id)
{
case PROP_FAMILY:
- g_value_set_string (value,
- osinfo_entity_get_param_value (entity,
+ g_value_set_string(value,
+ osinfo_entity_get_param_value(entity,
"family"));
break;
case PROP_DISTRO:
- g_value_set_string (value,
- osinfo_entity_get_param_value (entity,
+ g_value_set_string(value,
+ osinfo_entity_get_param_value(entity,
"distro"));
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
static void
-osinfo_os_finalize (GObject *object)
+osinfo_os_finalize(GObject *object)
{
- OsinfoOs *os = OSINFO_OS (object);
+ OsinfoOs *os = OSINFO_OS(object);
g_list_foreach(os->priv->deviceLinks, osinfo_device_link_free, NULL);
g_list_free(os->priv->deviceLinks);
@@ -123,20 +123,20 @@ osinfo_os_finalize (GObject *object)
g_object_unref(os->priv->device_drivers);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_os_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_os_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_os_class_init (OsinfoOsClass *klass)
+osinfo_os_class_init(OsinfoOsClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
g_klass->get_property = osinfo_os_get_property;
g_klass->finalize = osinfo_os_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoOsPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoOsPrivate));
/**
* OsinfoOs:family:
@@ -144,13 +144,13 @@ osinfo_os_class_init (OsinfoOsClass *klass)
* The generic family this OS belongs to, based upon its kernel,
* for example linux, winnt, solaris, freebsd etc.
*/
- pspec = g_param_spec_string ("family",
- "Family",
- _("Generic Family"),
- NULL /* default value */,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass,
+ pspec = g_param_spec_string("family",
+ "Family",
+ _("Generic Family"),
+ NULL /* default value */,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass,
PROP_FAMILY,
pspec);
@@ -160,30 +160,30 @@ osinfo_os_class_init (OsinfoOsClass *klass)
* The generic distro this OS belongs to, for example fedora, windows,
* solaris, freebsd etc.
*/
- pspec = g_param_spec_string ("distro",
- "Distro",
- _("Generic Distro"),
- NULL /* default value */,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass,
- PROP_DISTRO,
- pspec);
+ pspec = g_param_spec_string("distro",
+ "Distro",
+ _("Generic Distro"),
+ NULL /* default value */,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass,
+ PROP_DISTRO,
+ pspec);
}
static void
-osinfo_os_init (OsinfoOs *os)
+osinfo_os_init(OsinfoOs *os)
{
os->priv = OSINFO_OS_GET_PRIVATE(os);
os->priv->deviceLinks = NULL;
- os->priv->medias = osinfo_medialist_new ();
- os->priv->trees = osinfo_treelist_new ();
- os->priv->variants = osinfo_os_variantlist_new ();
- os->priv->minimum = osinfo_resourceslist_new ();
- os->priv->recommended = osinfo_resourceslist_new ();
- os->priv->scripts = osinfo_install_scriptlist_new ();
- os->priv->device_drivers = osinfo_device_driverlist_new ();
+ os->priv->medias = osinfo_medialist_new();
+ os->priv->trees = osinfo_treelist_new();
+ os->priv->variants = osinfo_os_variantlist_new();
+ os->priv->minimum = osinfo_resourceslist_new();
+ os->priv->recommended = osinfo_resourceslist_new();
+ os->priv->scripts = osinfo_install_scriptlist_new();
+ os->priv->device_drivers = osinfo_device_driverlist_new();
}
/**
@@ -311,7 +311,7 @@ OsinfoDeviceList *osinfo_os_get_devices_by_property(OsinfoOs *os,
devices = osinfo_os_get_all_devices(os, filter);
else
devices = osinfo_os_get_devices(os, filter);
- g_object_unref (filter);
+ g_object_unref(filter);
return devices;
}
diff --git a/osinfo/osinfo_os_variant.c b/osinfo/osinfo_os_variant.c
index f859235..914353f 100644
--- a/osinfo/osinfo_os_variant.c
+++ b/osinfo/osinfo_os_variant.c
@@ -1,7 +1,7 @@
/*
* libosinfo: The variant of an OS
*
- * Copyright (C) 2013 Red Hat, Inc.
+ * Copyright (C) 2013-2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,10 +26,10 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoOsVariant, osinfo_os_variant, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoOsVariant, osinfo_os_variant, OSINFO_TYPE_ENTITY);
#define OSINFO_OS_VARIANT_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
+ (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
OSINFO_TYPE_OS_VARIANT, \
OsinfoOsVariantPrivate))
@@ -52,22 +52,22 @@ enum {
};
static void
-osinfo_os_variant_get_property (GObject *object,
+osinfo_os_variant_get_property(GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
- OsinfoOsVariant *variant = OSINFO_OS_VARIANT (object);
+ OsinfoOsVariant *variant = OSINFO_OS_VARIANT(object);
switch (property_id) {
case PROP_NAME:
- g_value_set_string (value,
- osinfo_os_variant_get_name (variant));
+ g_value_set_string(value,
+ osinfo_os_variant_get_name(variant));
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
@@ -78,49 +78,49 @@ osinfo_os_variant_set_property(GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- OsinfoOsVariant *variant = OSINFO_OS_VARIANT (object);
+ OsinfoOsVariant *variant = OSINFO_OS_VARIANT(object);
switch (property_id) {
case PROP_NAME:
- osinfo_entity_set_param (OSINFO_ENTITY(variant),
- OSINFO_OS_VARIANT_PROP_NAME,
- g_value_get_string (value));
+ osinfo_entity_set_param(OSINFO_ENTITY(variant),
+ OSINFO_OS_VARIANT_PROP_NAME,
+ g_value_get_string(value));
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
/* Init functions */
static void
-osinfo_os_variant_class_init (OsinfoOsVariantClass *klass)
+osinfo_os_variant_class_init(OsinfoOsVariantClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
g_klass->get_property = osinfo_os_variant_get_property;
g_klass->set_property = osinfo_os_variant_set_property;
- g_type_class_add_private (klass, sizeof (OsinfoOsVariantPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoOsVariantPrivate));
/**
* OsinfoOsVariant:name:
*
* The name to this variant.
*/
- pspec = g_param_spec_string ("name",
- "Name",
- _("The name to this variant"),
- NULL /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_NAME, pspec);
+ pspec = g_param_spec_string("name",
+ "Name",
+ _("The name to this variant"),
+ NULL /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_NAME, pspec);
}
static void
-osinfo_os_variant_init (OsinfoOsVariant *variant)
+osinfo_os_variant_init(OsinfoOsVariant *variant)
{
variant->priv = OSINFO_OS_VARIANT_GET_PRIVATE(variant);
}
diff --git a/osinfo/osinfo_os_variantlist.c b/osinfo/osinfo_os_variantlist.c
index b6bbced..469c62a 100644
--- a/osinfo/osinfo_os_variantlist.c
+++ b/osinfo/osinfo_os_variantlist.c
@@ -1,7 +1,7 @@
/*
* libosinfo: a list of OS variants
*
- * Copyright (C) 2013 Red Hat, Inc.
+ * Copyright (C) 2013-2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -25,9 +25,9 @@
#include <osinfo/osinfo.h>
-G_DEFINE_TYPE (OsinfoOsVariantList, osinfo_os_variantlist, OSINFO_TYPE_LIST);
+G_DEFINE_TYPE(OsinfoOsVariantList, osinfo_os_variantlist, OSINFO_TYPE_LIST);
-#define OSINFO_OS_VARIANTLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_OS_VARIANTLIST, OsinfoOsVariantListPrivate))
+#define OSINFO_OS_VARIANTLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_OS_VARIANTLIST, OsinfoOsVariantListPrivate))
/**
* SECTION:osinfo_os_variantlist
@@ -45,13 +45,13 @@ struct _OsinfoOsVariantListPrivate
/* Init functions */
static void
-osinfo_os_variantlist_class_init (OsinfoOsVariantListClass *klass)
+osinfo_os_variantlist_class_init(OsinfoOsVariantListClass *klass)
{
- g_type_class_add_private (klass, sizeof (OsinfoOsVariantListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoOsVariantListPrivate));
}
static void
-osinfo_os_variantlist_init (OsinfoOsVariantList *list)
+osinfo_os_variantlist_init(OsinfoOsVariantList *list)
{
list->priv = OSINFO_OS_VARIANTLIST_GET_PRIVATE(list);
}
diff --git a/osinfo/osinfo_oslist.c b/osinfo/osinfo_oslist.c
index 59e8750..2c9b593 100644
--- a/osinfo/osinfo_oslist.c
+++ b/osinfo/osinfo_oslist.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoOsList, osinfo_oslist, OSINFO_TYPE_PRODUCTLIST);
+G_DEFINE_TYPE(OsinfoOsList, osinfo_oslist, OSINFO_TYPE_PRODUCTLIST);
-#define OSINFO_OSLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_OSLIST, OsinfoOsListPrivate))
+#define OSINFO_OSLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_OSLIST, OsinfoOsListPrivate))
/**
* SECTION:osinfo_oslist
@@ -46,24 +46,24 @@ struct _OsinfoOsListPrivate
};
static void
-osinfo_oslist_finalize (GObject *object)
+osinfo_oslist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_oslist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_oslist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_oslist_class_init (OsinfoOsListClass *klass)
+osinfo_oslist_class_init(OsinfoOsListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_oslist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoOsListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoOsListPrivate));
}
static void
-osinfo_oslist_init (OsinfoOsList *list)
+osinfo_oslist_init(OsinfoOsList *list)
{
list->priv = OSINFO_OSLIST_GET_PRIVATE(list);
}
diff --git a/osinfo/osinfo_platform.c b/osinfo/osinfo_platform.c
index c447448..b17eef6 100644
--- a/osinfo/osinfo_platform.c
+++ b/osinfo/osinfo_platform.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,9 +28,9 @@
#include "osinfo/osinfo_product_private.h"
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoPlatform, osinfo_platform, OSINFO_TYPE_PRODUCT);
+G_DEFINE_TYPE(OsinfoPlatform, osinfo_platform, OSINFO_TYPE_PRODUCT);
-#define OSINFO_PLATFORM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_PLATFORM, OsinfoPlatformPrivate))
+#define OSINFO_PLATFORM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_PLATFORM, OsinfoPlatformPrivate))
/**
* SECTION:osinfo_platform
@@ -58,29 +58,29 @@ static void osinfo_device_link_free(gpointer data, gpointer opaque G_GNUC_UNUSED
}
static void
-osinfo_platform_finalize (GObject *object)
+osinfo_platform_finalize(GObject *object)
{
- OsinfoPlatform *platform = OSINFO_PLATFORM (object);
+ OsinfoPlatform *platform = OSINFO_PLATFORM(object);
g_list_foreach(platform->priv->deviceLinks, osinfo_device_link_free, NULL);
g_list_free(platform->priv->deviceLinks);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_platform_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_platform_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_platform_class_init (OsinfoPlatformClass *klass)
+osinfo_platform_class_init(OsinfoPlatformClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_platform_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoPlatformPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoPlatformPrivate));
}
static void
-osinfo_platform_init (OsinfoPlatform *platform)
+osinfo_platform_init(OsinfoPlatform *platform)
{
platform->priv = OSINFO_PLATFORM_GET_PRIVATE(platform);
platform->priv->deviceLinks = NULL;
diff --git a/osinfo/osinfo_platformlist.c b/osinfo/osinfo_platformlist.c
index 8322fc2..00990f4 100644
--- a/osinfo/osinfo_platformlist.c
+++ b/osinfo/osinfo_platformlist.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoPlatformList, osinfo_platformlist, OSINFO_TYPE_PRODUCTLIST);
+G_DEFINE_TYPE(OsinfoPlatformList, osinfo_platformlist, OSINFO_TYPE_PRODUCTLIST);
-#define OSINFO_PLATFORMLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_PLATFORMLIST, OsinfoPlatformListPrivate))
+#define OSINFO_PLATFORMLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_PLATFORMLIST, OsinfoPlatformListPrivate))
/**
* SECTION:osinfo_platformlist
@@ -46,24 +46,24 @@ struct _OsinfoPlatformListPrivate
};
static void
-osinfo_platformlist_finalize (GObject *object)
+osinfo_platformlist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_platformlist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_platformlist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_platformlist_class_init (OsinfoPlatformListClass *klass)
+osinfo_platformlist_class_init(OsinfoPlatformListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_platformlist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoPlatformListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoPlatformListPrivate));
}
static void
-osinfo_platformlist_init (OsinfoPlatformList *list)
+osinfo_platformlist_init(OsinfoPlatformList *list)
{
list->priv = OSINFO_PLATFORMLIST_GET_PRIVATE(list);
}
diff --git a/osinfo/osinfo_product.c b/osinfo/osinfo_product.c
index 35a4071..1bd7017 100644
--- a/osinfo/osinfo_product.c
+++ b/osinfo/osinfo_product.c
@@ -1,7 +1,7 @@
/*
* osinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -32,9 +32,9 @@
#include "osinfo/osinfo_product_private.h"
-G_DEFINE_ABSTRACT_TYPE (OsinfoProduct, osinfo_product, OSINFO_TYPE_ENTITY);
+G_DEFINE_ABSTRACT_TYPE(OsinfoProduct, osinfo_product, OSINFO_TYPE_ENTITY);
-#define OSINFO_PRODUCT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_PRODUCT, OsinfoProductPrivate))
+#define OSINFO_PRODUCT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_PRODUCT, OsinfoProductPrivate))
/**
* SECTION:osinfo_product
@@ -91,155 +91,155 @@ static void osinfo_product_link_free(gpointer data, gpointer opaque G_GNUC_UNUSE
static void
-osinfo_product_finalize (GObject *object)
+osinfo_product_finalize(GObject *object)
{
- OsinfoProduct *product = OSINFO_PRODUCT (object);
+ OsinfoProduct *product = OSINFO_PRODUCT(object);
g_list_foreach(product->priv->productLinks, osinfo_product_link_free, NULL);
g_list_free(product->priv->productLinks);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_product_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_product_parent_class)->finalize(object);
}
static void
-osinfo_product_get_property (GObject *object,
+osinfo_product_get_property(GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
- OsinfoProduct *product = OSINFO_PRODUCT (object);
+ OsinfoProduct *product = OSINFO_PRODUCT(object);
switch (property_id) {
case PROP_NAME:
- g_value_set_string (value,
- osinfo_product_get_name (product));
+ g_value_set_string(value,
+ osinfo_product_get_name(product));
break;
case PROP_SHORT_ID:
- g_value_set_string (value,
- osinfo_product_get_short_id (product));
+ g_value_set_string(value,
+ osinfo_product_get_short_id(product));
break;
case PROP_VENDOR:
- g_value_set_string (value,
- osinfo_product_get_vendor (product));
+ g_value_set_string(value,
+ osinfo_product_get_vendor(product));
break;
case PROP_VERSION:
- g_value_set_string (value,
- osinfo_product_get_version (product));
+ g_value_set_string(value,
+ osinfo_product_get_version(product));
break;
case PROP_CODENAME:
- g_value_set_string (value,
- osinfo_product_get_codename (product));
+ g_value_set_string(value,
+ osinfo_product_get_codename(product));
break;
case PROP_LOGO:
- g_value_set_string (value,
- osinfo_product_get_logo (product));
+ g_value_set_string(value,
+ osinfo_product_get_logo(product));
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
/* Init functions */
static void
-osinfo_product_class_init (OsinfoProductClass *klass)
+osinfo_product_class_init(OsinfoProductClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
g_klass->get_property = osinfo_product_get_property;
g_klass->finalize = osinfo_product_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoProductPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoProductPrivate));
/**
* OsinfoProduct:name:
*
* The name of this product.
*/
- pspec = g_param_spec_string ("name",
- "Name",
- _("Name"),
- NULL /* default value */,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_NAME, pspec);
+ pspec = g_param_spec_string("name",
+ "Name",
+ _("Name"),
+ NULL /* default value */,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_NAME, pspec);
/**
* OsinfoProduct:short-id:
*
* The short ID of this product.
*/
- pspec = g_param_spec_string ("short-id",
- "ShortID",
- _("Short ID"),
- NULL /* default value */,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_SHORT_ID, pspec);
+ pspec = g_param_spec_string("short-id",
+ "ShortID",
+ _("Short ID"),
+ NULL /* default value */,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_SHORT_ID, pspec);
/**
* OsinfoProduct:vendor:
*
* The Vendor of this product.
*/
- pspec = g_param_spec_string ("vendor",
- "Vendor",
- _("Vendor"),
- NULL /* default value */,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_VENDOR, pspec);
+ pspec = g_param_spec_string("vendor",
+ "Vendor",
+ _("Vendor"),
+ NULL /* default value */,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_VENDOR, pspec);
/**
* OsinfoProduct:version:
*
* The version of the product.
*/
- pspec = g_param_spec_string ("version",
- "Version",
- _("Version"),
- NULL /* default value */,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_VERSION, pspec);
+ pspec = g_param_spec_string("version",
+ "Version",
+ _("Version"),
+ NULL /* default value */,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_VERSION, pspec);
/**
* OsinfoProduct:codename:
*
* The codename of this product.
*/
- pspec = g_param_spec_string ("codename",
- "Codename",
- _("Codename"),
- NULL /* default value */,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_NAME, pspec);
+ pspec = g_param_spec_string("codename",
+ "Codename",
+ _("Codename"),
+ NULL /* default value */,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_NAME, pspec);
/**
* OsinfoProduct:logo:
*
* The URI of the logo of the product.
*/
- pspec = g_param_spec_string ("logo",
- "Logo",
- _("URI of the logo"),
- NULL /* default value */,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass, PROP_LOGO, pspec);
+ pspec = g_param_spec_string("logo",
+ "Logo",
+ _("URI of the logo"),
+ NULL /* default value */,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass, PROP_LOGO, pspec);
}
static void
-osinfo_product_init (OsinfoProduct *product)
+osinfo_product_init(OsinfoProduct *product)
{
product->priv = OSINFO_PRODUCT_GET_PRIVATE(product);
product->priv->productLinks = NULL;
@@ -342,7 +342,7 @@ static GDate *date_from_string(const gchar *str)
m = strtoll(tmp+1, NULL, 10);
tmp = strchr(tmp+1, '-');
d = strtoll(tmp+1, NULL, 10);
- return g_date_new_dmy(d,m,y);
+ return g_date_new_dmy(d, m, y);
}
GDate *osinfo_product_get_release_date(OsinfoProduct *prod)
@@ -436,7 +436,7 @@ void osinfo_product_foreach_related(OsinfoProduct *product,
foreach_func,
user_data);
}
- g_object_unref (related_list);
+ g_object_unref(related_list);
}
/*
diff --git a/osinfo/osinfo_productfilter.c b/osinfo/osinfo_productfilter.c
index 435a202..9dbffa2 100644
--- a/osinfo/osinfo_productfilter.c
+++ b/osinfo/osinfo_productfilter.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoProductFilter, osinfo_productfilter, OSINFO_TYPE_FILTER);
+G_DEFINE_TYPE(OsinfoProductFilter, osinfo_productfilter, OSINFO_TYPE_FILTER);
-#define OSINFO_PRODUCTFILTER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_PRODUCTFILTER, OsinfoProductFilterPrivate))
+#define OSINFO_PRODUCTFILTER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_PRODUCTFILTER, OsinfoProductFilterPrivate))
/**
* SECTION:osinfo_productfilter
@@ -52,29 +52,29 @@ struct _OsinfoProductFilterPrivate
GDate *supportDate;
};
-static void osinfo_productfilter_finalize (GObject *object);
+static void osinfo_productfilter_finalize(GObject *object);
static gboolean osinfo_productfilter_matches_default(OsinfoFilter *productfilter, OsinfoEntity *entity);
static void
-osinfo_productfilter_finalize (GObject *object)
+osinfo_productfilter_finalize(GObject *object)
{
- OsinfoProductFilter *productfilter = OSINFO_PRODUCTFILTER (object);
+ OsinfoProductFilter *productfilter = OSINFO_PRODUCTFILTER(object);
g_hash_table_unref(productfilter->priv->productConstraints);
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_productfilter_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_productfilter_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_productfilter_class_init (OsinfoProductFilterClass *klass)
+osinfo_productfilter_class_init(OsinfoProductFilterClass *klass)
{
GObjectClass *g_klass = G_OBJECT_CLASS(klass);
OsinfoFilterClass *filter_klass = OSINFO_FILTER_CLASS(klass);
g_klass->finalize = osinfo_productfilter_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoProductFilterPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoProductFilterPrivate));
filter_klass->matches = osinfo_productfilter_matches_default;
}
@@ -108,7 +108,7 @@ osinfo_productfilter_product_constraints_free(gpointer relshps)
}
static void
-osinfo_productfilter_init (OsinfoProductFilter *productfilter)
+osinfo_productfilter_init(OsinfoProductFilter *productfilter)
{
productfilter->priv = OSINFO_PRODUCTFILTER_GET_PRIVATE(productfilter);
productfilter->priv->productConstraints =
@@ -240,7 +240,7 @@ static void osinfo_productfilter_match_product_iterator(gpointer key, gpointer v
OsinfoProduct *currProduct = relProducts->data;
int i;
gboolean found = FALSE;
- for (i = 0 ; i < osinfo_list_get_length(OSINFO_LIST(productlist)) ; i++) {
+ for (i = 0; i < osinfo_list_get_length(OSINFO_LIST(productlist)); i++) {
OsinfoProduct *testProduct = OSINFO_PRODUCT(osinfo_list_get_nth(OSINFO_LIST(productlist), i));
if (testProduct == currProduct) {
found = TRUE;
@@ -267,7 +267,7 @@ static gboolean osinfo_productfilter_matches_default(OsinfoFilter *filter, Osinf
OsinfoProductFilter *productfilter = OSINFO_PRODUCTFILTER(filter);
struct osinfo_productfilter_match_args args = { productfilter, entity, TRUE };
- if (!OSINFO_FILTER_CLASS (osinfo_productfilter_parent_class)->matches(filter, entity))
+ if (!OSINFO_FILTER_CLASS(osinfo_productfilter_parent_class)->matches(filter, entity))
return FALSE;
g_hash_table_foreach(productfilter->priv->productConstraints,
diff --git a/osinfo/osinfo_productlist.c b/osinfo/osinfo_productlist.c
index b166403..6e29357 100644
--- a/osinfo/osinfo_productlist.c
+++ b/osinfo/osinfo_productlist.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoProductList, osinfo_productlist, OSINFO_TYPE_LIST);
+G_DEFINE_TYPE(OsinfoProductList, osinfo_productlist, OSINFO_TYPE_LIST);
-#define OSINFO_PRODUCTLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_PRODUCTLIST, OsinfoProductListPrivate))
+#define OSINFO_PRODUCTLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_PRODUCTLIST, OsinfoProductListPrivate))
/**
* SECTION:osinfo_productlist
@@ -46,24 +46,24 @@ struct _OsinfoProductListPrivate
};
static void
-osinfo_productlist_finalize (GObject *object)
+osinfo_productlist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_productlist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_productlist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_productlist_class_init (OsinfoProductListClass *klass)
+osinfo_productlist_class_init(OsinfoProductListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_productlist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoProductListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoProductListPrivate));
}
static void
-osinfo_productlist_init (OsinfoProductList *list)
+osinfo_productlist_init(OsinfoProductList *list)
{
list->priv = OSINFO_PRODUCTLIST_GET_PRIVATE(list);
}
diff --git a/osinfo/osinfo_resources.c b/osinfo/osinfo_resources.c
index 9f12055..8c116fa 100644
--- a/osinfo/osinfo_resources.c
+++ b/osinfo/osinfo_resources.c
@@ -1,7 +1,7 @@
/*
* libosinfo: Required or recommended resources for an (guest) OS
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -31,7 +31,7 @@
#include <string.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoResources, osinfo_resources, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoResources, osinfo_resources, OSINFO_TYPE_ENTITY);
enum {
PROP_0,
@@ -44,9 +44,9 @@ enum {
};
#define OSINFO_RESOURCES_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- OSINFO_TYPE_RESOURCES, \
- OsinfoResourcesPrivate))
+ (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
+ OSINFO_TYPE_RESOURCES, \
+ OsinfoResourcesPrivate))
/**
* SECTION:osinfo_resources
@@ -63,49 +63,49 @@ struct _OsinfoResourcesPrivate
};
static void
-osinfo_resources_finalize (GObject *object)
+osinfo_resources_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_resources_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_resources_parent_class)->finalize(object);
}
static void
-osinfo_resources_get_property (GObject *object,
+osinfo_resources_get_property(GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
- OsinfoResources *resources = OSINFO_RESOURCES (object);
+ OsinfoResources *resources = OSINFO_RESOURCES(object);
switch (property_id) {
case PROP_ARCHITECTURE:
- g_value_set_string (value,
- osinfo_resources_get_architecture (resources));
+ g_value_set_string(value,
+ osinfo_resources_get_architecture(resources));
break;
case PROP_N_CPUS:
- g_value_set_int (value,
- osinfo_resources_get_n_cpus (resources));
+ g_value_set_int(value,
+ osinfo_resources_get_n_cpus(resources));
break;
case PROP_CPU:
- g_value_set_int64 (value,
- osinfo_resources_get_cpu (resources));
+ g_value_set_int64(value,
+ osinfo_resources_get_cpu(resources));
break;
case PROP_RAM:
- g_value_set_int64 (value,
- osinfo_resources_get_ram (resources));
+ g_value_set_int64(value,
+ osinfo_resources_get_ram(resources));
break;
case PROP_STORAGE:
- g_value_set_int64 (value,
- osinfo_resources_get_storage (resources));
+ g_value_set_int64(value,
+ osinfo_resources_get_storage(resources));
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
@@ -116,137 +116,137 @@ osinfo_resources_set_property(GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- OsinfoResources *resources = OSINFO_RESOURCES (object);
+ OsinfoResources *resources = OSINFO_RESOURCES(object);
switch (property_id) {
case PROP_ARCHITECTURE:
- osinfo_entity_set_param (OSINFO_ENTITY(resources),
- OSINFO_RESOURCES_PROP_ARCHITECTURE,
- g_value_get_string (value));
+ osinfo_entity_set_param(OSINFO_ENTITY(resources),
+ OSINFO_RESOURCES_PROP_ARCHITECTURE,
+ g_value_get_string(value));
break;
case PROP_N_CPUS:
- osinfo_resources_set_n_cpus (resources, g_value_get_int (value));
+ osinfo_resources_set_n_cpus(resources, g_value_get_int(value));
break;
case PROP_CPU:
- osinfo_resources_set_cpu (resources, g_value_get_int64 (value));
+ osinfo_resources_set_cpu(resources, g_value_get_int64(value));
break;
case PROP_RAM:
- osinfo_resources_set_ram (resources, g_value_get_int64 (value));
+ osinfo_resources_set_ram(resources, g_value_get_int64(value));
break;
case PROP_STORAGE:
- osinfo_resources_set_storage (resources, g_value_get_int64 (value));
+ osinfo_resources_set_storage(resources, g_value_get_int64(value));
break;
default:
/* We don't have any other property... */
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
}
}
/* Init functions */
static void
-osinfo_resources_class_init (OsinfoResourcesClass *klass)
+osinfo_resources_class_init(OsinfoResourcesClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
g_klass->get_property = osinfo_resources_get_property;
g_klass->set_property = osinfo_resources_set_property;
g_klass->finalize = osinfo_resources_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoResourcesPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoResourcesPrivate));
/**
* OsinfoResources:architecture:
*
* The target hardware architecture to which these resources applies.
*/
- pspec = g_param_spec_string ("architecture",
- "ARCHITECTURE",
- _("CPU Architecture"),
- NULL /* default value */,
- G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass,
- PROP_ARCHITECTURE,
- pspec);
+ pspec = g_param_spec_string("architecture",
+ "ARCHITECTURE",
+ _("CPU Architecture"),
+ NULL /* default value */,
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass,
+ PROP_ARCHITECTURE,
+ pspec);
/**
* OsinfoResources:cpu:
*
* The CPU frequency in hertz (Hz).
*/
- pspec = g_param_spec_int64 ("cpu",
- "CPU",
- _("CPU frequency in hertz (Hz)"),
- -1,
- G_MAXINT,
- -1,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass,
- PROP_CPU,
- pspec);
+ pspec = g_param_spec_int64("cpu",
+ "CPU",
+ _("CPU frequency in hertz (Hz)"),
+ -1,
+ G_MAXINT,
+ -1,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass,
+ PROP_CPU,
+ pspec);
/**
* OsinfoResources:n-cpus:
*
* The number of CPUs.
*/
- pspec = g_param_spec_int ("n-cpus",
- "N-CPUs",
- _("Number of CPUs"),
- -1,
- G_MAXINT,
- -1,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass,
- PROP_N_CPUS,
- pspec);
+ pspec = g_param_spec_int("n-cpus",
+ "N-CPUs",
+ _("Number of CPUs"),
+ -1,
+ G_MAXINT,
+ -1,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass,
+ PROP_N_CPUS,
+ pspec);
/**
* OsinfoResources:ram:
*
* The amount of Random Access Memory (RAM) in bytes.
*/
- pspec = g_param_spec_int64 ("ram",
- "RAM",
- _("Amount of Random Access Memory (RAM) in bytes"),
- -1,
- G_MAXINT64,
- -1,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass,
- PROP_RAM,
- pspec);
+ pspec = g_param_spec_int64("ram",
+ "RAM",
+ _("Amount of Random Access Memory (RAM) in bytes"),
+ -1,
+ G_MAXINT64,
+ -1,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass,
+ PROP_RAM,
+ pspec);
/**
* OsinfoResources:storage:
*
* The amount of storage space in bytes.
*/
- pspec = g_param_spec_int64 ("storage",
- "Storage",
- _("Amount of storage space in bytes"),
- -1,
- G_MAXINT64,
- -1,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (g_klass,
+ pspec = g_param_spec_int64("storage",
+ "Storage",
+ _("Amount of storage space in bytes"),
+ -1,
+ G_MAXINT64,
+ -1,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property(g_klass,
PROP_STORAGE,
pspec);
}
static void
-osinfo_resources_init (OsinfoResources *resources)
+osinfo_resources_init(OsinfoResources *resources)
{
resources->priv = OSINFO_RESOURCES_GET_PRIVATE(resources);
}
@@ -256,10 +256,10 @@ OsinfoResources *osinfo_resources_new(const gchar *id,
{
OsinfoResources *resources;
- resources = g_object_new (OSINFO_TYPE_RESOURCES,
- "id", id,
- "architecture", architecture,
- NULL);
+ resources = g_object_new(OSINFO_TYPE_RESOURCES,
+ "id", id,
+ "architecture", architecture,
+ NULL);
return resources;
}
diff --git a/osinfo/osinfo_resourceslist.c b/osinfo/osinfo_resourceslist.c
index 057d4a4..a9d3737 100644
--- a/osinfo/osinfo_resourceslist.c
+++ b/osinfo/osinfo_resourceslist.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoResourcesList, osinfo_resourceslist, OSINFO_TYPE_LIST);
+G_DEFINE_TYPE(OsinfoResourcesList, osinfo_resourceslist, OSINFO_TYPE_LIST);
-#define OSINFO_RESOURCESLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
+#define OSINFO_RESOURCESLIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
OSINFO_TYPE_RESOURCESLIST, \
OsinfoResourcesListPrivate))
@@ -48,24 +48,24 @@ struct _OsinfoResourcesListPrivate
};
static void
-osinfo_resourceslist_finalize (GObject *object)
+osinfo_resourceslist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_resourceslist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_resourceslist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_resourceslist_class_init (OsinfoResourcesListClass *klass)
+osinfo_resourceslist_class_init(OsinfoResourcesListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_resourceslist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoResourcesListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoResourcesListPrivate));
}
static void
-osinfo_resourceslist_init (OsinfoResourcesList *list)
+osinfo_resourceslist_init(OsinfoResourcesList *list)
{
list->priv = OSINFO_RESOURCESLIST_GET_PRIVATE(list);
diff --git a/osinfo/osinfo_tree.c b/osinfo/osinfo_tree.c
index b4dad63..55c572e 100644
--- a/osinfo/osinfo_tree.c
+++ b/osinfo/osinfo_tree.c
@@ -1,7 +1,7 @@
/*
* libosinfo: An installation tree for a (guest) OS
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -71,20 +71,20 @@ static void create_from_location_data_free(CreateFromLocationData *data)
}
GQuark
-osinfo_tree_error_quark (void)
+osinfo_tree_error_quark(void)
{
static GQuark quark = 0;
if (!quark)
- quark = g_quark_from_static_string ("osinfo-tree-error");
+ quark = g_quark_from_static_string("osinfo-tree-error");
return quark;
}
-G_DEFINE_TYPE (OsinfoTree, osinfo_tree, OSINFO_TYPE_ENTITY);
+G_DEFINE_TYPE(OsinfoTree, osinfo_tree, OSINFO_TYPE_ENTITY);
#define OSINFO_TREE_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
+ (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
OSINFO_TYPE_TREE, \
OsinfoTreePrivate))
@@ -622,7 +622,7 @@ static void on_location_read(GObject *source,
g_simple_async_result_set_op_res_gpointer(data->res, ret, NULL);
cleanup:
- g_simple_async_result_complete (data->res);
+ g_simple_async_result_complete(data->res);
create_from_location_async_data_free(data);
g_free(content);
}
diff --git a/osinfo/osinfo_treelist.c b/osinfo/osinfo_treelist.c
index 45410df..01952f7 100644
--- a/osinfo/osinfo_treelist.c
+++ b/osinfo/osinfo_treelist.c
@@ -1,7 +1,7 @@
/*
* libosinfo:
*
- * Copyright (C) 2009-2012 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,9 @@
#include <osinfo/osinfo.h>
#include <glib/gi18n-lib.h>
-G_DEFINE_TYPE (OsinfoTreeList, osinfo_treelist, OSINFO_TYPE_LIST);
+G_DEFINE_TYPE(OsinfoTreeList, osinfo_treelist, OSINFO_TYPE_LIST);
-#define OSINFO_TREELIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), OSINFO_TYPE_TREELIST, OsinfoTreeListPrivate))
+#define OSINFO_TREELIST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OSINFO_TYPE_TREELIST, OsinfoTreeListPrivate))
/**
* SECTION:osinfo_treelist
@@ -46,24 +46,24 @@ struct _OsinfoTreeListPrivate
};
static void
-osinfo_treelist_finalize (GObject *object)
+osinfo_treelist_finalize(GObject *object)
{
/* Chain up to the parent class */
- G_OBJECT_CLASS (osinfo_treelist_parent_class)->finalize (object);
+ G_OBJECT_CLASS(osinfo_treelist_parent_class)->finalize(object);
}
/* Init functions */
static void
-osinfo_treelist_class_init (OsinfoTreeListClass *klass)
+osinfo_treelist_class_init(OsinfoTreeListClass *klass)
{
- GObjectClass *g_klass = G_OBJECT_CLASS (klass);
+ GObjectClass *g_klass = G_OBJECT_CLASS(klass);
g_klass->finalize = osinfo_treelist_finalize;
- g_type_class_add_private (klass, sizeof (OsinfoTreeListPrivate));
+ g_type_class_add_private(klass, sizeof(OsinfoTreeListPrivate));
}
static void
-osinfo_treelist_init (OsinfoTreeList *list)
+osinfo_treelist_init(OsinfoTreeList *list)
{
list->priv = OSINFO_TREELIST_GET_PRIVATE(list);
}
@@ -112,7 +112,7 @@ OsinfoTreeList *osinfo_treelist_new_copy(OsinfoTreeList *source)
* Deprecated: 0.2.2: Use osinfo_list_new_filtered() instead.
*/
OsinfoTreeList *osinfo_treelist_new_filtered(OsinfoTreeList *source,
- OsinfoFilter *filter)
+ OsinfoFilter *filter)
{
OsinfoTreeList *newList = osinfo_treelist_new();
osinfo_list_add_filtered(OSINFO_LIST(newList),
@@ -133,7 +133,7 @@ OsinfoTreeList *osinfo_treelist_new_filtered(OsinfoTreeList *source,
* Deprecated: 0.2.2: Use osinfo_list_new_intersection() instead.
*/
OsinfoTreeList *osinfo_treelist_new_intersection(OsinfoTreeList *sourceOne,
- OsinfoTreeList *sourceTwo)
+ OsinfoTreeList *sourceTwo)
{
OsinfoTreeList *newList = osinfo_treelist_new();
osinfo_list_add_intersection(OSINFO_LIST(newList),
--
1.9.3
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
