kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-10 14:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

comment that for callerid field, NULL and "" should be considered

Browse Source 
equivalent (the reason is, when passing these strings through a
statically allocated buffer, we have no way to tell between NULL and ""
so we would be unable to preserve the difference, if any).

No code changes yet.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21743 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-20 17:39:44 +00:00
parent 6149e82b6c
commit 08220b9073
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
include/asterisk/channel.h
View File

@@ -146,10 +146,8 @@ struct ast_generator {
/*! Structure for a data store type */ /*! Structure for a data store type */
struct ast_datastore_info { struct ast_datastore_info {
/*! Type of data store */ const char *type; /*! Type of data store */
const char *type; void (*destroy)(void *data); /*! Destroy function */
/*! Destroy function */
void (*destroy)(void *data);
}; };
/*! Structure for a channel data store */ /*! Structure for a channel data store */
@@ -164,26 +162,21 @@ struct ast_datastore {
AST_LIST_ENTRY(ast_datastore) entry; AST_LIST_ENTRY(ast_datastore) entry;
}; };
/*! Structure for all kinds of caller ID identifications */ /*! Structure for all kinds of caller ID identifications.
* All string fields here are malloc'ed, so they need to be
* freed when the structure is deleted.
* Also, NULL and "" must be considered equivalent.
*/
struct ast_callerid { struct ast_callerid {
/*! Malloc'd Dialed Number Identifier */ char *cid_dnid; /*! Malloc'd Dialed Number Identifier */
char *cid_dnid; char *cid_num; /*! Malloc'd Caller Number */
/*! Malloc'd Caller Number */ char *cid_name; /*! Malloc'd Caller Name */
char *cid_num; char *cid_ani; /*! Malloc'd ANI */
/*! Malloc'd Caller Name */ char *cid_rdnis; /*! Malloc'd RDNIS */
char *cid_name; int cid_pres; /*! Callerid presentation/screening */
/*! Malloc'd ANI */ int cid_ani2; /*! Callerid ANI 2 (Info digits) */
char *cid_ani; int cid_ton; /*! Callerid Type of Number */
/*! Malloc'd RDNIS */ int cid_tns; /*! Callerid Transit Network Select */
char *cid_rdnis;
/*! Callerid presentation/screening */
int cid_pres;
/*! Callerid ANI 2 (Info digits) */
int cid_ani2;
/*! Callerid Type of Number */
int cid_ton;
/*! Callerid Transit Network Select */
int cid_tns;
}; };
/*! Structure to describe a channel "technology", ie a channel driver /*! Structure to describe a channel "technology", ie a channel driver