[beast] SFI: const fixups
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast] SFI: const fixups
- Date: Fri, 6 Apr 2012 02:12:40 +0000 (UTC)
commit d9288791559647c7c23b15b8194fa5a0c98204b6
Author: Tim Janik <timj gnu org>
Date: Fri Apr 6 04:11:36 2012 +0200
SFI: const fixups
sfi/sfiglue.cc | 12 ++++++------
sfi/sfiparams.cc | 10 ++++------
sfi/sfiprimitives.cc | 2 +-
sfi/sfiserial.cc | 4 ++--
sfi/sfivalues.cc | 2 +-
sfi/sfivalues.h | 2 +-
sfi/tests/ring.c | 2 +-
7 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/sfi/sfiglue.cc b/sfi/sfiglue.cc
index 4048221..25df50a 100644
--- a/sfi/sfiglue.cc
+++ b/sfi/sfiglue.cc
@@ -459,10 +459,10 @@ sfi_glue_vcall_string (const gchar *proc_name,
{
va_list var_args;
GValue *rvalue;
- gchar *retv = NULL;
-
+ const char *retv = NULL;
+
g_return_val_if_fail (proc_name != NULL, NULL);
-
+
va_start (var_args, first_arg_type);
rvalue = sfi_glue_call_valist (proc_name, first_arg_type, var_args);
va_end (var_args);
@@ -481,10 +481,10 @@ sfi_glue_vcall_choice (const gchar *proc_name,
{
va_list var_args;
GValue *rvalue;
- gchar *retv = NULL;
-
+ const char *retv = NULL;
+
g_return_val_if_fail (proc_name != NULL, NULL);
-
+
va_start (var_args, first_arg_type);
rvalue = sfi_glue_call_valist (proc_name, first_arg_type, var_args);
va_end (var_args);
diff --git a/sfi/sfiparams.cc b/sfi/sfiparams.cc
index e3458cf..6cd5d31 100644
--- a/sfi/sfiparams.cc
+++ b/sfi/sfiparams.cc
@@ -1049,11 +1049,9 @@ GParamSpec*
sfi_pspec_proxy_from_object (GParamSpec *object_pspec)
{
GParamSpec *pspec;
- GParamSpecObject *ospec;
-
+
g_return_val_if_fail (G_IS_PARAM_SPEC_OBJECT (object_pspec), NULL);
-
- ospec = G_PARAM_SPEC_OBJECT (object_pspec);
+
pspec = sfi_pspec_proxy (object_pspec->name,
object_pspec->_nick,
object_pspec->_blurb,
@@ -1132,11 +1130,11 @@ sfi_pspec_get_owner (GParamSpec *pspec)
{
g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
- char *owner = (char*) g_param_spec_get_qdata (pspec, quark_param_owner);
+ const char *owner = (char*) g_param_spec_get_qdata (pspec, quark_param_owner);
if (!owner && pspec->owner_type)
{
owner = g_type_name (pspec->owner_type);
- g_param_spec_set_qdata (pspec, quark_param_owner, owner);
+ g_param_spec_set_qdata (pspec, quark_param_owner, (void*) owner);
}
return owner;
}
diff --git a/sfi/sfiprimitives.cc b/sfi/sfiprimitives.cc
index 73ed4fd..99dbebf 100644
--- a/sfi/sfiprimitives.cc
+++ b/sfi/sfiprimitives.cc
@@ -700,7 +700,7 @@ sfi_seq_to_strv (SfiSeq *seq)
for (i = 0; i < seq->n_elements; i++)
if (G_VALUE_HOLDS_STRING (seq->elements + i))
- slist = g_slist_prepend (slist, sfi_value_get_string (seq->elements + i));
+ slist = g_slist_prepend (slist, const_cast<char*> (sfi_value_get_string (seq->elements + i)));
slist = g_slist_reverse (slist);
strv = g_strslistv (slist);
g_slist_free (slist);
diff --git a/sfi/sfiserial.cc b/sfi/sfiserial.cc
index 8260608..17a75f1 100644
--- a/sfi/sfiserial.cc
+++ b/sfi/sfiserial.cc
@@ -322,7 +322,7 @@ sfi_serialize_primitives (SfiSCategory scat,
case SFI_SCAT_STRING:
if (gstring)
{
- gchar *cstring = sfi_value_get_string (value);
+ char *cstring = const_cast<char*> (sfi_value_get_string (value));
if (cstring)
{
gchar *string = g_strescape (cstring, NULL);
@@ -348,7 +348,7 @@ sfi_serialize_primitives (SfiSCategory scat,
case SFI_SCAT_CHOICE:
if (gstring)
{
- gchar *cstring = sfi_value_get_string (value);
+ char *cstring = const_cast<char*> (sfi_value_get_string (value));
if (!cstring)
gstring_puts (gstring, SFI_SERIAL_NULL_TOKEN);
else
diff --git a/sfi/sfivalues.cc b/sfi/sfivalues.cc
index b663b4e..ae7c607 100644
--- a/sfi/sfivalues.cc
+++ b/sfi/sfivalues.cc
@@ -150,7 +150,7 @@ sfi_check_value (const GValue *value)
return (vtype == SFI_TYPE_PROXY);
}
-gchar*
+const char*
sfi_value_get_choice (const GValue *value)
{
g_return_val_if_fail (SFI_VALUE_HOLDS_CHOICE (value), NULL);
diff --git a/sfi/sfivalues.h b/sfi/sfivalues.h
index 957ca55..4e14347 100644
--- a/sfi/sfivalues.h
+++ b/sfi/sfivalues.h
@@ -73,7 +73,7 @@ G_BEGIN_DECLS
/* --- Sfi value accessors --- */
-gchar* sfi_value_get_choice (const GValue *value);
+const char* sfi_value_get_choice (const GValue *value);
void sfi_value_set_choice (GValue *value,
const gchar *choice_value);
SfiBBlock* sfi_value_get_bblock (const GValue *value);
diff --git a/sfi/tests/ring.c b/sfi/tests/ring.c
index 5da4467..fd5d9d3 100644
--- a/sfi/tests/ring.c
+++ b/sfi/tests/ring.c
@@ -24,7 +24,7 @@ print_ring_ints (SfiRing *ring)
g_print ("SfiRing(%p): {", ring);
SfiRing *node;
for (node = ring; node; node = sfi_ring_walk (node, ring))
- g_print (" %d,", (ptrdiff_t) node->data);
+ g_print (" %zd,", (size_t) node->data);
g_print (" };");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]