Menu
▾
▴
[Opensync-commits] r1092 - in trunk: libsyncml libsyncml/data_sync_api libsyncml/dev_inf_api libsyncml/parser tests
|
From: <svn...@op...> - 2009-06-18 09:16:33
|
Author: bellmich Date: Thu Jun 18 11:16:28 2009 New Revision: 1092 URL: http://libsyncml.opensync.org/changeset/1092 Log: - consolidated naming conventions - added license to new files Modified: trunk/libsyncml/data_sync_api/data_sync_devinf.c trunk/libsyncml/dev_inf_api/sml_dev_inf_content_type.c trunk/libsyncml/dev_inf_api/sml_dev_inf_content_type.h trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.c trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.h trunk/libsyncml/parser/sml_xml_assm.c trunk/libsyncml/parser/sml_xml_parse.c trunk/libsyncml/sml_devinf.h trunk/tests/check_dev_inf_prop_param.c Modified: trunk/libsyncml/data_sync_api/data_sync_devinf.c ============================================================================== --- trunk/libsyncml/data_sync_api/data_sync_devinf.c Wed Jun 17 18:07:47 2009 (r1091) +++ trunk/libsyncml/data_sync_api/data_sync_devinf.c Thu Jun 18 11:16:28 2009 (r1092) @@ -87,7 +87,7 @@ /* FIXME: missing error handling */ GError *gerror = NULL; - sml_dev_inf_prop_param_set_paramname(param, name, &gerror); + sml_dev_inf_prop_param_set_param_name(param, name, &gerror); smlDevInfPropertyAddPropParam(prop, param); smlTrace(TRACE_EXIT, "%s", __func__); @@ -153,12 +153,12 @@ smlDevInfCTCapSetVerCT(ctcap, "2.1"); _ADD_CTCAP_PROPERTY_BY_NAME("ADR") _ADD_PROPERTY_PARAM("TYPE") - sml_dev_inf_prop_param_add_valenum(param, "HOME", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "WORK", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "PARCEL", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "POSTAL", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "INTL", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "DOM", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "HOME", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "WORK", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "PARCEL", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "POSTAL", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "INTL", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "DOM", &gerror); _ADD_PROPERTY_PARAM("HOME"); _ADD_PROPERTY_PARAM("WORK"); _ADD_PROPERTY_PARAM("PARCEL"); @@ -171,24 +171,24 @@ _ADD_CTCAP_PROPERTY_BY_NAME_VALUE("END","VCARD") _ADD_CTCAP_PROPERTY_BY_NAME("EMAIL") _ADD_PROPERTY_PARAM("TYPE") - sml_dev_inf_prop_param_add_valenum(param, "INTERNET", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "INTERNET", &gerror); _ADD_PROPERTY_PARAM("INTERNET"); _ADD_CTCAP_PROPERTY_BY_NAME("FN") _ADD_CTCAP_PROPERTY_BY_NAME("GEO") _ADD_CTCAP_PROPERTY_BY_NAME("KEY") _ADD_PROPERTY_PARAM("TYPE") - sml_dev_inf_prop_param_add_valenum(param, "X509", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "PGP", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "X509", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "PGP", &gerror); _ADD_PROPERTY_PARAM("X509"); _ADD_PROPERTY_PARAM("PGP"); _ADD_CTCAP_PROPERTY_BY_NAME("LABEL") _ADD_PROPERTY_PARAM("TYPE") - sml_dev_inf_prop_param_add_valenum(param, "HOME", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "WORK", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "PARCEL", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "POSTAL", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "INTL", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "DOM", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "HOME", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "WORK", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "PARCEL", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "POSTAL", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "INTL", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "DOM", &gerror); _ADD_PROPERTY_PARAM("HOME"); _ADD_PROPERTY_PARAM("WORK"); _ADD_PROPERTY_PARAM("PARCEL"); @@ -197,7 +197,7 @@ _ADD_PROPERTY_PARAM("DOM"); _ADD_CTCAP_PROPERTY_BY_NAME("LOGO") _ADD_PROPERTY_PARAM("TYPE") - sml_dev_inf_prop_param_add_valenum(param, "JPEG", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "JPEG", &gerror); _ADD_PROPERTY_PARAM("JPEG"); _ADD_CTCAP_PROPERTY_BY_NAME("MAILER") _ADD_CTCAP_PROPERTY_BY_NAME("N") @@ -205,32 +205,32 @@ _ADD_CTCAP_PROPERTY_BY_NAME("ORG") _ADD_CTCAP_PROPERTY_BY_NAME("PHOTO") _ADD_PROPERTY_PARAM("TYPE") - sml_dev_inf_prop_param_add_valenum(param, "JPEG", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "JPEG", &gerror); _ADD_PROPERTY_PARAM("JPEG"); _ADD_CTCAP_PROPERTY_BY_NAME("REV") _ADD_CTCAP_PROPERTY_BY_NAME("ROLE") _ADD_CTCAP_PROPERTY_BY_NAME("SOUND") _ADD_PROPERTY_PARAM("TYPE") - sml_dev_inf_prop_param_add_valenum(param, "AIFF", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "PCM", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "WAVE", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "AIFF", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "PCM", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "WAVE", &gerror); _ADD_PROPERTY_PARAM("AIFF"); _ADD_PROPERTY_PARAM("PCM"); _ADD_PROPERTY_PARAM("WAVE"); _ADD_CTCAP_PROPERTY_BY_NAME("TEL") _ADD_PROPERTY_PARAM("TYPE") - sml_dev_inf_prop_param_add_valenum(param, "WORK", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "VOICE", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "PREF", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "PAGER", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "MSG", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "MODEM", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "ISDN", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "HOME", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "FAX", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "CELL", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "CAR", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "BBS", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "WORK", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "VOICE", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "PREF", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "PAGER", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "MSG", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "MODEM", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "ISDN", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "HOME", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "FAX", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "CELL", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "CAR", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "BBS", &gerror); _ADD_PROPERTY_PARAM("WORK"); _ADD_PROPERTY_PARAM("VOICE"); _ADD_PROPERTY_PARAM("PREF"); @@ -248,8 +248,8 @@ _ADD_CTCAP_PROPERTY_BY_NAME("UID") _ADD_CTCAP_PROPERTY_BY_NAME("URL") _ADD_PROPERTY_PARAM("TYPE") - sml_dev_inf_prop_param_add_valenum(param, "WORK", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "HOME", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "WORK", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "HOME", &gerror); _ADD_PROPERTY_PARAM("WORK"); _ADD_PROPERTY_PARAM("HOME"); _ADD_CTCAP_PROPERTY_BY_NAME_VALUE("VERSION", "2.1") @@ -280,16 +280,16 @@ _ADD_CTCAP_PROPERTY_BY_NAME("URL") _ADD_CTCAP_PROPERTY_BY_NAME("TEL") _ADD_PROPERTY_PARAM("TYPE") - sml_dev_inf_prop_param_add_valenum(param, "CELL", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "HOME", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "WORK", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "FAX", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "MODEM", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "VOICE", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "CELL", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "HOME", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "WORK", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "FAX", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "MODEM", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "VOICE", &gerror); _ADD_CTCAP_PROPERTY_BY_NAME("ADR") _ADD_PROPERTY_PARAM("TYPE") - sml_dev_inf_prop_param_add_valenum(param, "HOME", &gerror); - sml_dev_inf_prop_param_add_valenum(param, "WORK", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "HOME", &gerror); + sml_dev_inf_prop_param_add_val_enum(param, "WORK", &gerror); _ADD_CTCAP_PROPERTY_BY_NAME("BDAY") _ADD_CTCAP_PROPERTY_BY_NAME("NOTE") _ADD_CTCAP_PROPERTY_BY_NAME("PHOTO") Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_content_type.c ============================================================================== --- trunk/libsyncml/dev_inf_api/sml_dev_inf_content_type.c Wed Jun 17 18:07:47 2009 (r1091) +++ trunk/libsyncml/dev_inf_api/sml_dev_inf_content_type.c Thu Jun 18 11:16:28 2009 (r1092) @@ -1,4 +1,22 @@ -/* sml_dev_inf_content_type.c */ +/* sml_dev_inf_content_type.c + * + * Copyright (C) 2009 Michael Bell <mic...@op...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + */ #include "sml_dev_inf_content_type.h" Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_content_type.h ============================================================================== --- trunk/libsyncml/dev_inf_api/sml_dev_inf_content_type.h Wed Jun 17 18:07:47 2009 (r1091) +++ trunk/libsyncml/dev_inf_api/sml_dev_inf_content_type.h Thu Jun 18 11:16:28 2009 (r1092) @@ -1,4 +1,23 @@ -/* sml_dev_inf_content_type.h */ +/* sml_dev_inf_content_type.h + * + * Copyright (C) 2009 Michael Bell <mic...@op...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + */ + #ifndef __SML_DEV_INF_CONTENT_TYPE_H__ #define __SML_DEV_INF_CONTENT_TYPE_H__ Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.c ============================================================================== --- trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.c Wed Jun 17 18:07:47 2009 (r1091) +++ trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.c Thu Jun 18 11:16:28 2009 (r1092) @@ -1,4 +1,23 @@ -/* sml_dev_inf_prop_param.c */ +/* sml_dev_inf_prop_param.c + * + * Copyright (C) 2009 Michael Bell <mic...@op...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + */ + #include "sml_dev_inf_prop_param.h" #include <libsyncml/syncml.h> @@ -8,18 +27,18 @@ enum { PROP_0, - PROP_PARAMNAME, - PROP_DATATYPE, - PROP_DISPLAYNAME, - PROP_VALENUMS + PROP_PARAM_NAME, + PROP_DATA_TYPE, + PROP_DISPLAY_NAME, + PROP_VAL_ENUMS }; struct _SmlDevInfPropParamPrivate { - gchar* paramname; - gchar* datatype; - gchar* displayname; - GList* valenums; + gchar* param_name; + gchar* data_type; + gchar* display_name; + GList* val_enums; }; static void @@ -29,17 +48,17 @@ GParamSpec *pspec) { switch (property_id) { - case PROP_PARAMNAME: - g_value_set_string (value, SML_DEV_INF_PROP_PARAM (object)->priv->paramname); + case PROP_PARAM_NAME: + g_value_set_string (value, SML_DEV_INF_PROP_PARAM (object)->priv->param_name); break; - case PROP_DATATYPE: - g_value_set_string (value, SML_DEV_INF_PROP_PARAM (object)->priv->datatype); + case PROP_DATA_TYPE: + g_value_set_string (value, SML_DEV_INF_PROP_PARAM (object)->priv->data_type); break; - case PROP_DISPLAYNAME: - g_value_set_string (value, SML_DEV_INF_PROP_PARAM (object)->priv->displayname); + case PROP_DISPLAY_NAME: + g_value_set_string (value, SML_DEV_INF_PROP_PARAM (object)->priv->display_name); break; - case PROP_VALENUMS: - g_value_set_pointer (value, SML_DEV_INF_PROP_PARAM (object)->priv->valenums); + case PROP_VAL_ENUMS: + g_value_set_pointer (value, SML_DEV_INF_PROP_PARAM (object)->priv->val_enums); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -53,20 +72,20 @@ GParamSpec *pspec) { switch (property_id) { - case PROP_PARAMNAME: - g_free (SML_DEV_INF_PROP_PARAM (object)->priv->paramname); - SML_DEV_INF_PROP_PARAM (object)->priv->paramname = g_strdup (g_value_get_string (value)); + case PROP_PARAM_NAME: + g_free (SML_DEV_INF_PROP_PARAM (object)->priv->param_name); + SML_DEV_INF_PROP_PARAM (object)->priv->param_name = g_strdup (g_value_get_string (value)); break; - case PROP_DATATYPE: - g_free (SML_DEV_INF_PROP_PARAM (object)->priv->datatype); - SML_DEV_INF_PROP_PARAM (object)->priv->datatype = g_strdup (g_value_get_string (value)); + case PROP_DATA_TYPE: + g_free (SML_DEV_INF_PROP_PARAM (object)->priv->data_type); + SML_DEV_INF_PROP_PARAM (object)->priv->data_type = g_strdup (g_value_get_string (value)); break; - case PROP_DISPLAYNAME: - g_free (SML_DEV_INF_PROP_PARAM (object)->priv->displayname); - SML_DEV_INF_PROP_PARAM (object)->priv->displayname = g_strdup (g_value_get_string (value)); + case PROP_DISPLAY_NAME: + g_free (SML_DEV_INF_PROP_PARAM (object)->priv->display_name); + SML_DEV_INF_PROP_PARAM (object)->priv->display_name = g_strdup (g_value_get_string (value)); break; - case PROP_VALENUMS: - SML_DEV_INF_PROP_PARAM (object)->priv->valenums = (GList *) g_value_get_pointer(value); + case PROP_VAL_ENUMS: + SML_DEV_INF_PROP_PARAM (object)->priv->val_enums = (GList *) g_value_get_pointer(value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -77,13 +96,13 @@ sml_dev_inf_prop_param_finalize (GObject *object) { SmlDevInfPropParam *self = (SmlDevInfPropParam *) object; - g_free(self->priv->paramname); - g_free(self->priv->datatype); - g_free(self->priv->displayname); - while(self->priv->valenums) { - gchar *valenum = self->priv->valenums->data; - self->priv->valenums = g_list_remove(self->priv->valenums, valenum); - g_free(valenum); + g_free(self->priv->param_name); + g_free(self->priv->data_type); + g_free(self->priv->display_name); + while(self->priv->val_enums) { + gchar *val_enum = self->priv->val_enums->data; + self->priv->val_enums = g_list_remove(self->priv->val_enums, val_enum); + g_free(val_enum); } G_OBJECT_CLASS (sml_dev_inf_prop_param_parent_class)->finalize (object); } @@ -105,7 +124,7 @@ * The property. */ g_object_class_install_property (object_class, - PROP_PARAMNAME, + PROP_PARAM_NAME, g_param_spec_string ("ParamName", "", "", @@ -117,7 +136,7 @@ * The property. */ g_object_class_install_property (object_class, - PROP_DATATYPE, + PROP_DATA_TYPE, g_param_spec_string ("DataType", "", "", @@ -129,7 +148,7 @@ * The property. */ g_object_class_install_property (object_class, - PROP_DISPLAYNAME, + PROP_DISPLAY_NAME, g_param_spec_string ("DisplayName", "", "", @@ -141,7 +160,7 @@ * The property. */ g_object_class_install_property (object_class, - PROP_VALENUMS, + PROP_VAL_ENUMS, g_param_spec_pointer ("ValEnums", "", NULL, @@ -171,7 +190,7 @@ } /** - * sml_dev_inf_prop_param_get_paramname: + * sml_dev_inf_prop_param_get_param_name: * @self: A #SmlDevInfPropParam * * Gets the property. @@ -179,32 +198,32 @@ * Return value: */ G_CONST_RETURN gchar* -sml_dev_inf_prop_param_get_paramname (SmlDevInfPropParam *self) +sml_dev_inf_prop_param_get_param_name (SmlDevInfPropParam *self) { g_return_val_if_fail (SML_IS_DEV_INF_PROP_PARAM (self), NULL); - return self->priv->paramname; + return self->priv->param_name; } /** - * sml_dev_inf_prop_param_set_paramname: + * sml_dev_inf_prop_param_set_param_name: * @self: A #SmlDevInfPropParam * @paramname: * * Sets the property. */ gboolean -sml_dev_inf_prop_param_set_paramname (SmlDevInfPropParam *self, - const gchar* paramname, - GError **error) +sml_dev_inf_prop_param_set_param_name (SmlDevInfPropParam *self, + const gchar* param_name, + GError **error) { g_return_val_if_fail (SML_IS_DEV_INF_PROP_PARAM (self), FALSE); - g_free (self->priv->paramname); - self->priv->paramname = g_strdup (paramname); + g_free (self->priv->param_name); + self->priv->param_name = g_strdup (param_name); return TRUE; } /** - * sml_dev_inf_prop_param_get_datatype: + * sml_dev_inf_prop_param_get_data_type: * @self: A #SmlDevInfPropParam * * Gets the property. @@ -212,32 +231,32 @@ * Return value: */ G_CONST_RETURN gchar* -sml_dev_inf_prop_param_get_datatype (SmlDevInfPropParam *self) +sml_dev_inf_prop_param_get_data_type (SmlDevInfPropParam *self) { g_return_val_if_fail (SML_IS_DEV_INF_PROP_PARAM (self), NULL); - return self->priv->datatype; + return self->priv->data_type; } /** - * sml_dev_inf_prop_param_set_datatype: + * sml_dev_inf_prop_param_set_data_type: * @self: A #SmlDevInfPropParam * @datatype: * * Sets the property. */ gboolean -sml_dev_inf_prop_param_set_datatype (SmlDevInfPropParam *self, - const gchar* datatype, - GError **error) +sml_dev_inf_prop_param_set_data_type (SmlDevInfPropParam *self, + const gchar* data_type, + GError **error) { g_return_val_if_fail (SML_IS_DEV_INF_PROP_PARAM (self), FALSE); - g_free (self->priv->datatype); - self->priv->datatype = g_strdup (datatype); + g_free (self->priv->data_type); + self->priv->data_type = g_strdup (data_type); return TRUE; } /** - * sml_dev_inf_prop_param_get_displayname: + * sml_dev_inf_prop_param_get_display_name: * @self: A #SmlDevInfPropParam * * Gets the property. @@ -245,71 +264,71 @@ * Return value: */ G_CONST_RETURN gchar* -sml_dev_inf_prop_param_get_displayname (SmlDevInfPropParam *self) +sml_dev_inf_prop_param_get_display_name (SmlDevInfPropParam *self) { g_return_val_if_fail (SML_IS_DEV_INF_PROP_PARAM (self), NULL); - return self->priv->displayname; + return self->priv->display_name; } /** - * sml_dev_inf_prop_param_set_displayname: + * sml_dev_inf_prop_param_set_display_name: * @self: A #SmlDevInfPropParam * @displayname: * * Sets the property. */ gboolean -sml_dev_inf_prop_param_set_displayname (SmlDevInfPropParam *self, - const gchar* displayname, - GError **error) +sml_dev_inf_prop_param_set_display_name (SmlDevInfPropParam *self, + const gchar* display_name, + GError **error) { g_return_val_if_fail (SML_IS_DEV_INF_PROP_PARAM (self), FALSE); - g_free (self->priv->displayname); - self->priv->displayname = g_strdup (displayname); + g_free (self->priv->display_name); + self->priv->display_name = g_strdup (display_name); return TRUE; } /** - * sml_dev_inf_prop_param_num_valenums: + * sml_dev_inf_prop_param_num_val_enums: * @self: A #SmlDevInfPropParam * * */ guint -sml_dev_inf_prop_param_num_valenums (SmlDevInfPropParam *self) +sml_dev_inf_prop_param_num_val_enums (SmlDevInfPropParam *self) { g_return_val_if_fail (SML_IS_DEV_INF_PROP_PARAM (self), 0); - return g_list_length(self->priv->valenums); + return g_list_length(self->priv->val_enums); } /** - * sml_dev_inf_prop_param_get_nth_valenum: + * sml_dev_inf_prop_param_get_nth_val_enum: * @self: A #SmlDevInfPropParam * * */ G_CONST_RETURN gchar* -sml_dev_inf_prop_param_get_nth_valenum (SmlDevInfPropParam *self, +sml_dev_inf_prop_param_get_nth_val_enum (SmlDevInfPropParam *self, guint n) { g_return_val_if_fail (SML_IS_DEV_INF_PROP_PARAM (self), NULL); - return (gchar *)g_list_nth_data(self->priv->valenums, n); + return (gchar *)g_list_nth_data(self->priv->val_enums, n); } /** - * sml_dev_inf_prop_param_add_valenum: + * sml_dev_inf_prop_param_add_val_enum: * @self: A #SmlDevInfPropParam * * */ gboolean -sml_dev_inf_prop_param_add_valenum (SmlDevInfPropParam *self, - const gchar* valEnum, +sml_dev_inf_prop_param_add_val_enum (SmlDevInfPropParam *self, + const gchar* val_enum, GError **error) { g_return_val_if_fail (SML_IS_DEV_INF_PROP_PARAM (self), FALSE); - self->priv->valenums = g_list_append(self->priv->valenums, g_strdup(valEnum)); - if (!self->priv->valenums) { + self->priv->val_enums = g_list_append(self->priv->val_enums, g_strdup(val_enum)); + if (!self->priv->val_enums) { *error = g_error_new(SML_ERROR, SML_ERROR_GENERIC, "Cannot add ValEnum to ValEnum list of PropParam."); return FALSE; } Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.h ============================================================================== --- trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.h Wed Jun 17 18:07:47 2009 (r1091) +++ trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.h Thu Jun 18 11:16:28 2009 (r1092) @@ -1,4 +1,23 @@ -/* sml_dev_inf_prop_param.h */ +/* sml_dev_inf_prop_param.h + * + * Copyright (C) 2009 Michael Bell <mic...@op...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + */ + #ifndef __SML_DEV_INF_PROP_PARAM_H__ #define __SML_DEV_INF_PROP_PARAM_H__ @@ -34,15 +53,15 @@ GType sml_dev_inf_prop_param_get_type (void); SmlDevInfPropParam* sml_dev_inf_prop_param_new (void); -G_CONST_RETURN gchar* sml_dev_inf_prop_param_get_paramname (SmlDevInfPropParam *self); -gboolean sml_dev_inf_prop_param_set_paramname (SmlDevInfPropParam *self, const gchar* paramname, GError **error); -G_CONST_RETURN gchar* sml_dev_inf_prop_param_get_datatype (SmlDevInfPropParam *self); -gboolean sml_dev_inf_prop_param_set_datatype (SmlDevInfPropParam *self, const gchar* datatype, GError **error); -G_CONST_RETURN gchar* sml_dev_inf_prop_param_get_displayname (SmlDevInfPropParam *self); -gboolean sml_dev_inf_prop_param_set_displayname (SmlDevInfPropParam *self, const gchar* displayname, GError **error); -gsize sml_dev_inf_prop_param_num_valenums (SmlDevInfPropParam *self); -G_CONST_RETURN gchar* sml_dev_inf_prop_param_get_nth_valenum (SmlDevInfPropParam *self, gsize n); -gboolean sml_dev_inf_prop_param_add_valenum (SmlDevInfPropParam *self, const gchar* valEnum, GError **error); +G_CONST_RETURN gchar* sml_dev_inf_prop_param_get_param_name (SmlDevInfPropParam *self); +gboolean sml_dev_inf_prop_param_set_param_name (SmlDevInfPropParam *self, const gchar* param_name, GError **error); +G_CONST_RETURN gchar* sml_dev_inf_prop_param_get_data_type (SmlDevInfPropParam *self); +gboolean sml_dev_inf_prop_param_set_data_type (SmlDevInfPropParam *self, const gchar* data_type, GError **error); +G_CONST_RETURN gchar* sml_dev_inf_prop_param_get_display_name (SmlDevInfPropParam *self); +gboolean sml_dev_inf_prop_param_set_display_name (SmlDevInfPropParam *self, const gchar* display_name, GError **error); +gsize sml_dev_inf_prop_param_num_val_enums (SmlDevInfPropParam *self); +G_CONST_RETURN gchar* sml_dev_inf_prop_param_get_nth_val_enum (SmlDevInfPropParam *self, gsize n); +gboolean sml_dev_inf_prop_param_add_val_enum (SmlDevInfPropParam *self, const gchar* val_enum, GError **error); G_END_DECLS Modified: trunk/libsyncml/parser/sml_xml_assm.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_assm.c Wed Jun 17 18:07:47 2009 (r1091) +++ trunk/libsyncml/parser/sml_xml_assm.c Thu Jun 18 11:16:28 2009 (r1092) @@ -2163,26 +2163,26 @@ } // add ParamName - if (sml_dev_inf_prop_param_get_paramname(param) != NULL && - !_smlXmlAssemblerAddString(assm, SML_ELEMENT_PARAMNAME, sml_dev_inf_prop_param_get_paramname(param), error)) + if (sml_dev_inf_prop_param_get_param_name(param) != NULL && + !_smlXmlAssemblerAddString(assm, SML_ELEMENT_PARAMNAME, sml_dev_inf_prop_param_get_param_name(param), error)) goto error; // add DataType - if (sml_dev_inf_prop_param_get_datatype(param) != NULL && - !_smlXmlAssemblerAddString(assm, SML_ELEMENT_DATATYPE, sml_dev_inf_prop_param_get_datatype(param), error)) + if (sml_dev_inf_prop_param_get_data_type(param) != NULL && + !_smlXmlAssemblerAddString(assm, SML_ELEMENT_DATATYPE, sml_dev_inf_prop_param_get_data_type(param), error)) goto error; // add DisplayName - if (sml_dev_inf_prop_param_get_displayname(param) != NULL && - !_smlXmlAssemblerAddString(assm, SML_ELEMENT_DISPLAYNAME, sml_dev_inf_prop_param_get_displayname(param), error)) + if (sml_dev_inf_prop_param_get_display_name(param) != NULL && + !_smlXmlAssemblerAddString(assm, SML_ELEMENT_DISPLAYNAME, sml_dev_inf_prop_param_get_display_name(param), error)) goto error; // add values - guint length = sml_dev_inf_prop_param_num_valenums(param); + guint length = sml_dev_inf_prop_param_num_val_enums(param); guint n; for (n=0; n < length; n++) { - const char *valEnum = sml_dev_inf_prop_param_get_nth_valenum(param, n); + const char *valEnum = sml_dev_inf_prop_param_get_nth_val_enum(param, n); // add ValEnum if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_VALENUM, valEnum, error)) Modified: trunk/libsyncml/parser/sml_xml_parse.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_parse.c Wed Jun 17 18:07:47 2009 (r1091) +++ trunk/libsyncml/parser/sml_xml_parse.c Thu Jun 18 11:16:28 2009 (r1092) @@ -2744,7 +2744,7 @@ goto error; if (param != NULL) { GError *gerror = NULL; - if (!sml_dev_inf_prop_param_set_datatype(param, value, &gerror)) { + if (!sml_dev_inf_prop_param_set_data_type(param, value, &gerror)) { smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); g_error_free(gerror); goto error; @@ -2772,7 +2772,7 @@ goto error; if (param != NULL) { GError *gerror = NULL; - if (!sml_dev_inf_prop_param_set_displayname(param, value, &gerror)) { + if (!sml_dev_inf_prop_param_set_display_name(param, value, &gerror)) { smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); g_error_free(gerror); goto error; @@ -2785,7 +2785,7 @@ goto error; if (param != NULL) { GError *gerror = NULL; - if (!sml_dev_inf_prop_param_add_valenum(param, value, &gerror)) { + if (!sml_dev_inf_prop_param_add_val_enum(param, value, &gerror)) { smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); g_error_free(gerror); goto error; @@ -2807,7 +2807,7 @@ goto error; } GError *gerror = NULL; - sml_dev_inf_prop_param_set_paramname(param, value, &gerror); + sml_dev_inf_prop_param_set_param_name(param, value, &gerror); break; case SML_DEVINF_CTCAP_SIZE: smlDevInfPropertySetPropSize(property, atoi(value)); @@ -2892,16 +2892,16 @@ switch(type) { case SML_DEVINF_CTCAP_PARAMNAME: - sml_dev_inf_prop_param_set_paramname(param, value, &gerror); + sml_dev_inf_prop_param_set_param_name(param, value, &gerror); break; case SML_DEVINF_CTCAP_DATATYPE: - sml_dev_inf_prop_param_set_datatype(param, value, &gerror); + sml_dev_inf_prop_param_set_data_type(param, value, &gerror); break; case SML_DEVINF_CTCAP_DISPLAYNAME: - sml_dev_inf_prop_param_set_displayname(param, value, &gerror); + sml_dev_inf_prop_param_set_display_name(param, value, &gerror); break; case SML_DEVINF_CTCAP_VALENUM: - sml_dev_inf_prop_param_add_valenum(param, value, &gerror); + sml_dev_inf_prop_param_add_val_enum(param, value, &gerror); break; default: smlErrorSet(error, SML_ERROR_GENERIC, "Unknown CTCapType for PropParam: %s", elem_name); Modified: trunk/libsyncml/sml_devinf.h ============================================================================== --- trunk/libsyncml/sml_devinf.h Wed Jun 17 18:07:47 2009 (r1091) +++ trunk/libsyncml/sml_devinf.h Thu Jun 18 11:16:28 2009 (r1092) @@ -111,30 +111,6 @@ /* so we can generate SyncML 1.0, 1.1 and 1.2 devinf from this structure */ /* the CTCap will be assigned to a datastore if CTType and VerCT match */ -// /* PropParam stuff */ -// -// SmlDevInfPropParam *smlDevInfNewPropParam(SmlError **error); -// void smlDevInfPropParamSetParamName( // REQUIRED -// SmlDevInfPropParam *propParam, -// const char *paramName); -// void smlDevInfPropParamSetDataType( -// SmlDevInfPropParam *propParam, -// const char *dataType); -// void smlDevInfPropParamSetDisplayName( -// SmlDevInfPropParam *propParam, -// const char *displayName); -// void smlDevInfPropParamAddValEnum( -// SmlDevInfPropParam *propParam, -// const char *valEnum); -// -// char *smlDevInfPropParamGetParamName(const SmlDevInfPropParam *propParam); -// char *smlDevInfPropParamGetDataType(const SmlDevInfPropParam *propParam); -// char *smlDevInfPropParamGetDisplayName(const SmlDevInfPropParam *propParam); -// unsigned int smlDevInfPropParamNumValEnums(const SmlDevInfPropParam *propParam); -// char *smlDevInfPropParamGetNthValEnum( -// const SmlDevInfPropParam *propParam, -// unsigned int n); - /* Property stuff */ SmlDevInfProperty *smlDevInfNewProperty(SmlError **error); Modified: trunk/tests/check_dev_inf_prop_param.c ============================================================================== --- trunk/tests/check_dev_inf_prop_param.c Wed Jun 17 18:07:47 2009 (r1091) +++ trunk/tests/check_dev_inf_prop_param.c Thu Jun 18 11:16:28 2009 (r1092) @@ -41,21 +41,21 @@ SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, NULL); - sml_fail_unless(sml_dev_inf_prop_param_set_paramname(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_set_paramname(propParam, "", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_set_paramname(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - - sml_fail_unless(sml_dev_inf_prop_param_set_datatype(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_set_datatype(propParam, "", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_set_datatype(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - - sml_fail_unless(sml_dev_inf_prop_param_set_displayname(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_set_displayname(propParam, "", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_set_displayname(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - - sml_fail_unless(sml_dev_inf_prop_param_add_valenum(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_add_valenum(propParam, "", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_add_valenum(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, "", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + + sml_fail_unless(sml_dev_inf_prop_param_set_data_type(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_set_data_type(propParam, "", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_set_data_type(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + + sml_fail_unless(sml_dev_inf_prop_param_set_display_name(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_set_display_name(propParam, "", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_set_display_name(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, "", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, NULL, &error), "%s", error?error->message:"No GError set."); g_object_unref(propParam); } @@ -69,25 +69,25 @@ SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, NULL); - sml_fail_unless(sml_dev_inf_prop_param_get_paramname(propParam) == NULL, NULL); - sml_fail_unless(sml_dev_inf_prop_param_set_paramname(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_get_paramname(propParam) == NULL, NULL); - - sml_fail_unless(sml_dev_inf_prop_param_get_datatype(propParam) == NULL, NULL); - sml_fail_unless(sml_dev_inf_prop_param_set_datatype(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_get_datatype(propParam) == NULL, NULL); - - sml_fail_unless(sml_dev_inf_prop_param_get_displayname(propParam) == NULL, NULL); - sml_fail_unless(sml_dev_inf_prop_param_set_displayname(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_get_displayname(propParam) == NULL, NULL); - - sml_fail_unless(sml_dev_inf_prop_param_num_valenums(propParam) == 0, NULL); - sml_fail_unless(sml_dev_inf_prop_param_add_valenum(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_num_valenums(propParam) == 1, NULL); - sml_fail_unless(sml_dev_inf_prop_param_add_valenum(propParam, "", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_num_valenums(propParam) == 2, NULL); - sml_fail_unless(sml_dev_inf_prop_param_add_valenum(propParam, NULL, &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_num_valenums(propParam) == 3, NULL); + sml_fail_unless(sml_dev_inf_prop_param_get_param_name(propParam) == NULL, NULL); + sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_get_param_name(propParam) == NULL, NULL); + + sml_fail_unless(sml_dev_inf_prop_param_get_data_type(propParam) == NULL, NULL); + sml_fail_unless(sml_dev_inf_prop_param_set_data_type(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_get_data_type(propParam) == NULL, NULL); + + sml_fail_unless(sml_dev_inf_prop_param_get_display_name(propParam) == NULL, NULL); + sml_fail_unless(sml_dev_inf_prop_param_set_display_name(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_get_display_name(propParam) == NULL, NULL); + + sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 0, NULL); + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 1, NULL); + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, "", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 2, NULL); + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, NULL, &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 3, NULL); g_object_unref(propParam); } @@ -101,11 +101,11 @@ SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, NULL); - sml_fail_unless(sml_dev_inf_prop_param_set_paramname(propParam, "property parameter name", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_set_datatype(propParam, "property parameter data type", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_set_displayname(propParam, "property parameter display name", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_add_valenum(propParam, "property parameter first value of enumeration", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_add_valenum(propParam, "property parameter second value of enumeration", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, "property parameter name", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_set_data_type(propParam, "property parameter data type", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_set_display_name(propParam, "property parameter display name", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, "property parameter first value of enumeration", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, "property parameter second value of enumeration", &error), "%s", error?error->message:"No GError set."); g_object_unref(propParam); } @@ -119,34 +119,34 @@ SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, NULL); - sml_fail_unless(sml_dev_inf_prop_param_get_paramname(propParam) == NULL, NULL); - sml_fail_unless(sml_dev_inf_prop_param_set_paramname(propParam, "test_1", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_get_paramname(propParam) != NULL, NULL); - sml_fail_unless(strcmp(sml_dev_inf_prop_param_get_paramname(propParam), "test_1") == 0, NULL); - - sml_fail_unless(sml_dev_inf_prop_param_get_datatype(propParam) == NULL, NULL); - sml_fail_unless(sml_dev_inf_prop_param_set_datatype(propParam, "test_2", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_get_datatype(propParam) != NULL, NULL); - sml_fail_unless(strcmp(sml_dev_inf_prop_param_get_datatype(propParam), "test_2") == 0, NULL); - - sml_fail_unless(sml_dev_inf_prop_param_get_displayname(propParam) == NULL, NULL); - sml_fail_unless(sml_dev_inf_prop_param_set_displayname(propParam, "test_3", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_get_displayname(propParam) != NULL, NULL); - sml_fail_unless(strcmp(sml_dev_inf_prop_param_get_displayname(propParam), "test_3") == 0, NULL); - - sml_fail_unless(sml_dev_inf_prop_param_num_valenums(propParam) == 0, NULL); - - sml_fail_unless(sml_dev_inf_prop_param_add_valenum(propParam, "test_4", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_num_valenums(propParam) == 1, NULL); - sml_fail_unless(sml_dev_inf_prop_param_get_nth_valenum(propParam, 0) != NULL, NULL); - sml_fail_unless(strcmp(sml_dev_inf_prop_param_get_nth_valenum(propParam, 0), "test_4") ==0, NULL); - - sml_fail_unless(sml_dev_inf_prop_param_add_valenum(propParam, "test_5", &error), "%s", error?error->message:"No GError set."); - sml_fail_unless(sml_dev_inf_prop_param_num_valenums(propParam) == 2, NULL); - sml_fail_unless(sml_dev_inf_prop_param_get_nth_valenum(propParam, 0) != NULL, NULL); - sml_fail_unless(strcmp(sml_dev_inf_prop_param_get_nth_valenum(propParam, 0), "test_4") ==0, NULL); - sml_fail_unless(sml_dev_inf_prop_param_get_nth_valenum(propParam, 1) != NULL, NULL); - sml_fail_unless(strcmp(sml_dev_inf_prop_param_get_nth_valenum(propParam, 1), "test_5") ==0, NULL); + sml_fail_unless(sml_dev_inf_prop_param_get_param_name(propParam) == NULL, NULL); + sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, "test_1", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_get_param_name(propParam) != NULL, NULL); + sml_fail_unless(strcmp(sml_dev_inf_prop_param_get_param_name(propParam), "test_1") == 0, NULL); + + sml_fail_unless(sml_dev_inf_prop_param_get_data_type(propParam) == NULL, NULL); + sml_fail_unless(sml_dev_inf_prop_param_set_data_type(propParam, "test_2", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_get_data_type(propParam) != NULL, NULL); + sml_fail_unless(strcmp(sml_dev_inf_prop_param_get_data_type(propParam), "test_2") == 0, NULL); + + sml_fail_unless(sml_dev_inf_prop_param_get_display_name(propParam) == NULL, NULL); + sml_fail_unless(sml_dev_inf_prop_param_set_display_name(propParam, "test_3", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_get_display_name(propParam) != NULL, NULL); + sml_fail_unless(strcmp(sml_dev_inf_prop_param_get_display_name(propParam), "test_3") == 0, NULL); + + sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 0, NULL); + + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, "test_4", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 1, NULL); + sml_fail_unless(sml_dev_inf_prop_param_get_nth_val_enum(propParam, 0) != NULL, NULL); + sml_fail_unless(strcmp(sml_dev_inf_prop_param_get_nth_val_enum(propParam, 0), "test_4") ==0, NULL); + + sml_fail_unless(sml_dev_inf_prop_param_add_val_enum(propParam, "test_5", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_num_val_enums(propParam) == 2, NULL); + sml_fail_unless(sml_dev_inf_prop_param_get_nth_val_enum(propParam, 0) != NULL, NULL); + sml_fail_unless(strcmp(sml_dev_inf_prop_param_get_nth_val_enum(propParam, 0), "test_4") ==0, NULL); + sml_fail_unless(sml_dev_inf_prop_param_get_nth_val_enum(propParam, 1) != NULL, NULL); + sml_fail_unless(strcmp(sml_dev_inf_prop_param_get_nth_val_enum(propParam, 1), "test_5") ==0, NULL); g_object_unref(propParam); } @@ -159,15 +159,15 @@ GError *error = NULL; SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, "Cannot create SmlDevInfPropParam."); - sml_fail_unless(sml_dev_inf_prop_param_set_paramname(propParam, "test name", &error), "%s", error?error->message:"No GError set."); + sml_fail_unless(sml_dev_inf_prop_param_set_param_name(propParam, "test name", &error), "%s", error?error->message:"No GError set."); g_object_ref(propParam); - sml_fail_unless(sml_dev_inf_prop_param_get_paramname(propParam) != NULL, "The property parameter name was not set."); + sml_fail_unless(sml_dev_inf_prop_param_get_param_name(propParam) != NULL, "The property parameter name was not set."); g_object_unref(propParam); - sml_fail_unless(sml_dev_inf_prop_param_get_paramname(propParam) != NULL, "The property parameter name is already cleaned up."); + sml_fail_unless(sml_dev_inf_prop_param_get_param_name(propParam) != NULL, "The property parameter name is already cleaned up."); g_object_unref(propParam); } |
