Menu
▾
▴
[Opensync-commits] r1094 - trunk/libsyncml/dev_inf_api
|
From: <svn...@op...> - 2009-06-19 08:20:57
|
Author: bellmich Date: Fri Jun 19 10:20:50 2009 New Revision: 1094 URL: http://libsyncml.opensync.org/changeset/1094 Log: fixed size_t related handling API: uint => gsize internal: gsize => uint64 The problem is that G_TYPE_SIZE does not exist as normal property. Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.c trunk/libsyncml/dev_inf_api/sml_dev_inf_property.c trunk/libsyncml/dev_inf_api/sml_dev_inf_property.h Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.c ============================================================================== --- trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.c Fri Jun 19 10:09:09 2009 (r1093) +++ trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.c Fri Jun 19 10:20:50 2009 (r1094) @@ -294,7 +294,7 @@ * * */ -guint +gsize sml_dev_inf_prop_param_num_val_enums (SmlDevInfPropParam *self) { g_return_val_if_fail (SML_IS_DEV_INF_PROP_PARAM (self), 0); @@ -309,7 +309,7 @@ */ G_CONST_RETURN gchar* sml_dev_inf_prop_param_get_nth_val_enum (SmlDevInfPropParam *self, - guint n) + gsize n) { g_return_val_if_fail (SML_IS_DEV_INF_PROP_PARAM (self), NULL); return (gchar *)g_list_nth_data(self->priv->val_enums, n); Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_property.c ============================================================================== --- trunk/libsyncml/dev_inf_api/sml_dev_inf_property.c Fri Jun 19 10:09:09 2009 (r1093) +++ trunk/libsyncml/dev_inf_api/sml_dev_inf_property.c Fri Jun 19 10:20:50 2009 (r1094) @@ -41,10 +41,10 @@ struct _SmlDevInfPropertyPrivate { gchar* prop_name; - guint size; + gsize size; gchar* data_type; - guint max_occur; - guint max_size; + gsize max_occur; + gsize max_size; gboolean no_truncate; gchar* display_name; GList* val_enums; @@ -182,13 +182,13 @@ */ g_object_class_install_property (object_class, PROP_SIZE, - g_param_spec_uint ("Size", - "", - "", - 0, - G_MAXUINT, - 0, - G_PARAM_READWRITE)); + g_param_spec_uint64 ("Size", + "", + "", + 0, + G_MAXUINT64, + 0, + G_PARAM_READWRITE)); /** * SmlDevInfProperty:DataType: * @@ -208,13 +208,13 @@ */ g_object_class_install_property (object_class, PROP_MAX_OCCUR, - g_param_spec_uint ("MaxOccur", - "", - "", - 0, - G_MAXUINT, - 0, - G_PARAM_READWRITE)); + g_param_spec_uint64 ("MaxOccur", + "", + "", + 0, + G_MAXUINT64, + 0, + G_PARAM_READWRITE)); /** * SmlDevInfProperty:MaxSize: * @@ -222,13 +222,13 @@ */ g_object_class_install_property (object_class, PROP_MAX_SIZE, - g_param_spec_uint ("MaxSize", - "", - "", - 0, - G_MAXUINT, - 0, - G_PARAM_READWRITE)); + g_param_spec_uint64 ("MaxSize", + "", + "", + 0, + G_MAXUINT64, + 0, + G_PARAM_READWRITE)); /** * SmlDevInfProperty:NoTruncate: * @@ -325,7 +325,7 @@ const gchar* prop_name, GError **error) { - g_return_if_fail (SML_IS_DEV_INF_PROPERTY (self)); + g_return_val_if_fail (SML_IS_DEV_INF_PROPERTY (self), FALSE); g_free (self->priv->prop_name); self->priv->prop_name = g_strdup (prop_name); return TRUE; @@ -339,7 +339,7 @@ * * Return value: */ -guint +gsize sml_dev_inf_property_get_size (SmlDevInfProperty *self) { g_return_val_if_fail (SML_IS_DEV_INF_PROPERTY (self), 0); @@ -355,10 +355,10 @@ */ gboolean sml_dev_inf_property_set_size (SmlDevInfProperty *self, - guint size, + gsize size, GError **error) { - g_return_if_fail (SML_IS_DEV_INF_PROPERTY (self)); + g_return_val_if_fail (SML_IS_DEV_INF_PROPERTY (self), FALSE); if (0 < self->priv->max_size && self->priv->max_size < size) { *error = g_error_new(SML_ERROR, SML_ERROR_GENERIC, "The size must be lower than the maximum size."); return FALSE; @@ -394,7 +394,7 @@ const gchar* data_type, GError **error) { - g_return_if_fail (SML_IS_DEV_INF_PROPERTY (self)); + g_return_val_if_fail (SML_IS_DEV_INF_PROPERTY (self), FALSE); g_free (self->priv->data_type); self->priv->data_type = g_strdup (data_type); return TRUE; @@ -408,7 +408,7 @@ * * Return value: */ -guint +gsize sml_dev_inf_property_get_max_occur (SmlDevInfProperty *self) { g_return_val_if_fail (SML_IS_DEV_INF_PROPERTY (self), 0); @@ -424,7 +424,7 @@ */ void sml_dev_inf_property_set_max_occur (SmlDevInfProperty *self, - guint max_occur) + gsize max_occur) { g_return_if_fail (SML_IS_DEV_INF_PROPERTY (self)); self->priv->max_occur = max_occur; @@ -438,7 +438,7 @@ * * Return value: */ -guint +gsize sml_dev_inf_property_get_max_size (SmlDevInfProperty *self) { g_return_val_if_fail (SML_IS_DEV_INF_PROPERTY (self), 0); @@ -454,10 +454,10 @@ */ gboolean sml_dev_inf_property_set_max_size (SmlDevInfProperty *self, - guint max_size, + gsize max_size, GError **error) { - g_return_if_fail (SML_IS_DEV_INF_PROPERTY (self)); + g_return_val_if_fail (SML_IS_DEV_INF_PROPERTY (self), FALSE); if (0 < max_size && max_size < self->priv->size) { *error = g_error_new(SML_ERROR, SML_ERROR_GENERIC, "The maximum size must be greater than the size."); return FALSE; @@ -523,7 +523,7 @@ const gchar* display_name, GError **error) { - g_return_if_fail (SML_IS_DEV_INF_PROPERTY (self)); + g_return_val_if_fail (SML_IS_DEV_INF_PROPERTY (self), FALSE); g_free (self->priv->display_name); self->priv->display_name = g_strdup (display_name); return TRUE; @@ -535,7 +535,7 @@ * * */ -guint +gsize sml_dev_inf_property_num_val_enums (SmlDevInfProperty *self) { g_return_val_if_fail (SML_IS_DEV_INF_PROPERTY (self), 0); @@ -550,7 +550,7 @@ */ const gchar* sml_dev_inf_property_get_nth_val_enum (SmlDevInfProperty *self, - guint n) + gsize n) { g_return_val_if_fail (SML_IS_DEV_INF_PROPERTY (self), NULL); return (gchar *)g_list_nth_data(self->priv->val_enums, n); @@ -582,7 +582,7 @@ * * */ -guint +gsize sml_dev_inf_property_num_params (SmlDevInfProperty *self) { g_return_val_if_fail (SML_IS_DEV_INF_PROPERTY (self), 0); @@ -597,7 +597,7 @@ */ SmlDevInfPropParam* sml_dev_inf_property_get_nth_param (SmlDevInfProperty *self, - guint n) + gsize n) { g_return_val_if_fail (SML_IS_DEV_INF_PROPERTY (self), NULL); return (SmlDevInfPropParam *)g_list_nth_data(self->priv->params, n); Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_property.h ============================================================================== --- trunk/libsyncml/dev_inf_api/sml_dev_inf_property.h Fri Jun 19 10:09:09 2009 (r1093) +++ trunk/libsyncml/dev_inf_api/sml_dev_inf_property.h Fri Jun 19 10:20:50 2009 (r1094) @@ -56,23 +56,23 @@ SmlDevInfProperty* sml_dev_inf_property_new (void); G_CONST_RETURN gchar* sml_dev_inf_property_get_prop_name (SmlDevInfProperty *self); gboolean sml_dev_inf_property_set_prop_name (SmlDevInfProperty *self, const gchar* prop_name, GError **error); -guint sml_dev_inf_property_get_size (SmlDevInfProperty *self); -gboolean sml_dev_inf_property_set_size (SmlDevInfProperty *self, guint size, GError **error); +gsize sml_dev_inf_property_get_size (SmlDevInfProperty *self); +gboolean sml_dev_inf_property_set_size (SmlDevInfProperty *self, gsize size, GError **error); G_CONST_RETURN gchar* sml_dev_inf_property_get_data_type (SmlDevInfProperty *self); gboolean sml_dev_inf_property_set_data_type (SmlDevInfProperty *self, const gchar* data_type, GError **error); -guint sml_dev_inf_property_get_max_occur (SmlDevInfProperty *self); -void sml_dev_inf_property_set_max_occur (SmlDevInfProperty *self, guint max_occur); -guint sml_dev_inf_property_get_max_size (SmlDevInfProperty *self); -gboolean sml_dev_inf_property_set_max_size (SmlDevInfProperty *self, guint max_size, GError **error); +gsize sml_dev_inf_property_get_max_occur (SmlDevInfProperty *self); +void sml_dev_inf_property_set_max_occur (SmlDevInfProperty *self, gsize max_occur); +gsize sml_dev_inf_property_get_max_size (SmlDevInfProperty *self); +gboolean sml_dev_inf_property_set_max_size (SmlDevInfProperty *self, gsize max_size, GError **error); gboolean sml_dev_inf_property_get_no_truncate (SmlDevInfProperty *self); void sml_dev_inf_property_set_no_truncate (SmlDevInfProperty *self, gboolean no_truncate); G_CONST_RETURN gchar* sml_dev_inf_property_get_display_name (SmlDevInfProperty *self); gboolean sml_dev_inf_property_set_display_name (SmlDevInfProperty *self, const gchar* display_name, GError **error); -guint sml_dev_inf_property_num_val_enums (SmlDevInfProperty *self); -G_CONST_RETURN gchar* sml_dev_inf_property_get_nth_val_enum (SmlDevInfProperty *self, guint n); +gsize sml_dev_inf_property_num_val_enums (SmlDevInfProperty *self); +G_CONST_RETURN gchar* sml_dev_inf_property_get_nth_val_enum (SmlDevInfProperty *self, gsize n); gboolean sml_dev_inf_property_add_val_enum (SmlDevInfProperty *self, const gchar* val_enum, GError **error); -guint sml_dev_inf_property_num_params (SmlDevInfProperty *self); -SmlDevInfPropParam* sml_dev_inf_property_get_nth_param (SmlDevInfProperty *self, guint n); +gsize sml_dev_inf_property_num_params (SmlDevInfProperty *self); +SmlDevInfPropParam* sml_dev_inf_property_get_nth_param (SmlDevInfProperty *self, gsize n); gboolean sml_dev_inf_property_add_param (SmlDevInfProperty *self, SmlDevInfPropParam *param, GError **error); G_END_DECLS |
