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

Older versions of GNU gcc do not allow 'NULL' as sentinel.

Browse Source 
They want (char *)NULL as sentinel.
An example is OpenBSD (confirmed on 4.3) that ships with gcc 3.3.4

This commit introduces a contstant SENTINEL which is declared as:
#define SENTINEL ((char *)NULL)

All places I could test compile on my openbsd system are converted.
Update CODING-GUIDELINES to tell about this constant.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@124127 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Michiel van Baak
2008-06-19 20:48:33 +00:00
parent 2e0afd805b
commit 8e8359465b
13 changed files with 85 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_musiconhold.c
View File

@@ -1134,14 +1134,14 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
/* If no moh class found in memory, then check RT */
if (!mohclass && ast_check_realtime("musiconhold")) {
if (!ast_strlen_zero(chan->musicclass)) {
var = ast_load_realtime("musiconhold", "name", chan->musicclass, NULL);
var = ast_load_realtime("musiconhold", "name", chan->musicclass, SENTINEL);
}
if (!var && !ast_strlen_zero(mclass))
var = ast_load_realtime("musiconhold", "name", mclass, NULL);
var = ast_load_realtime("musiconhold", "name", mclass, SENTINEL);
if (!var && !ast_strlen_zero(interpclass))
var = ast_load_realtime("musiconhold", "name", interpclass, NULL);
var = ast_load_realtime("musiconhold", "name", interpclass, SENTINEL);
if (!var)
var = ast_load_realtime("musiconhold", "name", "default", NULL);
var = ast_load_realtime("musiconhold", "name", "default", SENTINEL);
if (var && (mohclass = moh_class_malloc())) {
mohclass->realtime = 1;
for (tmp = var; tmp; tmp = tmp->next) {