[evolution-data-server] Prefer G_VALUE_INIT over memset().
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Prefer G_VALUE_INIT over memset().
- Date: Thu, 29 Sep 2011 16:08:54 +0000 (UTC)
commit 187cfdf05526b5d1b69eb3bb034f3ab4a85c3093
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Sep 5 08:46:12 2011 -0400
Prefer G_VALUE_INIT over memset().
G_VALUE_INIT is new in GLib 2.30. More convenient than zero-filling a
statically declared GValue with memset().
camel/camel-object.c | 7 ++-----
camel/camel-settings.c | 12 +++---------
2 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/camel/camel-object.c b/camel/camel-object.c
index f58a6f5..cf1e245 100644
--- a/camel/camel-object.c
+++ b/camel/camel-object.c
@@ -139,7 +139,7 @@ static gint
object_state_read (CamelObject *object,
FILE *fp)
{
- GValue value;
+ GValue value = G_VALUE_INIT;
GObjectClass *class;
GParamSpec **properties;
guint32 count, version;
@@ -183,7 +183,6 @@ object_state_read (CamelObject *object,
return 0;
count = MIN (count, CAMEL_ARGV_MAX);
- memset (&value, 0, sizeof (GValue));
class = G_OBJECT_GET_CLASS (object);
properties = g_object_class_list_properties (class, &n_properties);
@@ -252,14 +251,12 @@ static gint
object_state_write (CamelObject *object,
FILE *fp)
{
- GValue value;
+ GValue value = G_VALUE_INIT;
GObjectClass *class;
GParamSpec **properties;
guint ii, n_properties;
guint32 n_persistent = 0;
- memset (&value, 0, sizeof (GValue));
-
class = G_OBJECT_GET_CLASS (object);
properties = g_object_class_list_properties (class, &n_properties);
diff --git a/camel/camel-settings.c b/camel/camel-settings.c
index 4a57080..e33b75a 100644
--- a/camel/camel-settings.c
+++ b/camel/camel-settings.c
@@ -19,7 +19,6 @@
#include "camel-settings.h"
#include <stdlib.h>
-#include <string.h>
G_DEFINE_TYPE (CamelSettings, camel_settings, G_TYPE_OBJECT)
@@ -240,14 +239,12 @@ camel_settings_load_from_url (CamelSettings *settings,
{
CamelSettingsClass *class;
GParamSpec **properties;
- GValue value;
+ GValue value = G_VALUE_INIT;
guint ii, n_properties;
g_return_if_fail (CAMEL_IS_SETTINGS (settings));
g_return_if_fail (url != NULL);
- memset (&value, 0, sizeof (GValue));
-
class = CAMEL_SETTINGS_GET_CLASS (settings);
properties = camel_settings_class_list_settings (class, &n_properties);
@@ -398,16 +395,13 @@ camel_settings_save_to_url (CamelSettings *settings,
{
CamelSettingsClass *class;
GParamSpec **properties;
- GValue pvalue;
- GValue svalue;
+ GValue pvalue = G_VALUE_INIT;
+ GValue svalue = G_VALUE_INIT;
guint ii, n_properties;
g_return_if_fail (CAMEL_IS_SETTINGS (settings));
g_return_if_fail (url != NULL);
- memset (&pvalue, 0, sizeof (GValue));
- memset (&svalue, 0, sizeof (GValue));
-
g_value_init (&svalue, G_TYPE_STRING);
class = CAMEL_SETTINGS_GET_CLASS (settings);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]