From c89f83497ebffe04c4c5447093ec2cad98bcaccb Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Sat, 14 Jun 2008 21:32:02 +0000 Subject: [PATCH] White spaces. git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@443 119443c7-1b9e-41f8-b6fc-b9c35fce742c --- upnp/inc/ActionComplete.h | 17 ++++++------- upnp/inc/ActionRequest.h | 11 ++++---- upnp/inc/Discovery.h | 41 +++++++++++++++--------------- upnp/inc/Event.h | 25 +++++++++--------- upnp/inc/EventSubscribe.h | 29 ++++++++++----------- upnp/inc/FileInfo.h | 31 +++++++++++----------- upnp/inc/StateVarComplete.h | 29 ++++++++++----------- upnp/inc/StateVarRequest.h | 37 +++++++++++++-------------- upnp/inc/SubscriptionRequest.h | 25 +++++++++--------- upnp/inc/UpnpString.h | 22 ++++++++-------- upnp/src/api/ActionComplete.c | 13 +++++----- upnp/src/api/ActionRequest.c | 25 +++++++++--------- upnp/src/api/Discovery.c | 27 ++++++++++---------- upnp/src/api/Event.c | 11 ++++---- upnp/src/api/EventSubscribe.c | 13 +++++----- upnp/src/api/FileInfo.c | 17 ++++++------- upnp/src/api/StateVarComplete.c | 13 +++++----- upnp/src/api/StateVarRequest.c | 21 ++++++++------- upnp/src/api/SubscriptionRequest.c | 11 ++++---- 19 files changed, 200 insertions(+), 218 deletions(-) diff --git a/upnp/inc/ActionComplete.h b/upnp/inc/ActionComplete.h index 3dd8533..eaf3d12 100644 --- a/upnp/inc/ActionComplete.h +++ b/upnp/inc/ActionComplete.h @@ -10,10 +10,15 @@ * \brief UpnpActionComplete object declararion. * * \author Marcelo Roberto Jimenez - * */ +/*! + * \brief The type of an UpnpActionComplete object. + */ +typedef struct s_UpnpActionComplete UpnpActionComplete; + + #include "ixml.h" /* for IXML_Document */ #include "UpnpGlobal.h" /* for EXPORT_SPEC */ #include "UpnpString.h" @@ -24,12 +29,6 @@ extern "C" { #endif /* __cplusplus */ -/*! - * \brief The type of an UpnpActionComplete object. - */ -typedef struct s_UpnpActionComplete UpnpActionComplete; - - /*! * \brief Constructor. * @@ -59,9 +58,9 @@ EXPORT_SPEC UpnpActionComplete *UpnpActionComplete_dup( */ EXPORT_SPEC void UpnpActionComplete_assign( /*! [in] \b this pointer. */ - UpnpActionComplete *q, + UpnpActionComplete *p, /*! [in] \b that pointer. */ - const UpnpActionComplete *p); + const UpnpActionComplete *q); /*! diff --git a/upnp/inc/ActionRequest.h b/upnp/inc/ActionRequest.h index c48b888..281f7b9 100644 --- a/upnp/inc/ActionRequest.h +++ b/upnp/inc/ActionRequest.h @@ -10,10 +10,13 @@ * \brief UpnpActionRequest object declaration. * * \author Marcelo Roberto Jimenez - * */ +/*! Returned as part of a \b UPNP_CONTROL_ACTION_COMPLETE callback. */ +typedef struct s_UpnpActionRequest UpnpActionRequest; + + #include "ixml.h" /* for IXML_Document */ #include "UpnpGlobal.h" /* for EXPORT_SPEC */ #include "UpnpInet.h" /* for sockaddr, sockaddr_storage */ @@ -25,10 +28,6 @@ extern "C" { #endif /* __cplusplus */ -/*! Returned as part of a \b UPNP_CONTROL_ACTION_COMPLETE callback. */ -typedef struct s_UpnpActionRequest UpnpActionRequest; - - /*! Constructor */ EXPORT_SPEC UpnpActionRequest *UpnpActionRequest_new(); @@ -39,7 +38,7 @@ EXPORT_SPEC void UpnpActionRequest_delete(UpnpActionRequest *p); EXPORT_SPEC UpnpActionRequest *UpnpActionRequest_dup(const UpnpActionRequest *p); /*! Assignment operator */ -EXPORT_SPEC void UpnpActionRequest_assign(UpnpActionRequest *q, const UpnpActionRequest *p); +EXPORT_SPEC void UpnpActionRequest_assign(UpnpActionRequest *p, const UpnpActionRequest *q); /*! The result of the operation */ EXPORT_SPEC int UpnpActionRequest_get_ErrCode(const UpnpActionRequest *p); diff --git a/upnp/inc/Discovery.h b/upnp/inc/Discovery.h index b48c362..af58e84 100644 --- a/upnp/inc/Discovery.h +++ b/upnp/inc/Discovery.h @@ -10,10 +10,13 @@ * \brief UpnpDiscovery object declararion. * * \author Marcelo Roberto Jimenez - * */ +/*! Returned in a \b UPNP_DISCOVERY_RESULT callback. */ +typedef struct s_UpnpDiscovery UpnpDiscovery; + + #include "UpnpGlobal.h" /* for EXPORT_SPEC */ #include "UpnpInet.h" /* for sockaddr, sockaddr_storage */ #include "UpnpString.h" @@ -24,74 +27,70 @@ extern "C" { #endif /* __cplusplus */ -/** Returned in a \b UPNP_DISCOVERY_RESULT callback. */ -typedef struct s_UpnpDiscovery UpnpDiscovery; - - -/** Constructor */ +/*! Constructor */ EXPORT_SPEC UpnpDiscovery *UpnpDiscovery_new(); -/** Destructor */ +/*! Destructor */ EXPORT_SPEC void UpnpDiscovery_delete(UpnpDiscovery *p); -/** Copy Constructor */ +/*! Copy Constructor */ EXPORT_SPEC UpnpDiscovery *UpnpDiscovery_dup(const UpnpDiscovery *p); -/** Assignment operator */ -EXPORT_SPEC void UpnpDiscovery_assign(UpnpDiscovery *q, const UpnpDiscovery *p); +/*! Assignment operator */ +EXPORT_SPEC void UpnpDiscovery_assign(UpnpDiscovery *p, const UpnpDiscovery *q); -/** The result code of the \b UpnpSearchAsync call. */ +/*! The result code of the \b UpnpSearchAsync call. */ EXPORT_SPEC int UpnpDiscovery_get_ErrCode(const UpnpDiscovery *p); EXPORT_SPEC void UpnpDiscovery_set_ErrCode(UpnpDiscovery *p, int n); -/** The expiration time of the advertisement. */ +/*! The expiration time of the advertisement. */ EXPORT_SPEC int UpnpDiscovery_get_Expires(const UpnpDiscovery *p); EXPORT_SPEC void UpnpDiscovery_set_Expires(UpnpDiscovery *p, int n); -/** The unique device identifier. */ +/*! The unique device identifier. */ EXPORT_SPEC const UpnpString *UpnpDiscovery_get_DeviceID(const UpnpDiscovery *p); EXPORT_SPEC void UpnpDiscovery_set_DeviceID(UpnpDiscovery *p, const UpnpString *s); EXPORT_SPEC void UpnpDiscovery_strcpy_DeviceID(UpnpDiscovery *p, const char *s); -/** The device type. */ +/*! The device type. */ EXPORT_SPEC const UpnpString *UpnpDiscovery_get_DeviceType(const UpnpDiscovery *p); EXPORT_SPEC void UpnpDiscovery_set_DeviceType(UpnpDiscovery *p, const UpnpString *s); EXPORT_SPEC void UpnpDiscovery_strcpy_DeviceType(UpnpDiscovery *p, const char *s); -/** The ServiceType. */ +/*! The ServiceType. */ EXPORT_SPEC const UpnpString *UpnpDiscovery_get_ServiceType(const UpnpDiscovery *p); EXPORT_SPEC void UpnpDiscovery_set_ServiceType(UpnpDiscovery *p, const UpnpString *s); EXPORT_SPEC void UpnpDiscovery_strcpy_ServiceType(UpnpDiscovery *p, const char *s); -/** The service version. */ +/*! The service version. */ EXPORT_SPEC const UpnpString *UpnpDiscovery_get_ServiceVer(const UpnpDiscovery *p); EXPORT_SPEC void UpnpDiscovery_set_ServiceVer(UpnpDiscovery *p, const UpnpString *s); EXPORT_SPEC void UpnpDiscovery_strcpy_ServiceVer(UpnpDiscovery *p, const char *s); -/** The URL to the UPnP description document for the device. */ +/*! The URL to the UPnP description document for the device. */ EXPORT_SPEC const UpnpString *UpnpDiscovery_get_Location(const UpnpDiscovery *p); EXPORT_SPEC void UpnpDiscovery_set_Location(UpnpDiscovery *p, const UpnpString *s); EXPORT_SPEC void UpnpDiscovery_strcpy_Location(UpnpDiscovery *p, const char *s); EXPORT_SPEC void UpnpDiscovery_strncpy_Location(UpnpDiscovery *p, const char *s, int n); -/** The operating system the device is running. */ +/*! The operating system the device is running. */ EXPORT_SPEC const UpnpString *UpnpDiscovery_get_Os(const UpnpDiscovery *p); EXPORT_SPEC void UpnpDiscovery_set_Os(UpnpDiscovery *p, const UpnpString *s); EXPORT_SPEC void UpnpDiscovery_strcpy_Os(UpnpDiscovery *p, const char *s); EXPORT_SPEC void UpnpDiscovery_strncpy_Os(UpnpDiscovery *p, const char *s, int n); -/** Date when the response was generated. */ +/*! Date when the response was generated. */ EXPORT_SPEC const UpnpString *UpnpDiscovery_get_Date(const UpnpDiscovery *p); EXPORT_SPEC void UpnpDiscovery_set_Date(UpnpDiscovery *p, const UpnpString *s); EXPORT_SPEC void UpnpDiscovery_strcpy_Date(UpnpDiscovery *p, const char *s); -/** Confirmation that the MAN header was understood by the device. */ +/*! Confirmation that the MAN header was understood by the device. */ EXPORT_SPEC const UpnpString *UpnpDiscovery_get_Ext(const UpnpDiscovery *p); EXPORT_SPEC void UpnpDiscovery_set_Ext(UpnpDiscovery *p, const UpnpString *s); EXPORT_SPEC void UpnpDiscovery_strcpy_Ext(UpnpDiscovery *p, const char *s); EXPORT_SPEC void UpnpDiscovery_strncpy_Ext(UpnpDiscovery *p, const char *s, int n); -/** The host address of the device responding to the search. */ +/*! The host address of the device responding to the search. */ EXPORT_SPEC struct sockaddr *UpnpDiscovery_get_DestAddr(const UpnpDiscovery *p); EXPORT_SPEC void UpnpDiscovery_set_DestAddr(UpnpDiscovery *p, struct sockaddr *sa); diff --git a/upnp/inc/Event.h b/upnp/inc/Event.h index aa50a78..e0bd835 100644 --- a/upnp/inc/Event.h +++ b/upnp/inc/Event.h @@ -10,10 +10,13 @@ * \brief UpnpEvent object declararion. * * \author Marcelo Roberto Jimenez - * */ +/*! Returned along with a \b UPNP_EVENT_RECEIVED callback. */ +typedef struct s_UpnpEvent UpnpEvent; + + #include "ixml.h" /* for IXML_Document */ #include "UpnpGlobal.h" /* for EXPORT_SPEC */ #include "UpnpString.h" @@ -24,31 +27,27 @@ extern "C" { #endif /* __cplusplus */ -/** Returned along with a \b UPNP_EVENT_RECEIVED callback. */ -typedef struct s_UpnpEvent UpnpEvent; - - -/** Constructor */ +/*! Constructor */ EXPORT_SPEC UpnpEvent *UpnpEvent_new(); -/** Destructor */ +/*! Destructor */ EXPORT_SPEC void UpnpEvent_delete(UpnpEvent *p); -/** Copy Constructor */ +/*! Copy Constructor */ EXPORT_SPEC UpnpEvent *UpnpEvent_dup(const UpnpEvent *p); -/** Assignment operator */ -EXPORT_SPEC void UpnpEvent_assign(UpnpEvent *q, const UpnpEvent *p); +/*! Assignment operator */ +EXPORT_SPEC void UpnpEvent_assign(UpnpEvent *p, const UpnpEvent *q); -/** The event sequence number. */ +/*! The event sequence number. */ EXPORT_SPEC int UpnpEvent_get_EventKey(const UpnpEvent *p); EXPORT_SPEC void UpnpEvent_set_EventKey(UpnpEvent *p, int n); -/** The DOM tree representing the changes generating the event. */ +/*! The DOM tree representing the changes generating the event. */ EXPORT_SPEC IXML_Document *UpnpEvent_get_ChangedVariables(const UpnpEvent *p); EXPORT_SPEC void UpnpEvent_set_ChangedVariables(UpnpEvent *p, IXML_Document *d); -/** The subscription ID for this subscription. */ +/*! The subscription ID for this subscription. */ EXPORT_SPEC UpnpString *UpnpEvent_get_SID(const UpnpEvent *p); EXPORT_SPEC void UpnpEvent_set_SID(UpnpEvent *p, const UpnpString *s); diff --git a/upnp/inc/EventSubscribe.h b/upnp/inc/EventSubscribe.h index 8f645c5..e0371ee 100644 --- a/upnp/inc/EventSubscribe.h +++ b/upnp/inc/EventSubscribe.h @@ -10,10 +10,14 @@ * \brief UpnpEventSubscribe object declararion. * * \author Marcelo Roberto Jimenez - * */ +/*! Returned along with a \b UPNP_EVENT_SUBSCRIBE_COMPLETE or + * \b UPNP_EVENT_UNSUBSCRIBE_COMPLETE callback. */ +typedef struct s_UpnpEventSubscribe UpnpEventSubscribe; + + #include "UpnpGlobal.h" /* for EXPORT_SPEC */ #include "UpnpString.h" @@ -23,32 +27,27 @@ extern "C" { #endif /* __cplusplus */ -/** Returned along with a \b UPNP_EVENT_SUBSCRIBE_COMPLETE or - * \b UPNP_EVENT_UNSUBSCRIBE_COMPLETE callback. */ -typedef struct s_UpnpEventSubscribe UpnpEventSubscribe; - - -/** Constructor */ +/*! Constructor */ EXPORT_SPEC UpnpEventSubscribe *UpnpEventSubscribe_new(); -/** Destructor */ +/*! Destructor */ EXPORT_SPEC void UpnpEventSubscribe_delete(UpnpEventSubscribe *p); -/** Copy Constructor */ +/*! Copy Constructor */ EXPORT_SPEC UpnpEventSubscribe *UpnpEventSubscribe_dup(const UpnpEventSubscribe *p); -/** Assignment operator */ -EXPORT_SPEC void UpnpEventSubscribe_assign(UpnpEventSubscribe *q, const UpnpEventSubscribe *p); +/*! Assignment operator */ +EXPORT_SPEC void UpnpEventSubscribe_assign(UpnpEventSubscribe *p, const UpnpEventSubscribe *q); -/** The result of the operation. */ +/*! The result of the operation. */ EXPORT_SPEC int UpnpEventSubscribe_get_ErrCode(const UpnpEventSubscribe *p); EXPORT_SPEC void UpnpEventSubscribe_set_ErrCode(UpnpEventSubscribe *p, int n); -/** The actual subscription time (for subscriptions only). */ +/*! The actual subscription time (for subscriptions only). */ EXPORT_SPEC int UpnpEventSubscribe_get_TimeOut(const UpnpEventSubscribe *p); EXPORT_SPEC void UpnpEventSubscribe_set_TimeOut(UpnpEventSubscribe *p, int n); -/** The SID for this subscription. For subscriptions, this only +/*! The SID for this subscription. For subscriptions, this only * contains a valid SID if the \b Upnp_EventSubscribe.result field * contains a \b UPNP_E_SUCCESS result code. For unsubscriptions, * this contains the SID from which the subscription is being @@ -58,7 +57,7 @@ EXPORT_SPEC void UpnpEventSubscribe_set_SID(UpnpEventSubscribe *p, const UpnpStr EXPORT_SPEC void UpnpEventSubscribe_strcpy_SID(UpnpEventSubscribe *p, const char *s); -/** The event URL being subscribed to or removed from. */ +/*! The event URL being subscribed to or removed from. */ EXPORT_SPEC const UpnpString *UpnpEventSubscribe_get_PublisherUrl(const UpnpEventSubscribe *p); EXPORT_SPEC void UpnpEventSubscribe_set_PublisherUrl(UpnpEventSubscribe *p, const UpnpString *s); EXPORT_SPEC void UpnpEventSubscribe_strcpy_PublisherUrl(UpnpEventSubscribe *p, const char *s); diff --git a/upnp/inc/FileInfo.h b/upnp/inc/FileInfo.h index b085e9b..bb3a9d9 100644 --- a/upnp/inc/FileInfo.h +++ b/upnp/inc/FileInfo.h @@ -10,10 +10,13 @@ * \brief UpnpFileInfo object declararion. * * \author Marcelo Roberto Jimenez - * */ +/*! Detailed description of this class should go here */ +typedef struct s_UpnpFileInfo UpnpFileInfo; + + #include "ixml.h" /* for DOMString */ #include "UpnpGlobal.h" /* for EXPORT_SPEC */ @@ -27,48 +30,44 @@ extern "C" { #endif /* __cplusplus */ -/** Detailed description of this class should go here */ -typedef struct s_UpnpFileInfo UpnpFileInfo; - - -/** Constructor */ +/*! Constructor */ EXPORT_SPEC UpnpFileInfo *UpnpFileInfo_new(); -/** Destructor */ +/*! Destructor */ EXPORT_SPEC void UpnpFileInfo_delete(UpnpFileInfo *p); -/** Copy Constructor */ +/*! Copy Constructor */ EXPORT_SPEC UpnpFileInfo *UpnpFileInfo_dup(const UpnpFileInfo *p); -/** Assignment operator */ -EXPORT_SPEC void UpnpFileInfo_assign(UpnpFileInfo *q, const UpnpFileInfo *p); +/*! Assignment operator */ +EXPORT_SPEC void UpnpFileInfo_assign(UpnpFileInfo *p, const UpnpFileInfo *q); -/** The length of the file. A length less than 0 indicates the size +/*! The length of the file. A length less than 0 indicates the size * is unknown, and data will be sent until 0 bytes are returned from * a read call. */ EXPORT_SPEC off_t UpnpFileInfo_get_FileLength(const UpnpFileInfo *p); EXPORT_SPEC void UpnpFileInfo_set_FileLength(UpnpFileInfo *p, off_t l); -/** The time at which the contents of the file was modified; +/*! The time at which the contents of the file was modified; * The time system is always local (not GMT). */ EXPORT_SPEC const time_t *UpnpFileInfo_get_LastModified(const UpnpFileInfo *p); EXPORT_SPEC void UpnpFileInfo_set_LastModified(UpnpFileInfo *p, const time_t *t); -/** If the file is a directory, \b is_directory contains +/*! If the file is a directory, \b is_directory contains * a non-zero value. For a regular file, it should be 0. */ EXPORT_SPEC int UpnpFileInfo_get_IsDirectory(const UpnpFileInfo *p); EXPORT_SPEC void UpnpFileInfo_set_IsDirectory(UpnpFileInfo *p, int b); -/** If the file or directory is readable, this contains +/*! If the file or directory is readable, this contains * a non-zero value. If unreadable, it should be set to 0. */ EXPORT_SPEC int UpnpFileInfo_get_IsReadable(const UpnpFileInfo *p); EXPORT_SPEC void UpnpFileInfo_set_IsReadable(UpnpFileInfo *p, int b); -/** The content type of the file. */ +/*! The content type of the file. */ EXPORT_SPEC const DOMString UpnpFileInfo_get_ContentType(const UpnpFileInfo *p); EXPORT_SPEC void UpnpFileInfo_set_ContentType(UpnpFileInfo *p, const DOMString s); -/** Additional HTTP headers to return. Each header line should be +/*! Additional HTTP headers to return. Each header line should be * followed by "\r\n". */ EXPORT_SPEC const DOMString UpnpFileInfo_get_ExtraHeaders(const UpnpFileInfo *p); EXPORT_SPEC void UpnpFileInfo_set_ExtraHeaders(UpnpFileInfo *p, const DOMString s); diff --git a/upnp/inc/StateVarComplete.h b/upnp/inc/StateVarComplete.h index c51a52a..6c379f7 100644 --- a/upnp/inc/StateVarComplete.h +++ b/upnp/inc/StateVarComplete.h @@ -10,10 +10,14 @@ * \brief UpnpStateVarComplete object declararion. * * \author Marcelo Roberto Jimenez - * */ +/*! Represents the reply for the current value of a state variable in an + * asynchronous call. */ +typedef struct s_UpnpStateVarComplete UpnpStateVarComplete; + + #include "ixml.h" /* for DOMString */ #include "UpnpGlobal.h" /* for EXPORT_SPEC */ #include "UpnpString.h" @@ -24,38 +28,33 @@ extern "C" { #endif /* __cplusplus */ -/** Represents the reply for the current value of a state variable in an - asynchronous call. */ -typedef struct s_UpnpStateVarComplete UpnpStateVarComplete; - - -/** Constructor */ +/*! Constructor */ EXPORT_SPEC UpnpStateVarComplete *UpnpStateVarComplete_new(); -/** Destructor */ +/*! Destructor */ EXPORT_SPEC void UpnpStateVarComplete_delete(UpnpStateVarComplete *p); -/** Copy Constructor */ +/*! Copy Constructor */ EXPORT_SPEC UpnpStateVarComplete *UpnpStateVarComplete_dup(const UpnpStateVarComplete *p); -/** Assignment operator */ -EXPORT_SPEC void UpnpStateVarComplete_assign(UpnpStateVarComplete *q, const UpnpStateVarComplete *p); +/*! Assignment operator */ +EXPORT_SPEC void UpnpStateVarComplete_assign(UpnpStateVarComplete *p, const UpnpStateVarComplete *q); -/** The result of the operation */ +/*! The result of the operation */ EXPORT_SPEC int UpnpStateVarComplete_get_ErrCode(const UpnpStateVarComplete *p); EXPORT_SPEC void UpnpStateVarComplete_set_ErrCode(UpnpStateVarComplete *p, int n); -/** The control URL for the service. */ +/*! The control URL for the service. */ EXPORT_SPEC const UpnpString *UpnpStateVarComplete_get_CtrlUrl(const UpnpStateVarComplete *p); EXPORT_SPEC void UpnpStateVarComplete_set_CtrlUrl(UpnpStateVarComplete *p, const UpnpString *s); EXPORT_SPEC void UpnpStateVarComplete_strcpy_CtrlUrl(UpnpStateVarComplete *p, const char *s); -/** The name of the variable. */ +/*! The name of the variable. */ EXPORT_SPEC const UpnpString *UpnpStateVarComplete_get_StateVarName(const UpnpStateVarComplete *p); EXPORT_SPEC void UpnpStateVarComplete_set_StateVarName(UpnpStateVarComplete *p, const UpnpString *s); EXPORT_SPEC void UpnpStateVarComplete_strcpy_StateVarName(UpnpStateVarComplete *p, const char *s); -/** The current value of the variable. This needs to be allocated by +/*! The current value of the variable. This needs to be allocated by * the caller. When finished with it, the SDK frees this \b DOMString. */ EXPORT_SPEC const DOMString UpnpStateVarComplete_get_CurrentVal(const UpnpStateVarComplete *p); EXPORT_SPEC void UpnpStateVarComplete_set_CurrentVal(UpnpStateVarComplete *p, const DOMString s); diff --git a/upnp/inc/StateVarRequest.h b/upnp/inc/StateVarRequest.h index 0ff4022..462417e 100644 --- a/upnp/inc/StateVarRequest.h +++ b/upnp/inc/StateVarRequest.h @@ -10,10 +10,14 @@ * \brief UpnpStateVarRequest object declararion. * * \author Marcelo Roberto Jimenez - * */ +/*! Represents the request for current value of a state variable in a service + * state table. */ +typedef struct s_UpnpStateVarRequest UpnpStateVarRequest; + + #include "ixml.h" /* for DOMString */ #include "UpnpGlobal.h" /* for EXPORT_SPEC */ #include "UpnpInet.h" /* for sockaddr, sockaddr_storage */ @@ -25,54 +29,49 @@ extern "C" { #endif /* __cplusplus */ -/** Represents the request for current value of a state variable in a service - * state table. */ -typedef struct s_UpnpStateVarRequest UpnpStateVarRequest; - - -/** Constructor */ +/*! Constructor */ EXPORT_SPEC UpnpStateVarRequest *UpnpStateVarRequest_new(); -/** Destructor */ +/*! Destructor */ EXPORT_SPEC void UpnpStateVarRequest_delete(UpnpStateVarRequest *p); -/** Copy Constructor */ +/*! Copy Constructor */ EXPORT_SPEC UpnpStateVarRequest *UpnpStateVarRequest_dup(const UpnpStateVarRequest *p); -/** Assignment operator */ -EXPORT_SPEC void UpnpStateVarRequest_assign(UpnpStateVarRequest *q, const UpnpStateVarRequest *p); +/*! Assignment operator */ +EXPORT_SPEC void UpnpStateVarRequest_assign(UpnpStateVarRequest *p, const UpnpStateVarRequest *q); -/** The result of the operation */ +/*! The result of the operation */ EXPORT_SPEC int UpnpStateVarRequest_get_ErrCode(const UpnpStateVarRequest *p); EXPORT_SPEC void UpnpStateVarRequest_set_ErrCode(UpnpStateVarRequest *p, int n); -/** The socket number of the connection to the requestor */ +/*! The socket number of the connection to the requestor */ EXPORT_SPEC int UpnpStateVarRequest_get_Socket(const UpnpStateVarRequest *p); EXPORT_SPEC void UpnpStateVarRequest_set_Socket(UpnpStateVarRequest *p, int n); -/** The error string in case of error */ +/*! The error string in case of error */ EXPORT_SPEC const UpnpString *UpnpStateVarRequest_get_ErrStr(const UpnpStateVarRequest *p); EXPORT_SPEC void UpnpStateVarRequest_set_ErrStr(UpnpStateVarRequest *p, const UpnpString *s); EXPORT_SPEC void UpnpStateVarRequest_strcpy_ErrStr(UpnpStateVarRequest *p, const char *s); -/** The unique device ID */ +/*! The unique device ID */ EXPORT_SPEC const UpnpString *UpnpStateVarRequest_get_DevUDN(const UpnpStateVarRequest *p); EXPORT_SPEC void UpnpStateVarRequest_set_DevUDN(UpnpStateVarRequest *p, const UpnpString *s); -/** The service ID */ +/*! The service ID */ EXPORT_SPEC const UpnpString *UpnpStateVarRequest_get_ServiceID(const UpnpStateVarRequest *p); EXPORT_SPEC void UpnpStateVarRequest_set_ServiceID(UpnpStateVarRequest *p, const UpnpString *s); -/** The name of the variable. */ +/*! The name of the variable. */ EXPORT_SPEC const UpnpString *UpnpStateVarRequest_get_StateVarName(const UpnpStateVarRequest *p); EXPORT_SPEC void UpnpStateVarRequest_set_StateVarName(UpnpStateVarRequest *p, const UpnpString *s); EXPORT_SPEC void UpnpStateVarRequest_strcpy_StateVarName(UpnpStateVarRequest *p, const char *s); -/** IP address of sender requesting the state variable. */ +/*! IP address of sender requesting the state variable. */ EXPORT_SPEC struct sockaddr *UpnpStateVarRequest_get_CtrlPtIPAddr(const UpnpStateVarRequest *p); EXPORT_SPEC void UpnpStateVarRequest_set_CtrlPtIPAddr(UpnpStateVarRequest *p, struct sockaddr *sa); -/** The current value of the variable. This needs to be allocated by +/*! The current value of the variable. This needs to be allocated by * the caller. When finished with it, the SDK frees this \b DOMString. */ EXPORT_SPEC const DOMString UpnpStateVarRequest_get_CurrentVal(const UpnpStateVarRequest *p); EXPORT_SPEC void UpnpStateVarRequest_set_CurrentVal(UpnpStateVarRequest *p, const DOMString s); diff --git a/upnp/inc/SubscriptionRequest.h b/upnp/inc/SubscriptionRequest.h index a0dcef0..3709ea3 100644 --- a/upnp/inc/SubscriptionRequest.h +++ b/upnp/inc/SubscriptionRequest.h @@ -10,10 +10,13 @@ * \brief UpnpSubscriptionRequest object declararion. * * \author Marcelo Roberto Jimenez - * */ +/*! Returned along with a \b UPNP_EVENT_SUBSCRIPTION_REQUEST callback. */ +typedef struct s_UpnpSubscriptionRequest UpnpSubscriptionRequest; + + #include "UpnpGlobal.h" /* for EXPORT_SPEC */ #include "UpnpString.h" @@ -23,33 +26,29 @@ extern "C" { #endif /* __cplusplus */ -/** Returned along with a \b UPNP_EVENT_SUBSCRIPTION_REQUEST callback. */ -typedef struct s_UpnpSubscriptionRequest UpnpSubscriptionRequest; - - -/** Constructor */ +/*! Constructor */ EXPORT_SPEC UpnpSubscriptionRequest *UpnpSubscriptionRequest_new(); -/** Destructor */ +/*! Destructor */ EXPORT_SPEC void UpnpSubscriptionRequest_delete(UpnpSubscriptionRequest *p); -/** Copy Constructor */ +/*! Copy Constructor */ EXPORT_SPEC UpnpSubscriptionRequest *UpnpSubscriptionRequest_dup(const UpnpSubscriptionRequest *p); -/** Assignment operator */ -EXPORT_SPEC void UpnpSubscriptionRequest_assign(UpnpSubscriptionRequest *q, const UpnpSubscriptionRequest *p); +/*! Assignment operator */ +EXPORT_SPEC void UpnpSubscriptionRequest_assign(UpnpSubscriptionRequest *p, const UpnpSubscriptionRequest *q); -/** The identifier for the service being subscribed to. */ +/*! The identifier for the service being subscribed to. */ EXPORT_SPEC const UpnpString *UpnpSubscriptionRequest_get_ServiceId(const UpnpSubscriptionRequest *p); EXPORT_SPEC void UpnpSubscriptionRequest_set_ServiceId(UpnpSubscriptionRequest *p, const UpnpString *s); EXPORT_SPEC void UpnpSubscriptionRequest_strcpy_ServiceId(UpnpSubscriptionRequest *p, const char *s); -/** Universal device name. */ +/*! Universal device name. */ EXPORT_SPEC const UpnpString *UpnpSubscriptionRequest_get_UDN(const UpnpSubscriptionRequest *p); EXPORT_SPEC void UpnpSubscriptionRequest_set_UDN(UpnpSubscriptionRequest *p, const UpnpString *s); EXPORT_SPEC void UpnpSubscriptionRequest_strcpy_UDN(UpnpSubscriptionRequest *p, const char *s); -/** The assigned subscription ID for this subscription. */ +/*! The assigned subscription ID for this subscription. */ EXPORT_SPEC const UpnpString *UpnpSubscriptionRequest_get_SID(const UpnpSubscriptionRequest *p); EXPORT_SPEC void UpnpSubscriptionRequest_set_SID(UpnpSubscriptionRequest *p, const UpnpString *s); EXPORT_SPEC void UpnpSubscriptionRequest_strcpy_SID(UpnpSubscriptionRequest *p, const char *s); diff --git a/upnp/inc/UpnpString.h b/upnp/inc/UpnpString.h index 710624b..0942f67 100644 --- a/upnp/inc/UpnpString.h +++ b/upnp/inc/UpnpString.h @@ -47,7 +47,7 @@ EXPORT_SPEC UpnpString *UpnpString_new(); * \brief Destructor. */ EXPORT_SPEC void UpnpString_delete( - /*! \em \b this pointer. */ + /*! [in] The \em \b this pointer. */ UpnpString *p); @@ -57,7 +57,7 @@ EXPORT_SPEC void UpnpString_delete( * \return A pointer to a new allocated copy of the original object. */ EXPORT_SPEC UpnpString *UpnpString_dup( - /*! \em \b this pointer. */ + /*! [in] The \em \b this pointer. */ const UpnpString *p); @@ -65,9 +65,9 @@ EXPORT_SPEC UpnpString *UpnpString_dup( * \brief Assignment operator. */ EXPORT_SPEC void UpnpString_assign( - /*! \em \b this pointer. */ + /*! [in] The \em \b this pointer. */ UpnpString *p, - /*! Pointer to the right hand side object. */ + /*! [in] The \em \b that pointer. */ const UpnpString *q); @@ -77,7 +77,7 @@ EXPORT_SPEC void UpnpString_assign( * \return The length of the string. * */ EXPORT_SPEC int UpnpString_get_Length( - /*! \em \b this pointer. */ + /*! [in] The \em \b this pointer. */ const UpnpString *p); @@ -87,7 +87,7 @@ EXPORT_SPEC int UpnpString_get_Length( * \return The pointer to char. */ EXPORT_SPEC const char *UpnpString_get_String( - /*! \em \b this pointer. */ + /*! [in] The \em \b this pointer. */ const UpnpString *p); @@ -95,9 +95,9 @@ EXPORT_SPEC const char *UpnpString_get_String( * \brief Sets the string from a pointer to char. */ EXPORT_SPEC void UpnpString_set_String( - /*! \em \b this pointer. */ + /*! [in] The \em \b this pointer. */ UpnpString *p, - /*! (char *) to copy from. */ + /*! [in] (char *) to copy from. */ const char *s); @@ -105,9 +105,9 @@ EXPORT_SPEC void UpnpString_set_String( * \brief Sets the string from a pointer to char using a maximum of N chars. */ EXPORT_SPEC void UpnpString_set_StringN( - /*! \em \b this pointer. */ + /*! [in] The \em \b this pointer. */ UpnpString *p, - /*! (char *) to copy from. */ + /*! [in] (char *) to copy from. */ const char *s, /*! Maximum number of chars to copy.*/ int n); @@ -117,7 +117,7 @@ EXPORT_SPEC void UpnpString_set_StringN( * \brief Clears the string, sets its size to zero. */ EXPORT_SPEC void UpnpString_clear( - /*! \em \b this pointer. */ + /*! [in] The \em \b this pointer. */ UpnpString *p); diff --git a/upnp/src/api/ActionComplete.c b/upnp/src/api/ActionComplete.c index 43c6afa..8a7f872 100644 --- a/upnp/src/api/ActionComplete.c +++ b/upnp/src/api/ActionComplete.c @@ -6,7 +6,6 @@ * \brief UpnpActionComplete object implementation. * * \author Marcelo Roberto Jimenez - * */ @@ -80,13 +79,13 @@ UpnpActionComplete *UpnpActionComplete_dup(const UpnpActionComplete *p) } -void UpnpActionComplete_assign(UpnpActionComplete *q, const UpnpActionComplete *p) +void UpnpActionComplete_assign(UpnpActionComplete *p, const UpnpActionComplete *q) { - if (q != p) { - UpnpActionComplete_set_ErrCode(q, UpnpActionComplete_get_ErrCode(p)); - UpnpActionComplete_set_CtrlUrl(q, UpnpActionComplete_get_CtrlUrl(p)); - UpnpActionComplete_set_ActionRequest(q, UpnpActionComplete_get_ActionRequest(p)); - UpnpActionComplete_set_ActionResult(q, UpnpActionComplete_get_ActionResult(p)); + if (p != q) { + UpnpActionComplete_set_ErrCode(p, UpnpActionComplete_get_ErrCode(q)); + UpnpActionComplete_set_CtrlUrl(p, UpnpActionComplete_get_CtrlUrl(q)); + UpnpActionComplete_set_ActionRequest(p, UpnpActionComplete_get_ActionRequest(q)); + UpnpActionComplete_set_ActionResult(p, UpnpActionComplete_get_ActionResult(q)); } } diff --git a/upnp/src/api/ActionRequest.c b/upnp/src/api/ActionRequest.c index b5a5339..2026a81 100644 --- a/upnp/src/api/ActionRequest.c +++ b/upnp/src/api/ActionRequest.c @@ -6,7 +6,6 @@ * \brief UpnpActionRequest object implementation. * * \author Marcelo Roberto Jimenez - * */ @@ -101,19 +100,19 @@ UpnpActionRequest *UpnpActionRequest_dup(const UpnpActionRequest *p) } -void UpnpActionRequest_assign(UpnpActionRequest *q, const UpnpActionRequest *p) +void UpnpActionRequest_assign(UpnpActionRequest *p, const UpnpActionRequest *q) { - if (q != p) { - UpnpActionRequest_set_ErrCode(q, UpnpActionRequest_get_ErrCode(p)); - UpnpActionRequest_set_Socket(q, UpnpActionRequest_get_Socket(p)); - UpnpActionRequest_set_ErrStr(q, UpnpActionRequest_get_ErrStr(p)); - UpnpActionRequest_set_ActionName(q, UpnpActionRequest_get_ActionName(p)); - UpnpActionRequest_set_DevUDN(q, UpnpActionRequest_get_DevUDN(p)); - UpnpActionRequest_set_ServiceID(q, UpnpActionRequest_get_ServiceID(p)); - UpnpActionRequest_set_ActionRequest(q, UpnpActionRequest_get_ActionRequest(p)); - UpnpActionRequest_set_ActionResult(q, UpnpActionRequest_get_ActionResult(p)); - UpnpActionRequest_set_CtrlPtIPAddr(q, UpnpActionRequest_get_CtrlPtIPAddr(p)); - UpnpActionRequest_set_SoapHeader(q, UpnpActionRequest_get_SoapHeader(p)); + if (p != q) { + UpnpActionRequest_set_ErrCode(p, UpnpActionRequest_get_ErrCode(q)); + UpnpActionRequest_set_Socket(p, UpnpActionRequest_get_Socket(q)); + UpnpActionRequest_set_ErrStr(p, UpnpActionRequest_get_ErrStr(q)); + UpnpActionRequest_set_ActionName(p, UpnpActionRequest_get_ActionName(q)); + UpnpActionRequest_set_DevUDN(p, UpnpActionRequest_get_DevUDN(q)); + UpnpActionRequest_set_ServiceID(p, UpnpActionRequest_get_ServiceID(q)); + UpnpActionRequest_set_ActionRequest(p, UpnpActionRequest_get_ActionRequest(q)); + UpnpActionRequest_set_ActionResult(p, UpnpActionRequest_get_ActionResult(q)); + UpnpActionRequest_set_CtrlPtIPAddr(p, UpnpActionRequest_get_CtrlPtIPAddr(q)); + UpnpActionRequest_set_SoapHeader(p, UpnpActionRequest_get_SoapHeader(q)); } } diff --git a/upnp/src/api/Discovery.c b/upnp/src/api/Discovery.c index 594d65b..dda4c74 100644 --- a/upnp/src/api/Discovery.c +++ b/upnp/src/api/Discovery.c @@ -6,7 +6,6 @@ * \brief UpnpDiscovery object implementation. * * \author Marcelo Roberto Jimenez - * */ @@ -108,20 +107,20 @@ UpnpDiscovery *UpnpDiscovery_dup(const UpnpDiscovery *p) } -void UpnpDiscovery_assign(UpnpDiscovery *q, const UpnpDiscovery *p) +void UpnpDiscovery_assign(UpnpDiscovery *p, const UpnpDiscovery *q) { - if (q != p) { - UpnpDiscovery_set_ErrCode(q, UpnpDiscovery_get_ErrCode(p)); - UpnpDiscovery_set_Expires(q, UpnpDiscovery_get_Expires(p)); - UpnpDiscovery_set_DeviceID(q, UpnpDiscovery_get_DeviceID(p)); - UpnpDiscovery_set_DeviceType(q, UpnpDiscovery_get_DeviceType(p)); - UpnpDiscovery_set_ServiceType(q, UpnpDiscovery_get_ServiceType(p)); - UpnpDiscovery_set_ServiceVer(q, UpnpDiscovery_get_ServiceVer(p)); - UpnpDiscovery_set_Location(q, UpnpDiscovery_get_Location(p)); - UpnpDiscovery_set_Os(q, UpnpDiscovery_get_Os(p)); - UpnpDiscovery_set_Date(q, UpnpDiscovery_get_Date(p)); - UpnpDiscovery_set_Ext(q, UpnpDiscovery_get_Ext(p)); - UpnpDiscovery_set_DestAddr(q, UpnpDiscovery_get_DestAddr(p)); + if (p != q) { + UpnpDiscovery_set_ErrCode(p, UpnpDiscovery_get_ErrCode(q)); + UpnpDiscovery_set_Expires(p, UpnpDiscovery_get_Expires(q)); + UpnpDiscovery_set_DeviceID(p, UpnpDiscovery_get_DeviceID(q)); + UpnpDiscovery_set_DeviceType(p, UpnpDiscovery_get_DeviceType(q)); + UpnpDiscovery_set_ServiceType(p, UpnpDiscovery_get_ServiceType(q)); + UpnpDiscovery_set_ServiceVer(p, UpnpDiscovery_get_ServiceVer(q)); + UpnpDiscovery_set_Location(p, UpnpDiscovery_get_Location(q)); + UpnpDiscovery_set_Os(p, UpnpDiscovery_get_Os(q)); + UpnpDiscovery_set_Date(p, UpnpDiscovery_get_Date(q)); + UpnpDiscovery_set_Ext(p, UpnpDiscovery_get_Ext(q)); + UpnpDiscovery_set_DestAddr(p, UpnpDiscovery_get_DestAddr(q)); } } diff --git a/upnp/src/api/Event.c b/upnp/src/api/Event.c index 2a7ed8d..c107abd 100644 --- a/upnp/src/api/Event.c +++ b/upnp/src/api/Event.c @@ -6,7 +6,6 @@ * \brief UpnpEvent object implementation. * * \author Marcelo Roberto Jimenez - * */ @@ -66,12 +65,12 @@ UpnpEvent *UpnpEvent_dup(const UpnpEvent *p) } -void UpnpEvent_assign(UpnpEvent *q, const UpnpEvent *p) +void UpnpEvent_assign(UpnpEvent *p, const UpnpEvent *q) { - if (q != p) { - UpnpEvent_set_EventKey(q, UpnpEvent_get_EventKey(p)); - UpnpEvent_set_ChangedVariables(q, UpnpEvent_get_ChangedVariables(p)); - UpnpEvent_set_SID(q, UpnpEvent_get_SID(p)); + if (p != q) { + UpnpEvent_set_EventKey(p, UpnpEvent_get_EventKey(q)); + UpnpEvent_set_ChangedVariables(p, UpnpEvent_get_ChangedVariables(q)); + UpnpEvent_set_SID(p, UpnpEvent_get_SID(q)); } } diff --git a/upnp/src/api/EventSubscribe.c b/upnp/src/api/EventSubscribe.c index bf41c51..40134b6 100644 --- a/upnp/src/api/EventSubscribe.c +++ b/upnp/src/api/EventSubscribe.c @@ -6,7 +6,6 @@ * \brief UpnpEventSubscribe object implementation. * * \author Marcelo Roberto Jimenez - * */ @@ -70,13 +69,13 @@ UpnpEventSubscribe *UpnpEventSubscribe_dup(const UpnpEventSubscribe *p) } -void UpnpEventSubscribe_assign(UpnpEventSubscribe *q, const UpnpEventSubscribe *p) +void UpnpEventSubscribe_assign(UpnpEventSubscribe *p, const UpnpEventSubscribe *q) { - if (q != p) { - UpnpEventSubscribe_set_ErrCode(q, UpnpEventSubscribe_get_ErrCode(p)); - UpnpEventSubscribe_set_TimeOut(q, UpnpEventSubscribe_get_TimeOut(p)); - UpnpEventSubscribe_set_SID(q, UpnpEventSubscribe_get_SID(p)); - UpnpEventSubscribe_set_PublisherUrl(q, UpnpEventSubscribe_get_PublisherUrl(p)); + if (p != q) { + UpnpEventSubscribe_set_ErrCode(p, UpnpEventSubscribe_get_ErrCode(q)); + UpnpEventSubscribe_set_TimeOut(p, UpnpEventSubscribe_get_TimeOut(q)); + UpnpEventSubscribe_set_SID(p, UpnpEventSubscribe_get_SID(q)); + UpnpEventSubscribe_set_PublisherUrl(p, UpnpEventSubscribe_get_PublisherUrl(q)); } } diff --git a/upnp/src/api/FileInfo.c b/upnp/src/api/FileInfo.c index b715bf6..1119142 100644 --- a/upnp/src/api/FileInfo.c +++ b/upnp/src/api/FileInfo.c @@ -6,7 +6,6 @@ * \brief UpnpFileInfo object implementation. * * \author Marcelo Roberto Jimenez - * */ @@ -80,15 +79,15 @@ UpnpFileInfo *UpnpFileInfo_dup(const UpnpFileInfo *p) } -void UpnpFileInfo_assign(UpnpFileInfo *q, const UpnpFileInfo *p) +void UpnpFileInfo_assign(UpnpFileInfo *p, const UpnpFileInfo *q) { - if (q != p) { - UpnpFileInfo_set_FileLength(q, UpnpFileInfo_get_FileLength(p)); - UpnpFileInfo_set_LastModified(q, UpnpFileInfo_get_LastModified(p)); - UpnpFileInfo_set_IsDirectory(q, UpnpFileInfo_get_IsDirectory(p)); - UpnpFileInfo_set_IsReadable(q, UpnpFileInfo_get_IsReadable(p)); - UpnpFileInfo_set_ContentType(q, UpnpFileInfo_get_ContentType(p)); - UpnpFileInfo_set_ExtraHeaders(q, UpnpFileInfo_get_ExtraHeaders(p)); + if (p != q) { + UpnpFileInfo_set_FileLength(p, UpnpFileInfo_get_FileLength(q)); + UpnpFileInfo_set_LastModified(p, UpnpFileInfo_get_LastModified(q)); + UpnpFileInfo_set_IsDirectory(p, UpnpFileInfo_get_IsDirectory(q)); + UpnpFileInfo_set_IsReadable(p, UpnpFileInfo_get_IsReadable(q)); + UpnpFileInfo_set_ContentType(p, UpnpFileInfo_get_ContentType(q)); + UpnpFileInfo_set_ExtraHeaders(p, UpnpFileInfo_get_ExtraHeaders(q)); } } diff --git a/upnp/src/api/StateVarComplete.c b/upnp/src/api/StateVarComplete.c index 6f80db8..cc24fa8 100644 --- a/upnp/src/api/StateVarComplete.c +++ b/upnp/src/api/StateVarComplete.c @@ -6,7 +6,6 @@ * \brief UpnpStateVarComplete object implementation. * * \author Marcelo Roberto Jimenez - * */ @@ -75,13 +74,13 @@ UpnpStateVarComplete *UpnpStateVarComplete_dup(const UpnpStateVarComplete *p) } -void UpnpStateVarComplete_assign(UpnpStateVarComplete *q, const UpnpStateVarComplete *p) +void UpnpStateVarComplete_assign(UpnpStateVarComplete *p, const UpnpStateVarComplete *q) { - if (q != p) { - UpnpStateVarComplete_set_ErrCode(q, UpnpStateVarComplete_get_ErrCode(p)); - UpnpStateVarComplete_set_CtrlUrl(q, UpnpStateVarComplete_get_CtrlUrl(p)); - UpnpStateVarComplete_set_StateVarName(q, UpnpStateVarComplete_get_StateVarName(p)); - UpnpStateVarComplete_set_CurrentVal(q, UpnpStateVarComplete_get_CurrentVal(p)); + if (p != q) { + UpnpStateVarComplete_set_ErrCode(p, UpnpStateVarComplete_get_ErrCode(q)); + UpnpStateVarComplete_set_CtrlUrl(p, UpnpStateVarComplete_get_CtrlUrl(q)); + UpnpStateVarComplete_set_StateVarName(p, UpnpStateVarComplete_get_StateVarName(q)); + UpnpStateVarComplete_set_CurrentVal(p, UpnpStateVarComplete_get_CurrentVal(q)); } } diff --git a/upnp/src/api/StateVarRequest.c b/upnp/src/api/StateVarRequest.c index cc10982..7ef1d8f 100644 --- a/upnp/src/api/StateVarRequest.c +++ b/upnp/src/api/StateVarRequest.c @@ -6,7 +6,6 @@ * \brief UpnpStateVarRequest object implementation. * * \author Marcelo Roberto Jimenez - * */ @@ -95,17 +94,17 @@ UpnpStateVarRequest *UpnpStateVarRequest_dup(const UpnpStateVarRequest *p) } -void UpnpStateVarRequest_assign(UpnpStateVarRequest *q, const UpnpStateVarRequest *p) +void UpnpStateVarRequest_assign(UpnpStateVarRequest *p, const UpnpStateVarRequest *q) { - if (q != p) { - UpnpStateVarRequest_set_ErrCode(q, UpnpStateVarRequest_get_ErrCode(p)); - UpnpStateVarRequest_set_Socket(q, UpnpStateVarRequest_get_Socket(p)); - UpnpStateVarRequest_set_ErrStr(q, UpnpStateVarRequest_get_ErrStr(p)); - UpnpStateVarRequest_set_StateVarName(q, UpnpStateVarRequest_get_StateVarName(p)); - UpnpStateVarRequest_set_DevUDN(q, UpnpStateVarRequest_get_DevUDN(p)); - UpnpStateVarRequest_set_ServiceID(q, UpnpStateVarRequest_get_ServiceID(p)); - UpnpStateVarRequest_set_CtrlPtIPAddr(q, UpnpStateVarRequest_get_CtrlPtIPAddr(p)); - UpnpStateVarRequest_set_CurrentVal(q, UpnpStateVarRequest_get_CurrentVal(p)); + if (p != q) { + UpnpStateVarRequest_set_ErrCode(p, UpnpStateVarRequest_get_ErrCode(q)); + UpnpStateVarRequest_set_Socket(p, UpnpStateVarRequest_get_Socket(q)); + UpnpStateVarRequest_set_ErrStr(p, UpnpStateVarRequest_get_ErrStr(q)); + UpnpStateVarRequest_set_StateVarName(p, UpnpStateVarRequest_get_StateVarName(q)); + UpnpStateVarRequest_set_DevUDN(p, UpnpStateVarRequest_get_DevUDN(q)); + UpnpStateVarRequest_set_ServiceID(p, UpnpStateVarRequest_get_ServiceID(q)); + UpnpStateVarRequest_set_CtrlPtIPAddr(p, UpnpStateVarRequest_get_CtrlPtIPAddr(q)); + UpnpStateVarRequest_set_CurrentVal(p, UpnpStateVarRequest_get_CurrentVal(q)); } } diff --git a/upnp/src/api/SubscriptionRequest.c b/upnp/src/api/SubscriptionRequest.c index 84fa503..6a6e27f 100644 --- a/upnp/src/api/SubscriptionRequest.c +++ b/upnp/src/api/SubscriptionRequest.c @@ -6,7 +6,6 @@ * \brief UpnpSubscriptionRequest object implementation. * * \author Marcelo Roberto Jimenez - * */ @@ -67,12 +66,12 @@ UpnpSubscriptionRequest *UpnpSubscriptionRequest_dup(const UpnpSubscriptionReque } -void UpnpSubscriptionRequest_assign(UpnpSubscriptionRequest *q, const UpnpSubscriptionRequest *p) +void UpnpSubscriptionRequest_assign(UpnpSubscriptionRequest *p, const UpnpSubscriptionRequest *q) { - if (q != p) { - UpnpSubscriptionRequest_set_ServiceId(q, UpnpSubscriptionRequest_get_ServiceId(p)); - UpnpSubscriptionRequest_set_UDN(q, UpnpSubscriptionRequest_get_UDN(p)); - UpnpSubscriptionRequest_set_SID(q, UpnpSubscriptionRequest_get_SID(p)); + if (p != q) { + UpnpSubscriptionRequest_set_ServiceId(p, UpnpSubscriptionRequest_get_ServiceId(q)); + UpnpSubscriptionRequest_set_UDN(p, UpnpSubscriptionRequest_get_UDN(q)); + UpnpSubscriptionRequest_set_SID(p, UpnpSubscriptionRequest_get_SID(q)); } }