mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-03-13 12:40:17 +00:00
Revert 12369 since inserting NULL is the same as deleting in sqlite3
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12373 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
9b1e159078
commit
52dba90640
@ -409,14 +409,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *cha
|
||||
*/
|
||||
SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key);
|
||||
|
||||
/*!
|
||||
\brief Unsets private from a given channel
|
||||
\param channel channel to unsets data from
|
||||
\param key your private data's unique keyname
|
||||
\return void SWITCH_STATUS_SUCCESS if data was unset
|
||||
*/
|
||||
SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key);
|
||||
|
||||
/*!
|
||||
\brief Assign a name to a given channel
|
||||
\param channel channel to assign name to
|
||||
|
@ -565,18 +565,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *cha
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key)
|
||||
{
|
||||
switch_status_t status;
|
||||
switch_assert(channel != NULL);
|
||||
|
||||
switch_mutex_lock(channel->profile_mutex);
|
||||
status = switch_core_hash_delete(channel->private_hash, key);
|
||||
switch_mutex_unlock(channel->profile_mutex);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key)
|
||||
{
|
||||
void *val;
|
||||
|
@ -188,7 +188,7 @@ static switch_bool_t write_displace_callback(switch_media_bug_t *bug, void *user
|
||||
switch_core_file_close(&dh->fh);
|
||||
|
||||
if (session && (channel = switch_core_session_get_channel(session))) {
|
||||
switch_channel_unset_private(channel, dh->file);
|
||||
switch_channel_set_private(channel, dh->file, NULL);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@ -269,7 +269,7 @@ static switch_bool_t read_displace_callback(switch_media_bug_t *bug, void *user_
|
||||
switch_core_file_close(&dh->fh);
|
||||
|
||||
if (session && (channel = switch_core_session_get_channel(session))) {
|
||||
switch_channel_unset_private(channel, dh->file);
|
||||
switch_channel_set_private(channel, dh->file, NULL);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
Loading…
x
Reference in New Issue
Block a user