From 3a8e2cbf80e97277765156f26b9a7d6b7f20fd89 Mon Sep 17 00:00:00 2001 From: Damien Laniel Date: Tue, 10 Apr 2007 13:59:28 +0000 Subject: renaming + removed some useless casts --- lasso/id-wsf-2.0/discovery.c | 8 +- lasso/xml/id-wsf-2.0/Makefile.am | 4 +- lasso/xml/id-wsf-2.0/disco_endpoint_context.c | 2 +- lasso/xml/id-wsf-2.0/disco_service_context.c | 2 +- lasso/xml/id-wsf-2.0/disco_service_metadata.c | 2 +- .../id-wsf-2.0/disco_service_metadata_register.c | 109 --------------------- .../id-wsf-2.0/disco_service_metadata_register.h | 72 -------------- lasso/xml/id-wsf-2.0/disco_svc_md_register.c | 109 +++++++++++++++++++++ lasso/xml/id-wsf-2.0/disco_svc_md_register.h | 72 ++++++++++++++ lasso/xml/id-wsf-2.0/soap_binding_framework.c | 2 +- 10 files changed, 191 insertions(+), 191 deletions(-) delete mode 100644 lasso/xml/id-wsf-2.0/disco_service_metadata_register.c delete mode 100644 lasso/xml/id-wsf-2.0/disco_service_metadata_register.h create mode 100644 lasso/xml/id-wsf-2.0/disco_svc_md_register.c create mode 100644 lasso/xml/id-wsf-2.0/disco_svc_md_register.h diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c index cf8af8e0..a8d72777 100644 --- a/lasso/id-wsf-2.0/discovery.c +++ b/lasso/id-wsf-2.0/discovery.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include @@ -98,14 +98,14 @@ gint lasso_idwsf2_discovery_init_metadata_register(LassoIdwsf2Discovery *discovery, gchar *service_type, gchar *abstract, gchar *disco_provider_id) { - LassoDiscoServiceMetadataRegister *metadata_register; + LassoDiscoSvcMDRegister *metadata_register; /* Get the providerId of this SP */ LassoProvider *provider = LASSO_PROVIDER(LASSO_WSF2_PROFILE(discovery)->server); - gchar *sp_provider_id = provider->providerId; + gchar *sp_provider_id = provider->ProviderID; /* Get a MetadataRegister node */ - metadata_register = lasso_disco_service_metadata_register_new( + metadata_register = lasso_disco_svc_md_register_new( service_type, abstract, sp_provider_id); if (metadata_register == NULL) { diff --git a/lasso/xml/id-wsf-2.0/Makefile.am b/lasso/xml/id-wsf-2.0/Makefile.am index 2f9394cb..2a537e9e 100644 --- a/lasso/xml/id-wsf-2.0/Makefile.am +++ b/lasso/xml/id-wsf-2.0/Makefile.am @@ -15,7 +15,7 @@ liblasso_xml_id_wsf2_la_SOURCES = \ disco_query_response.c \ disco_service_context.c \ disco_service_metadata.c \ - disco_service_metadata_register.c \ + disco_svc_md_register.c \ soap_binding_framework.c liblassoinclude_HEADERS = \ @@ -25,5 +25,5 @@ liblassoinclude_HEADERS = \ disco_query_response.h \ disco_service_context.h \ disco_service_metadata.h \ - disco_service_metadata_register.h \ + disco_svc_md_register.h \ soap_binding_framework.h diff --git a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c index ccd31568..edd708d5 100644 --- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c +++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c @@ -118,5 +118,5 @@ lasso_disco_endpoint_context_new(gchar *address) context->Address = g_strdup(address); //context->Framework = g_object_ref(lasso_soap_binding_framework_new("2.0")); - return LASSO_NODE(context); + return context; } diff --git a/lasso/xml/id-wsf-2.0/disco_service_context.c b/lasso/xml/id-wsf-2.0/disco_service_context.c index a375046f..99cf6dd4 100644 --- a/lasso/xml/id-wsf-2.0/disco_service_context.c +++ b/lasso/xml/id-wsf-2.0/disco_service_context.c @@ -111,5 +111,5 @@ lasso_disco_service_context_new(gchar *serviceType, LassoDiscoEndpointContext *e context->ServiceType = g_strdup(serviceType); context->EndpointContext = g_object_ref(endpointContext); - return LASSO_NODE(context); + return context; } diff --git a/lasso/xml/id-wsf-2.0/disco_service_metadata.c b/lasso/xml/id-wsf-2.0/disco_service_metadata.c index 13ca7303..f12d32a3 100644 --- a/lasso/xml/id-wsf-2.0/disco_service_metadata.c +++ b/lasso/xml/id-wsf-2.0/disco_service_metadata.c @@ -122,5 +122,5 @@ lasso_disco_service_metadata_new(gchar *service_type, gchar *abstract, gchar *pr metadata->ServiceContext = g_object_ref(lasso_disco_service_context_new(service_type, endpoint_context)); - return LASSO_NODE(metadata); + return metadata; } diff --git a/lasso/xml/id-wsf-2.0/disco_service_metadata_register.c b/lasso/xml/id-wsf-2.0/disco_service_metadata_register.c deleted file mode 100644 index 7708bf3d..00000000 --- a/lasso/xml/id-wsf-2.0/disco_service_metadata_register.c +++ /dev/null @@ -1,109 +0,0 @@ -/* $Id: disco_service_metadata_register.c 2261 2005-01-27 23:41:05 $ - * - * Lasso - A free implementation of the Liberty Alliance specifications. - * - * Copyright (C) 2004, 2005 Entr'ouvert - * http://lasso.entrouvert.org - * - * Authors: See AUTHORS file in top-level directory. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include - - -/* - * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd): - * - * - * - * - * - * - * - * - */ - -/*****************************************************************************/ -/* private methods */ -/*****************************************************************************/ - -static struct XmlSnippet schema_snippets[] = { - { "", SNIPPET_LIST_NODES, - G_STRUCT_OFFSET(LassoDiscoServiceMetadataRegister, metadata_list) }, - { NULL, 0, 0} -}; - -/*****************************************************************************/ -/* instance and class init functions */ -/*****************************************************************************/ - -static void -instance_init(LassoDiscoServiceMetadataRegister *node) -{ - node->metadata_list = NULL; -} - -static void -class_init(LassoDiscoServiceMetadataRegisterClass *klass) -{ - LassoNodeClass *nclass = LASSO_NODE_CLASS(klass); - - nclass->node_data = g_new0(LassoNodeClassData, 1); - lasso_node_class_set_nodename(nclass, "SvcMDRegister"); - lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX); - lasso_node_class_add_snippets(nclass, schema_snippets); -} - -GType -lasso_disco_service_metadata_register_get_type() -{ - static GType this_type = 0; - - if (!this_type) { - static const GTypeInfo this_info = { - sizeof (LassoDiscoServiceMetadataRegisterClass), - NULL, - NULL, - (GClassInitFunc) class_init, - NULL, - NULL, - sizeof(LassoDiscoServiceMetadataRegister), - 0, - (GInstanceInitFunc) instance_init, - }; - - this_type = g_type_register_static(LASSO_TYPE_NODE, - "LassoDiscoServiceMetadataRegister", &this_info, 0); - } - return this_type; -} - -LassoDiscoServiceMetadataRegister* -lasso_disco_service_metadata_register_new(gchar *service_type, gchar *abstract, gchar *provider_id) -{ - LassoDiscoServiceMetadataRegister *metadata_register; - LassoDiscoServiceMetadata *metadata; - - metadata_register = g_object_new(LASSO_TYPE_DISCO_SERVICE_METADATA_REGISTER, NULL); - metadata = - g_object_ref(lasso_disco_service_metadata_new(service_type, abstract, provider_id)); - metadata_register->metadata_list = - g_list_append(metadata_register->metadata_list, metadata); - - return LASSO_NODE(metadata_register); -} diff --git a/lasso/xml/id-wsf-2.0/disco_service_metadata_register.h b/lasso/xml/id-wsf-2.0/disco_service_metadata_register.h deleted file mode 100644 index 15d62068..00000000 --- a/lasso/xml/id-wsf-2.0/disco_service_metadata_register.h +++ /dev/null @@ -1,72 +0,0 @@ -/* $Id: disco_service_metadata_register.h 2428 2005-03-10 08:13:36Z nclapies $ - * - * Lasso - A free implementation of the Liberty Alliance specifications. - * - * Copyright (C) 2004, 2005 Entr'ouvert - * http://lasso.entrouvert.org - * - * Authors: See AUTHORS file in top-level directory. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __LASSO_DISCO_SERVICE_METADATA_REGISTER_H__ -#define __LASSO_DISCO_SERVICE_METADATA_REGISTER_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include - -#define LASSO_TYPE_DISCO_SERVICE_METADATA_REGISTER (lasso_disco_service_metadata_register_get_type()) -#define LASSO_DISCO_SERVICE_METADATA_REGISTER(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_DISCO_SERVICE_METADATA_REGISTER, \ - LassoDiscoServiceMetadataRegister)) -#define LASSO_DISCO_SERVICE_METADATA_REGISTER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_DISCO_SERVICE_METADATA_REGISTER, \ - LassoDiscoServiceMetadataRegisterClass)) -#define LASSO_IS_DISCO_SERVICE_METADATA_REGISTER(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_DISCO_SERVICE_METADATA_REGISTER)) -#define LASSO_IS_DISCO_SERVICE_METADATA_REGISTER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_DISCO_SERVICE_METADATA_REGISTER)) -#define LASSO_DISCO_SERVICE_METADATA_REGISTER_GET_CLASS(o) \ - (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_DISCO_SERVICE_METADATA_REGISTER, \ - LassoDiscoServiceMetadataRegisterClass)) - -typedef struct _LassoDiscoServiceMetadataRegister LassoDiscoServiceMetadataRegister; -typedef struct _LassoDiscoServiceMetadataRegisterClass LassoDiscoServiceMetadataRegisterClass; - -struct _LassoDiscoServiceMetadataRegister { - LassoNode parent; - - /* elements */ - GList *metadata_list; -}; - -struct _LassoDiscoServiceMetadataRegisterClass { - LassoNodeClass parent; -}; - -LASSO_EXPORT GType lasso_disco_service_metadata_register_get_type(void); - -LASSO_EXPORT LassoDiscoServiceMetadataRegister* lasso_disco_service_metadata_register_new( - gchar *service_type, gchar *abstract, gchar *provider_id); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __LASSO_DISCO_SERVICE_METADATA_REGISTER_H__ */ diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register.c b/lasso/xml/id-wsf-2.0/disco_svc_md_register.c new file mode 100644 index 00000000..68773898 --- /dev/null +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register.c @@ -0,0 +1,109 @@ +/* $Id: disco_svc_md_register.c 2261 2005-01-27 23:41:05 $ + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004, 2005 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include + + +/* + * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd): + * + * + * + * + * + * + * + * + */ + +/*****************************************************************************/ +/* private methods */ +/*****************************************************************************/ + +static struct XmlSnippet schema_snippets[] = { + { "", SNIPPET_LIST_NODES, + G_STRUCT_OFFSET(LassoDiscoSvcMDRegister, metadata_list) }, + { NULL, 0, 0} +}; + +/*****************************************************************************/ +/* instance and class init functions */ +/*****************************************************************************/ + +static void +instance_init(LassoDiscoSvcMDRegister *node) +{ + node->metadata_list = NULL; +} + +static void +class_init(LassoDiscoSvcMDRegisterClass *klass) +{ + LassoNodeClass *nclass = LASSO_NODE_CLASS(klass); + + nclass->node_data = g_new0(LassoNodeClassData, 1); + lasso_node_class_set_nodename(nclass, "SvcMDRegister"); + lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX); + lasso_node_class_add_snippets(nclass, schema_snippets); +} + +GType +lasso_disco_svc_md_register_get_type() +{ + static GType this_type = 0; + + if (!this_type) { + static const GTypeInfo this_info = { + sizeof (LassoDiscoSvcMDRegisterClass), + NULL, + NULL, + (GClassInitFunc) class_init, + NULL, + NULL, + sizeof(LassoDiscoSvcMDRegister), + 0, + (GInstanceInitFunc) instance_init, + }; + + this_type = g_type_register_static(LASSO_TYPE_NODE, + "LassoDiscoSvcMDRegister", &this_info, 0); + } + return this_type; +} + +LassoDiscoSvcMDRegister* +lasso_disco_svc_md_register_new(gchar *service_type, gchar *abstract, gchar *provider_id) +{ + LassoDiscoSvcMDRegister *metadata_register; + LassoDiscoServiceMetadata *metadata; + + metadata_register = g_object_new(LASSO_TYPE_DISCO_SVC_MD_REGISTER, NULL); + metadata = + g_object_ref(lasso_disco_service_metadata_new(service_type, abstract, provider_id)); + metadata_register->metadata_list = + g_list_append(metadata_register->metadata_list, metadata); + + return metadata_register; +} diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register.h b/lasso/xml/id-wsf-2.0/disco_svc_md_register.h new file mode 100644 index 00000000..7b48344c --- /dev/null +++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register.h @@ -0,0 +1,72 @@ +/* $Id: disco_svc_md_register.h 2428 2005-03-10 08:13:36Z nclapies $ + * + * Lasso - A free implementation of the Liberty Alliance specifications. + * + * Copyright (C) 2004, 2005 Entr'ouvert + * http://lasso.entrouvert.org + * + * Authors: See AUTHORS file in top-level directory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __LASSO_DISCO_SVC_MD_REGISTER_H__ +#define __LASSO_DISCO_SVC_MD_REGISTER_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#include + +#define LASSO_TYPE_DISCO_SVC_MD_REGISTER (lasso_disco_svc_md_register_get_type()) +#define LASSO_DISCO_SVC_MD_REGISTER(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_DISCO_SVC_MD_REGISTER, \ + LassoDiscoSvcMDRegister)) +#define LASSO_DISCO_SVC_MD_REGISTER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_DISCO_SVC_MD_REGISTER, \ + LassoDiscoSvcMDRegisterClass)) +#define LASSO_IS_DISCO_SVC_MD_REGISTER(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_DISCO_SVC_MD_REGISTER)) +#define LASSO_IS_DISCO_SVC_MD_REGISTER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_DISCO_SVC_MD_REGISTER)) +#define LASSO_DISCO_SVC_MD_REGISTER_GET_CLASS(o) \ + (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_DISCO_SVC_MD_REGISTER, \ + LassoDiscoSvcMDRegisterClass)) + +typedef struct _LassoDiscoSvcMDRegister LassoDiscoSvcMDRegister; +typedef struct _LassoDiscoSvcMDRegisterClass LassoDiscoSvcMDRegisterClass; + +struct _LassoDiscoSvcMDRegister { + LassoNode parent; + + /* elements */ + GList *metadata_list; +}; + +struct _LassoDiscoSvcMDRegisterClass { + LassoNodeClass parent; +}; + +LASSO_EXPORT GType lasso_disco_svc_md_register_get_type(void); + +LASSO_EXPORT LassoDiscoSvcMDRegister* lasso_disco_svc_md_register_new( + gchar *service_type, gchar *abstract, gchar *provider_id); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __LASSO_DISCO_SVC_MD_REGISTER_H__ */ diff --git a/lasso/xml/id-wsf-2.0/soap_binding_framework.c b/lasso/xml/id-wsf-2.0/soap_binding_framework.c index 471367d8..f3a4f306 100644 --- a/lasso/xml/id-wsf-2.0/soap_binding_framework.c +++ b/lasso/xml/id-wsf-2.0/soap_binding_framework.c @@ -101,5 +101,5 @@ lasso_soap_binding_framework_new(gchar *version) //framework->Version = g_strdup(version); - return LASSO_NODE(framework); + return framework; } -- cgit