kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-13 05:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename struct feature_ds to struct feature_datastore.

Browse Source 
Because "struct feature_ds *feature_ds" is not a good thing.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@385142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-04-09 19:58:35 +00:00
parent 0cc9528f9d
commit d09eeaa8eb
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/features.c
View File

@@ -3325,7 +3325,7 @@ struct feature_exten {
char exten[FEATURE_MAX_LEN]; char exten[FEATURE_MAX_LEN];
}; };
struct feature_ds { struct feature_datastore {
struct ao2_container *feature_map; struct ao2_container *feature_map;
/*! /*!
@@ -3361,7 +3361,7 @@ static int feature_exten_cmp(void *obj, void *arg, int flags)
static void feature_ds_destroy(void *data) static void feature_ds_destroy(void *data)
{ {
struct feature_ds *feature_ds = data; struct feature_datastore *feature_ds = data;
if (feature_ds->feature_map) { if (feature_ds->feature_map) {
ao2_ref(feature_ds->feature_map, -1); ao2_ref(feature_ds->feature_map, -1);
@@ -3373,8 +3373,8 @@ static void feature_ds_destroy(void *data)
static void *feature_ds_duplicate(void *data) static void *feature_ds_duplicate(void *data)
{ {
struct feature_ds *old_ds = data; struct feature_datastore *old_ds = data;
struct feature_ds *new_ds; struct feature_datastore *new_ds;
if (!(new_ds = ast_calloc(1, sizeof(*new_ds)))) { if (!(new_ds = ast_calloc(1, sizeof(*new_ds)))) {
return NULL; return NULL;
@@ -3405,9 +3405,9 @@ static const struct ast_datastore_info feature_ds_info = {
* *
* \return the data on the FEATURE datastore, or NULL on error * \return the data on the FEATURE datastore, or NULL on error
*/ */
static struct feature_ds *get_feature_ds(struct ast_channel *chan) static struct feature_datastore *get_feature_ds(struct ast_channel *chan)
{ {
struct feature_ds *feature_ds; struct feature_datastore *feature_ds;
struct ast_datastore *ds; struct ast_datastore *ds;
if ((ds = ast_channel_datastore_find(chan, &feature_ds_info, NULL))) { if ((ds = ast_channel_datastore_find(chan, &feature_ds_info, NULL))) {
@@ -3462,7 +3462,7 @@ static int builtin_feature_get_exten(struct ast_channel *chan, const char *featu
char *buf, size_t len) char *buf, size_t len)
{ {
struct ast_call_feature *feature; struct ast_call_feature *feature;
struct feature_ds *feature_ds; struct feature_datastore *feature_ds;
struct feature_exten *fe = NULL; struct feature_exten *fe = NULL;
*buf = '\0'; *buf = '\0';
@@ -8959,7 +8959,7 @@ exit_features_test:
static unsigned int get_parkingtime(struct ast_channel *chan, struct ast_parkinglot *parkinglot) static unsigned int get_parkingtime(struct ast_channel *chan, struct ast_parkinglot *parkinglot)
{ {
const char *parkinglot_name; const char *parkinglot_name;
struct feature_ds *feature_ds; struct feature_datastore *feature_ds;
unsigned int parkingtime; unsigned int parkingtime;
ast_channel_lock(chan); ast_channel_lock(chan);
@@ -9024,7 +9024,7 @@ static int feature_write(struct ast_channel *chan, const char *cmd, char *data,
const char *value) const char *value)
{ {
int res = 0; int res = 0;
struct feature_ds *feature_ds; struct feature_datastore *feature_ds;
ast_channel_lock(chan); ast_channel_lock(chan);
@@ -9077,7 +9077,7 @@ static int featuremap_read(struct ast_channel *chan, const char *cmd, char *data
static int featuremap_write(struct ast_channel *chan, const char *cmd, char *data, static int featuremap_write(struct ast_channel *chan, const char *cmd, char *data,
const char *value) const char *value)
{ {
struct feature_ds *feature_ds; struct feature_datastore *feature_ds;
struct feature_exten *fe; struct feature_exten *fe;
if (!ast_find_call_feature(data)) { if (!ast_find_call_feature(data)) {