← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libupnp4/trusty-updates

« back to all changes in this revision

Viewing changes to upnp/src/api/SubscriptionRequest.c

  • Committer: Bazaar Package Importer
  • Author(s): Nick Leverton
  • Date: 2010-05-14 15:34:11 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100514153411-h2tulw1n0ywxuz4w
Tags: 1.8.0~svn20100507-1
http://bugs.debian.org/573321
http://bugs.debian.org/581608
* New pull from upstream subversion
* Fixes to BSD build issues (Closes: #573321, FTBFS on Gnu/kFreeBSD)
* More debug tidying (07-neaten-debug.patch):
  - send UPNP_CRITICAL msgs to the info log as well as to the error log.
  - don't print HTTP headers to stdout as they're already in logfile.
* Always compile in logging code but don't log unless requested
  (12-debian-always-debug.patch) to help porting other apps.
* Remove patches 03, 04, 06, 08 and 10, now in upstream (note naming
  difference in upstream's string object accessors).
* Add $PTHREAD_CFLAGS to libupnp.pc as assumed by {acx,ax}_pthread.m4
  (patch 16, Closes: #581608).

Show diffs side-by-side

added added

removed removed

Lines of Context:
upnp/src/api/SubscriptionRequest.c
43
43
{
44
44
        struct SUpnpSubscriptionRequest *q = (struct SUpnpSubscriptionRequest *)p;
45
45
 
 
46
        if (!q) return;
 
47
 
46
48
        UpnpString_delete(q->m_serviceId);
47
49
        q->m_serviceId = NULL;
48
50
 
81
83
        return ((struct SUpnpSubscriptionRequest *)p)->m_serviceId;
82
84
}
83
85
 
 
86
const char *UpnpSubscriptionRequest_get_ServiceId_cstr(const UpnpSubscriptionRequest *p)
 
87
{
 
88
        return UpnpString_get_String(UpnpSubscriptionRequest_get_ServiceId(p));
 
89
}
 
90
 
84
91
 
85
92
void UpnpSubscriptionRequest_set_ServiceId(UpnpSubscriptionRequest *p, const UpnpString *s)
86
93
{
102
109
        return ((struct SUpnpSubscriptionRequest *)p)->m_UDN;
103
110
}
104
111
 
 
112
const char *UpnpSubscriptionRequest_get_UDN_cstr(const UpnpSubscriptionRequest *p)
 
113
{
 
114
        return UpnpString_get_String(UpnpSubscriptionRequest_get_UDN(p));
 
115
}
 
116
 
105
117
 
106
118
void UpnpSubscriptionRequest_set_UDN(UpnpSubscriptionRequest *p, const UpnpString *s)
107
119
{
123
135
        return ((struct SUpnpSubscriptionRequest *)p)->m_SID;
124
136
}
125
137
 
 
138
const char *UpnpSubscriptionRequest_get_SID_cstr(const UpnpSubscriptionRequest *p)
 
139
{
 
140
        return UpnpString_get_String(UpnpSubscriptionRequest_get_SID(p));
 
141
}
 
142
 
126
143
 
127
144
void UpnpSubscriptionRequest_set_SID(UpnpSubscriptionRequest *p, const UpnpString *s)
128
145
{