sipwise
/
sems
mirror of https://github.com/sipwise/sems.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#57391 sems (CE): eliminate the `auto_ptr` usage (deprecated in C++11)

Browse Source 
Eliminate the `auto_ptr` usage for core/* ,
since this pointer type has been deprecated in C++11.
Use, as recommended, `unique_ptr` instead.

Change-Id: I352e03bd0c8401d9a4890d8a1845913e4c22dab3
mr11.4.1
Donat Zenichev 3 years ago
parent 84a0c3e84f
commit 13ff63532c
45 changed files with 90 additions and 91 deletions
Show Stats Download Patch File Download Diff File

2
apps/announcement/Announcement.h
Unescape View File

@ -63,7 +63,7 @@ class AnnouncementDialog : public AmSession,
AmAudioFile wav_file;
string filename;
std::auto_ptr<UACAuthCred> cred;
std::unique_ptr<UACAuthCred> cred;
public:
AnnouncementDialog(const string& filename,
UACAuthCred* credentials = NULL);

4
apps/annrecorder/AnnRecorder.h
Unescape View File

@ -88,7 +88,7 @@ class AnnRecorderDialog : public AmSession,
AmPromptCollection& prompts;
AmPlaylist playlist;
// we need only one separator in queue
auto_ptr<AmPlaylistSeparator> playlist_separator;
unique_ptr<AmPlaylistSeparator> playlist_separator;
AmAudioFile wav_file;
std::map<string, string> params;
@ -97,7 +97,7 @@ class AnnRecorderDialog : public AmSession,
AmDynInvoke* msg_storage;
std::auto_ptr<UACAuthCred> cred;
std::unique_ptr<UACAuthCred> cred;
enum AnnRecorderState {
S_WAIT_START,

4
apps/click2dial/Click2Dial.h
Unescape View File

@ -62,7 +62,7 @@ class C2DCallerDialog: public AmB2BCallerSession, public CredentialHolder
AmAudioFile wav_file;
string filename;
string callee_uri;
std::auto_ptr<UACAuthCred> cred;
std::unique_ptr<UACAuthCred> cred;
public:
@ -81,7 +81,7 @@ class C2DCallerDialog: public AmB2BCallerSession, public CredentialHolder
class C2DCalleeDialog : public AmB2BCalleeSession, public CredentialHolder
{
std::auto_ptr<UACAuthCred> cred;
std::unique_ptr<UACAuthCred> cred;
void setAuthHandler();
public:

2
apps/conference/Conference.cpp
Unescape View File

@ -382,7 +382,7 @@ AmSession* ConferenceFactory::onRefer(const AmSipRequest& req, const string& app
ConferenceDialog::ConferenceDialog(const string& conf_id,
AmConferenceChannel* dialout_channel)
: conf_id(conf_id),
channel(0),
channel(nullptr),
play_list(this),
dialout_channel(dialout_channel),
state(CS_normal),

16
apps/conference/Conference.h
Unescape View File

@ -105,22 +105,22 @@ class ConferenceDialog : public AmSession
{
AmPlaylist play_list;
auto_ptr<AmAudioFile> LonelyUserFile;
auto_ptr<AmAudioFile> JoinSound;
auto_ptr<AmAudioFile> DropSound;
auto_ptr<AmRingTone> RingTone;
auto_ptr<AmRingTone> ErrorTone;
unique_ptr<AmAudioFile> LonelyUserFile;
unique_ptr<AmAudioFile> JoinSound;
unique_ptr<AmAudioFile> DropSound;
unique_ptr<AmRingTone> RingTone;
unique_ptr<AmRingTone> ErrorTone;
string conf_id;
auto_ptr<AmConferenceChannel> channel;
unique_ptr<AmConferenceChannel> channel;
int state;
string dtmf_seq;
bool dialedout;
string dialout_suffix;
string dialout_id;
auto_ptr<AmConferenceChannel> dialout_channel;
unique_ptr<AmConferenceChannel> dialout_channel;
bool allow_dialout;
@ -130,7 +130,7 @@ class ConferenceDialog : public AmSession
bool listen_only;
auto_ptr<AmSipRequest> transfer_req;
unique_ptr<AmSipRequest> transfer_req;
void createDialoutParticipant(const string& uri);

6
apps/dsm/DSMCall.h
Unescape View File

@ -41,7 +41,7 @@ class DSMCall : public AmB2BCallerSession,
public DSMSession,
public CredentialHolder
{
std::auto_ptr<UACAuthCred> cred;
std::unique_ptr<UACAuthCred> cred;
DSMStateEngine engine;
AmPromptCollection* prompts;
@ -162,8 +162,8 @@ public:
class DSMCallCalleeSession : public AmB2BCalleeSession,
public CredentialHolder
{
std::auto_ptr<UACAuthCred> cred;
std::auto_ptr<AmSessionEventHandler> auth;
std::unique_ptr<UACAuthCred> cred;
std::unique_ptr<AmSessionEventHandler> auth;
protected:

2
apps/dsm/DSMSession.cpp
Unescape View File

@ -28,7 +28,7 @@
#include "DSMSession.h"
DSMSession::DSMSession()
: last_req(0) {
: last_req(nullptr) {
}
DSMSession::~DSMSession() {

2
apps/dsm/DSMSession.h
Unescape View File

@ -197,7 +197,7 @@ class DSMSession {
AmArg di_res;
/* last received request */
std::auto_ptr<AmSipRequest> last_req;
std::unique_ptr<AmSipRequest> last_req;
};
class DSMStateDiagramCollection;

6
apps/dsm/mods/mod_conference/ModConference.h
Unescape View File

@ -45,7 +45,7 @@ DECLARE_MODULE(MOD_CLS_NAME);
class DSMConfChannel
: public DSMDisposable,
public AmObject {
std::auto_ptr<AmConferenceChannel> chan;
std::unique_ptr<AmConferenceChannel> chan;
public:
DSMConfChannel(AmConferenceChannel* channel) : chan(channel) { }
@ -58,7 +58,7 @@ class DSMConfChannel
class DSMTeeConfChannel
: public DSMDisposable,
public AmObject {
std::auto_ptr<AmConferenceChannel> chan;
std::unique_ptr<AmConferenceChannel> chan;
AmAudioQueue audio_queue;
public:
@ -73,7 +73,7 @@ class DSMTeeConfChannel
template<class T> class DSMDisposableT
: public DSMDisposable,
public AmObject {
std::auto_ptr<T> pobj;
std::unique_ptr<T> pobj;
public:
DSMDisposableT(T* _pobj) : pobj(_pobj) { }

4
apps/examples/cacheannounce/CacheAnnounce.h
Unescape View File

@ -33,7 +33,7 @@
#include "AmCachedAudioFile.h"
#include <memory>
using std::auto_ptr;
using std::unique_ptr;
#include <string>
using std::string;
@ -56,7 +56,7 @@ public:
class CacheAnnounceDialog : public AmSession
{
auto_ptr<AmCachedAudioFile> wav_file;
unique_ptr<AmCachedAudioFile> wav_file;
AmFileCache* announce;
public:

2
apps/examples/dtmftester/DtmfTester.h
Unescape View File

@ -66,7 +66,7 @@ class DtmfTesterDialog : public AmSession,
AmPlaylist play_list;
std::auto_ptr<UACAuthCred> cred;
std::unique_ptr<UACAuthCred> cred;
vector<AmAudioFile*> del_files;

2
apps/examples/early_record/EarlyRecord.h
Unescape View File

@ -30,7 +30,7 @@ class EarlyRecordDialog
string msg_filename;
AmAudioFile a_msg;
std::auto_ptr<UACAuthCred> cred;
std::unique_ptr<UACAuthCred> cred;
protected:
void process(AmEvent* event);

4
apps/examples/jukecall/Jukecall.h
Unescape View File

@ -62,7 +62,7 @@ private:
JukeLeg1_state state;
AmAudioFile initial_announcement;
auto_ptr<AmAudioFile> song;
unique_ptr<AmAudioFile> song;
protected:
AmB2ABCalleeSession* createCalleeSession();
@ -82,7 +82,7 @@ class JukecalleeSession
: public AmB2ABCalleeSession {
void process(AmEvent* event);
auto_ptr<AmAudioFile> song;
unique_ptr<AmAudioFile> song;
public:
JukecalleeSession(const string& other_tag,

2
apps/examples/pinauthconference/PinAuthConference.h
Unescape View File

@ -84,7 +84,7 @@ private:
AmPromptCollection& prompts;
// our connection to the conference
auto_ptr<AmConferenceChannel> channel;
unique_ptr<AmConferenceChannel> channel;
string conf_id;
string pin_str;

4
apps/examples/simple_conference/SimpleConference.h
Unescape View File

@ -58,14 +58,14 @@ class SimpleConferenceDialog : public AmSession
{
string conf_id;
// our connection to the conference
auto_ptr<AmConferenceChannel> channel;
unique_ptr<AmConferenceChannel> channel;
// we use a playlist so we can put e.g.
// announcement files to be played to the
// user in front and after its finished we will
// be connected back to conference automatically
AmPlaylist play_list;
auto_ptr<AmAudioFile> BeepSound;
unique_ptr<AmAudioFile> BeepSound;
public:

2
apps/monitoring/Monitoring.cpp
Unescape View File

@ -57,7 +57,7 @@ Monitor* Monitor::instance()
}
Monitor::Monitor(const string& name)
: AmDynInvokeFactory(MOD_NAME), gc_thread(NULL) {
: AmDynInvokeFactory(MOD_NAME), gc_thread(nullptr) {
}
Monitor::~Monitor() {

2
apps/monitoring/Monitoring.h
Unescape View File

@ -71,7 +71,7 @@ class Monitor
public AmDynInvoke
{
static Monitor* _instance;
std::auto_ptr<MonitorGarbageCollector> gc_thread;
std::unique_ptr<MonitorGarbageCollector> gc_thread;
LogBucket logs[NUM_LOG_BUCKETS];

2
apps/rtmp/RtmpConnection.cpp
Unescape View File

@ -669,7 +669,7 @@ void RtmpConnection::rxAudio(RTMPPacket *packet)
RtmpSession* RtmpConnection::startSession(const char* uri)
{
auto_ptr<RtmpSession> n_session(new RtmpSession(this));
unique_ptr<RtmpSession> n_session(new RtmpSession(this));
AmSipDialog* dialout_dlg = n_session->dlg;
string dialout_id = AmSession::getNewId();

4
apps/sbc/RegisterCache.h
Unescape View File

@ -14,7 +14,7 @@
#include <memory>
using std::string;
using std::map;
using std::auto_ptr;
using std::unique_ptr;
#define REG_CACHE_TABLE_POWER 10
#define REG_CACHE_TABLE_ENTRIES (1<<REG_CACHE_TABLE_POWER)
@ -196,7 +196,7 @@ class _RegisterCache
hash_table<AliasBucket> id_idx;
hash_table<ContactBucket> contact_idx;
auto_ptr<RegCacheStorageHandler> storage_handler;
unique_ptr<RegCacheStorageHandler> storage_handler;
unsigned int gbc_bucket_id;

4
apps/sbc/SBC.h
Unescape View File

@ -76,8 +76,8 @@ class SBCFactory: public AmSessionFactory,
bool core_options_handling;
auto_ptr<CallLegCreator> callLegCreator;
auto_ptr<SimpleRelayCreator> simpleRelayCreator;
unique_ptr<CallLegCreator> callLegCreator;
unique_ptr<SimpleRelayCreator> simpleRelayCreator;
void listProfiles(const AmArg& args, AmArg& ret);
void reloadProfiles(const AmArg& args, AmArg& ret);

2
apps/sbc/SBCCallLeg.h
Unescape View File

@ -80,7 +80,7 @@ class SBCCallLeg : public CallLeg, public CredentialHolder
SBCCallProfile call_profile;
// Rate limiting
auto_ptr<RateLimit> rtp_relay_rate_limit;
unique_ptr<RateLimit> rtp_relay_rate_limit;
// Measurements
list<atomic_int*> rtp_pegs;

4
apps/sbc/SBCEventLog.h
Unescape View File

@ -34,7 +34,7 @@
#include <memory>
#include <string>
#include <map>
using std::auto_ptr;
using std::unique_ptr;
using std::string;
using std::map;
@ -46,7 +46,7 @@ struct SBCEventLogHandler
class _SBCEventLog
{
auto_ptr<SBCEventLogHandler> log_handler;
unique_ptr<SBCEventLogHandler> log_handler;
protected:
_SBCEventLog() {}

4
apps/sbc/SBCSimpleRelay.h
Unescape View File

@ -69,8 +69,8 @@ class SimpleRelayDialog
std::list<CCModuleInfo> cc_ext;
// auth support
std::auto_ptr<UACAuthCred> auth_cred;
std::auto_ptr<AmSessionEventHandler> auth_h;
std::unique_ptr<UACAuthCred> auth_cred;
std::unique_ptr<AmSessionEventHandler> auth_h;
UACAuthCred* getCredentials() { return auth_cred.get(); }
AmBasicSipDialog* getDlg() { return this; }

4
apps/sbc/call_control/dsm/SBCDSMInstance.cpp
Unescape View File

@ -203,8 +203,8 @@ void SBCDSMInstance::onStateChange(SBCCallLeg *call, const CallLeg::StatusChange
VarMapT event_params;
event_params["SBCCallStatus"] = call->getCallStatusStr();
auto_ptr<DSMSipRequest> dsm_request;
auto_ptr<DSMSipReply> dsm_reply;
unique_ptr<DSMSipRequest> dsm_request;
unique_ptr<DSMSipReply> dsm_reply;
switch (cause.reason) {
case CallLeg::StatusChangeCause::SipReply:

4
apps/sbc/call_control/dsm/SBCDSMInstance.h
Unescape View File

@ -49,9 +49,9 @@ class SBCDSMInstance
std::set<DSMDisposable*> gc_trash;
vector<AmAudio*> audiofiles;
auto_ptr<AmSession> dummy_session;
unique_ptr<AmSession> dummy_session;
auto_ptr<AmPlaylist> playlist;
unique_ptr<AmPlaylist> playlist;
void resetDummySession(SimpleRelayDialog *relay);

2
apps/sw_vsc/SW_Vsc.h
Unescape View File

@ -98,7 +98,7 @@ class SW_VscDialog : public AmSession,
sw_vsc_patterns_t *m_patterns;
std::auto_ptr<UACAuthCred> cred;
std::unique_ptr<UACAuthCred> cred;
u_int64_t getAttributeId(MYSQL *my_handler, const char *attribute);
u_int64_t getSubscriberId(MYSQL *my_handler, const char *uuid,

2
apps/voicebox/VoiceboxDialog.h
Unescape View File

@ -43,7 +43,7 @@ public:
private:
AmPlaylist play_list;
// we need only one separator in queue
auto_ptr<AmPlaylistSeparator> playlist_separator;
unique_ptr<AmPlaylistSeparator> playlist_separator;
AmPromptCollection* prompts;
PromptOptions prompt_options;

4
apps/webconference/WebConferenceDialog.h
Unescape View File

@ -59,10 +59,10 @@ private:
AmPromptCollection& prompts;
// our ring tone
auto_ptr<AmRingTone> RingTone;
unique_ptr<AmRingTone> RingTone;
// our connection to the conference
auto_ptr<AmConferenceChannel> channel;
unique_ptr<AmConferenceChannel> channel;
string conf_id;
string pin_str;

8
core/AmAudio.cpp
Unescape View File

@ -256,8 +256,8 @@ AmAudio::AmAudio()
: fmt(new AmAudioFormat(CODEC_PCM16)),
max_rec_time(-1),
rec_time(0),
input_resampling_state(NULL),
output_resampling_state(NULL)
input_resampling_state(nullptr),
output_resampling_state(nullptr)
{
}
@ -265,8 +265,8 @@ AmAudio::AmAudio(AmAudioFormat *_fmt)
: fmt(_fmt),
max_rec_time(-1),
rec_time(0),
input_resampling_state(NULL),
output_resampling_state(NULL)
input_resampling_state(nullptr),
output_resampling_state(nullptr)
{
}

8
core/AmAudio.h
Unescape View File

@ -36,7 +36,7 @@
#include <stdio.h>
#include <memory>
using std::auto_ptr;
using std::unique_ptr;
#include <string>
using std::string;
#include <map>
@ -256,11 +256,11 @@ protected:
DblBuffer samples;
/** Audio format. @see AmAudioFormat */
auto_ptr<AmAudioFormat> fmt;
unique_ptr<AmAudioFormat> fmt;
/** Resampling states. @see AmResamplingState */
auto_ptr<AmResamplingState> input_resampling_state;
auto_ptr<AmResamplingState> output_resampling_state;
unique_ptr<AmResamplingState> input_resampling_state;
unique_ptr<AmResamplingState> output_resampling_state;
AmAudio();
AmAudio(AmAudioFormat *);

2
core/AmDtmfDetector.h
Unescape View File

@ -411,7 +411,7 @@ class AmDtmfDetector
AmDtmfSink *m_dtmfSink;
AmRtpDtmfDetector m_rtpDetector;
AmSipDtmfDetector m_sipDetector;
std::auto_ptr<AmInbandDtmfDetector> m_inbandDetector;
std::unique_ptr<AmInbandDtmfDetector> m_inbandDetector;
Dtmf::InbandDetectorType m_inband_type;
struct timeval m_startTime;

4
core/AmMimeBody.cpp
Unescape View File

@ -7,7 +7,7 @@
#include "AmUtils.h"
#include <memory>
using std::auto_ptr;
using std::unique_ptr;
#define MULTIPART "multipart"
#define MULTIPART_MIXED "multipart/mixed"
@ -488,7 +488,7 @@ int AmMimeBody::parseSinglePart(unsigned char* buf, unsigned int len)
return -1;
}
auto_ptr<AmMimeBody> sub_part(new AmMimeBody());
unique_ptr<AmMimeBody> sub_part(new AmMimeBody());
string sub_part_hdrs;
string sub_part_ct;

2
core/AmRtpAudio.cpp
Unescape View File

@ -108,7 +108,7 @@ void AmAudioRtpFormat::initCodec()
AmRtpAudio::AmRtpAudio(AmSession* _s, int _if)
: AmRtpStream(_s,_if), AmAudio(0),
/*last_ts_i(false),*/ use_default_plc(true),
playout_buffer(NULL),
playout_buffer(nullptr),
m_playout_type(SIMPLE_PLAYOUT),
last_check(0),last_check_i(false),send_int(false),
last_send_ts_i(false)

4
core/AmRtpAudio.h
Unescape View File

@ -98,12 +98,12 @@ public:
class AmRtpAudio: public AmRtpStream, public AmAudio, public AmPLCBuffer
{
PlayoutType m_playout_type;
auto_ptr<AmPlayoutBuffer> playout_buffer;
unique_ptr<AmPlayoutBuffer> playout_buffer;
#ifdef USE_SPANDSP_PLC
plc_state_t* plc_state;
#else
std::auto_ptr<LowcFE> fec;
std::unique_ptr<LowcFE> fec;
#endif
bool use_default_plc;

6
core/AmRtpStream.h
Unescape View File

@ -43,7 +43,7 @@
#include <queue>
#include <memory>
using std::string;
using std::auto_ptr;
using std::unique_ptr;
using std::pair;
// return values of AmRtpStream::receive
@ -239,8 +239,8 @@ protected:
bool monitor_rtp_timeout;
/** Payload type for telephone event */
auto_ptr<const SdpPayload> remote_telephone_event_pt;
auto_ptr<const SdpPayload> local_telephone_event_pt;
unique_ptr<const SdpPayload> remote_telephone_event_pt;
unique_ptr<const SdpPayload> local_telephone_event_pt;
/** DTMF sender */
AmDtmfSender dtmf_sender;

2
core/AmSession.h
Unescape View File

@ -126,7 +126,7 @@ private:
friend class AmSessionFactory;
friend class AmSessionProcessorThread;
auto_ptr<AmRtpAudio> _rtp_str;
unique_ptr<AmRtpAudio> _rtp_str;
/** Application parameters passed through P-App-Param HF */
map<string,string> app_params;

4
core/AmSessionContainer.cpp
Unescape View File

@ -207,7 +207,7 @@ void AmSessionContainer::destroySession(AmSession* s)
string AmSessionContainer::startSessionUAC(const AmSipRequest& req, string& app_name, AmArg* session_params) {
auto_ptr<AmSession> session;
unique_ptr<AmSession> session;
try {
session.reset(createSession(req, app_name, session_params));
if(session.get() != 0) {
@ -280,7 +280,7 @@ void AmSessionContainer::startSessionUAS(AmSipRequest& req)
{
try {
// Call-ID and From-Tag are unknown: it's a new session
auto_ptr<AmSession> session;
unique_ptr<AmSession> session;
string app_name;
session.reset(createSession(req,app_name));

5
core/AmSipSubscription.cpp
Unescape View File

@ -665,7 +665,6 @@ void AmSipSubscription::debug()
}
}
SIPSubscriptionEvent::SIPSubscriptionEvent(SubscriptionStatus status,
const string& handle,
unsigned int expires,
@ -673,9 +672,9 @@ SIPSubscriptionEvent::SIPSubscriptionEvent(SubscriptionStatus status,
const string& reason)
: AmEvent(E_SIP_SUBSCRIPTION), status(status),
handle(handle), expires(expires), code(code),
reason(reason), notify_body(0)
reason(reason), notify_body(nullptr)
{}
const char* SIPSubscriptionEvent::getStatusText()
{
switch (status) {

2
core/AmSipSubscription.h
Unescape View File

@ -235,7 +235,7 @@ struct SIPSubscriptionEvent
string reason;
SubscriptionStatus status;
unsigned int expires;
std::auto_ptr<AmMimeBody> notify_body;
std::unique_ptr<AmMimeBody> notify_body;
SIPSubscriptionEvent(SubscriptionStatus status, const string& handle,
unsigned int expires = 0,

4
core/sip/parse_common.cpp
Unescape View File

@ -34,7 +34,7 @@
#include <string.h>
#include <memory>
using std::auto_ptr;
using std::unique_ptr;
int parse_sip_version(const char* beg, int len)
{
@ -83,7 +83,7 @@ static int _parse_gen_params(list<sip_avp*>* params, const char** c,
int st = beg_w_sc ? VP_PARAM_SEP : VP_PARAM_SEP_SWS;
auto_ptr<sip_avp> avp(new sip_avp());
unique_ptr<sip_avp> avp(new sip_avp());
for(;*c!=end;(*c)++){

4
core/sip/parse_header.cpp
Unescape View File

@ -35,7 +35,7 @@
#include "log.h"
#include <memory>
using std::auto_ptr;
using std::unique_ptr;
//
@ -288,7 +288,7 @@ int parse_headers(list<sip_header*>& hdrs, char** c, char* end)
return 0;
}
auto_ptr<sip_header> hdr(new sip_header());
unique_ptr<sip_header> hdr(new sip_header());
for(;(*c < end) && **c;(*c)++){

4
core/sip/parse_route.cpp
Unescape View File

@ -29,7 +29,7 @@
#include "parse_common.h"
#include <memory>
using std::auto_ptr;
using std::unique_ptr;
route_elmt::~route_elmt() {
if(addr) delete addr;
@ -222,7 +222,7 @@ int parse_first_route_uri(sip_header* fr)
cstring route_str((*route_it)->route);
const char* c = route_str.s;
auto_ptr<sip_nameaddr> na(new sip_nameaddr());
unique_ptr<sip_nameaddr> na(new sip_nameaddr());
if(parse_nameaddr(na.get(), &c, route_str.len)<0) {
DBG("Parsing name-addr failed\n");

4
core/sip/parse_via.cpp
Unescape View File

@ -36,7 +36,7 @@
using std::string;
#include <memory>
using std::auto_ptr;
using std::unique_ptr;
#include "AmUtils.h"
@ -563,7 +563,7 @@ int parse_via(sip_via* via, const char* beg, int len)
int saved_st=0, st=V_TRANS;
auto_ptr<sip_via_parm> parm(new sip_via_parm());
unique_ptr<sip_via_parm> parm(new sip_via_parm());
int ret = 0;
for(;c<end;c++){

12
core/sip/sip_parser.cpp
Unescape View File

@ -41,7 +41,7 @@
#include "log.h"
#include <memory>
using std::auto_ptr;
using std::unique_ptr;
sip_msg::sip_msg(const char* msg_buf, int msg_len)
: buf(NULL),
@ -572,7 +572,7 @@ int parse_sip_msg(sip_msg* msg, char*& err_msg)
return INCOMPLETE_SIP_MSG;
}
auto_ptr<sip_via> via(new sip_via());
unique_ptr<sip_via> via(new sip_via());
if(!parse_via(via.get(),
msg->via1->value.s,
msg->via1->value.len) &&
@ -586,7 +586,7 @@ int parse_sip_msg(sip_msg* msg, char*& err_msg)
return MALFORMED_SIP_MSG;
}
auto_ptr<sip_cseq> cseq(new sip_cseq());
unique_ptr<sip_cseq> cseq(new sip_cseq());
if(!parse_cseq(cseq.get(),
msg->cseq->value.s,
msg->cseq->value.len) &&
@ -600,7 +600,7 @@ int parse_sip_msg(sip_msg* msg, char*& err_msg)
return MALFORMED_SIP_MSG;
}
auto_ptr<sip_from_to> from(new sip_from_to());
unique_ptr<sip_from_to> from(new sip_from_to());
if(parse_from_to(from.get(), msg->from->value.s, msg->from->value.len) != 0) {
err_msg = (char*)"could not parse From hf";
return MALFORMED_SIP_MSG;
@ -611,7 +611,7 @@ int parse_sip_msg(sip_msg* msg, char*& err_msg)
}
msg->from->p = from.release();
auto_ptr<sip_from_to> to(new sip_from_to());
unique_ptr<sip_from_to> to(new sip_from_to());
if(!parse_from_to(to.get(),
msg->to->value.s,
msg->to->value.len)) {
@ -624,7 +624,7 @@ int parse_sip_msg(sip_msg* msg, char*& err_msg)
}
if (msg->rack) {
auto_ptr<sip_rack> rack(new sip_rack());
unique_ptr<sip_rack> rack(new sip_rack());
if (parse_rack(rack.get(), msg->rack->value.s, msg->rack->value.len)) {
msg->rack->p = rack.release();
} else {

4
core/sip/trans_layer.cpp
Unescape View File

@ -1242,7 +1242,7 @@ int _trans_layer::send_request(sip_msg* msg, trans_ticket* tt,
dest_list.push_back(dest);
}
auto_ptr<sip_target_set> targets(new sip_target_set());
unique_ptr<sip_target_set> targets(new sip_target_set());
res = resolver::instance()->resolve_targets(dest_list,targets.get());
if(res < 0){
DBG("resolve_targets failed\n");
@ -2652,7 +2652,7 @@ int _trans_layer::try_next_ip(trans_bucket* bucket, sip_trans* tr,
if(use_new_trans) {
string n_uri;
cstring old_uri;
auto_ptr<sip_trans> n_tr(copy_uac_trans(tr));
unique_ptr<sip_trans> n_tr(copy_uac_trans(tr));
// Warning: no deep copy!!!
// -> do not forget to release() before it's too late!

Write Preview
Loading…
Cancel
Save