diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-21 11:02:28 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-21 11:02:28 +0000 |
| commit | 3b87fbc500979d7006e1dd93ce3982896b49156b (patch) | |
| tree | 9e7cd009389ae54c65b56cb35a9e57af6e3e3134 /res/res_agi.c | |
| parent | 915a117b8658cb384c564d910f4badbb740f04a0 (diff) | |
more NULL "" equivalence in cid fields.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@21835 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_agi.c')
| -rw-r--r-- | res/res_agi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index c7ff91c0d..c1c21d707 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -348,14 +348,14 @@ static void setup_env(struct ast_channel *chan, char *request, int fd, int enhan fdprintf(fd, "agi_uniqueid: %s\n", chan->uniqueid); /* ANI/DNIS */ - fdprintf(fd, "agi_callerid: %s\n", chan->cid.cid_num ? chan->cid.cid_num : "unknown"); - fdprintf(fd, "agi_calleridname: %s\n", chan->cid.cid_name ? chan->cid.cid_name : "unknown"); + fdprintf(fd, "agi_callerid: %s\n", S_OR(chan->cid.cid_num, "unknown")); + fdprintf(fd, "agi_calleridname: %s\n", S_OR(chan->cid.cid_name, "unknown")); fdprintf(fd, "agi_callingpres: %d\n", chan->cid.cid_pres); fdprintf(fd, "agi_callingani2: %d\n", chan->cid.cid_ani2); fdprintf(fd, "agi_callington: %d\n", chan->cid.cid_ton); fdprintf(fd, "agi_callingtns: %d\n", chan->cid.cid_tns); - fdprintf(fd, "agi_dnid: %s\n", chan->cid.cid_dnid ? chan->cid.cid_dnid : "unknown"); - fdprintf(fd, "agi_rdnis: %s\n", chan->cid.cid_rdnis ? chan->cid.cid_rdnis : "unknown"); + fdprintf(fd, "agi_dnid: %s\n", S_OR(chan->cid.cid_dnid, "unknown")); + fdprintf(fd, "agi_rdnis: %s\n", S_OR(chan->cid.cid_rdnis, "unknown")); /* Context information */ fdprintf(fd, "agi_context: %s\n", chan->context); |