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

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

2 files changed, 33 insertions, 33 deletions

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index fd33bd5c9..aeae13b70 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3085,13 +3085,13 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
 	int dynamic=0;
 
 	if (peername) {
-		var = ast_load_realtime("iaxpeers", "name", peername, "host", "dynamic", NULL);
+		var = ast_load_realtime("iaxpeers", "name", peername, "host", "dynamic", SENTINEL);
 		if (!var && sin)
-			var = ast_load_realtime("iaxpeers", "name", peername, "host", ast_inet_ntoa(sin->sin_addr), NULL);
+			var = ast_load_realtime("iaxpeers", "name", peername, "host", ast_inet_ntoa(sin->sin_addr), SENTINEL);
 	} else if (sin) {
 		char porta[25];
 		sprintf(porta, "%d", ntohs(sin->sin_port));
-		var = ast_load_realtime("iaxpeers", "ipaddr", ast_inet_ntoa(sin->sin_addr), "port", porta, NULL);
+		var = ast_load_realtime("iaxpeers", "ipaddr", ast_inet_ntoa(sin->sin_addr), "port", porta, SENTINEL);
 		if (var) {
 			/* We'll need the peer name in order to build the structure! */
 			for (tmp = var; tmp; tmp = tmp->next) {
@@ -3101,7 +3101,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
 		}
 	}
 	if (!var && peername) { /* Last ditch effort */
-		var = ast_load_realtime("iaxpeers", "name", peername, NULL);
+		var = ast_load_realtime("iaxpeers", "name", peername, SENTINEL);
 		/*!\note
 		 * If this one loaded something, then we need to ensure that the host
 		 * field matched.  The only reason why we can't have this as a criteria
@@ -3202,18 +3202,18 @@ static struct iax2_user *realtime_user(const char *username, struct sockaddr_in
 	struct ast_variable *tmp;
 	struct iax2_user *user=NULL;
 
-	var = ast_load_realtime("iaxusers", "name", username, "host", "dynamic", NULL);
+	var = ast_load_realtime("iaxusers", "name", username, "host", "dynamic", SENTINEL);
 	if (!var)
-		var = ast_load_realtime("iaxusers", "name", username, "host", ast_inet_ntoa(sin->sin_addr), NULL);
+		var = ast_load_realtime("iaxusers", "name", username, "host", ast_inet_ntoa(sin->sin_addr), SENTINEL);
 	if (!var && sin) {
 		char porta[6];
 		snprintf(porta, sizeof(porta), "%d", ntohs(sin->sin_port));
-		var = ast_load_realtime("iaxusers", "name", username, "ipaddr", ast_inet_ntoa(sin->sin_addr), "port", porta, NULL);
+		var = ast_load_realtime("iaxusers", "name", username, "ipaddr", ast_inet_ntoa(sin->sin_addr), "port", porta, SENTINEL);
 		if (!var)
-			var = ast_load_realtime("iaxusers", "ipaddr", ast_inet_ntoa(sin->sin_addr), "port", porta, NULL);
+			var = ast_load_realtime("iaxusers", "ipaddr", ast_inet_ntoa(sin->sin_addr), "port", porta, SENTINEL);
 	}
 	if (!var) { /* Last ditch effort */
-		var = ast_load_realtime("iaxusers", "name", username, NULL);
+		var = ast_load_realtime("iaxusers", "name", username, SENTINEL);
 		/*!\note
 		 * If this one loaded something, then we need to ensure that the host
 		 * field matched.  The only reason why we can't have this as a criteria
@@ -3276,7 +3276,7 @@ static void realtime_update_peer(const char *peername, struct sockaddr_in *sin,
 	snprintf(port, sizeof(port), "%d", ntohs(sin->sin_port));
 	ast_update_realtime("iaxpeers", "name", peername, 
 		"ipaddr", ast_inet_ntoa(sin->sin_addr), "port", port, 
-		"regseconds", regseconds, NULL);
+		"regseconds", regseconds, SENTINEL);
 }
 
 struct create_addr_info {
@@ -12185,7 +12185,7 @@ static int load_module(void)
 	reload_firmware(0);
 	iax_provision_reload(0);
 
-	ast_realtime_require_field("iaxpeers", "name", RQ_CHAR, 10, "ipaddr", RQ_CHAR, 15, "port", RQ_UINTEGER2, 5, "regseconds", RQ_UINTEGER2, 6, NULL);
+	ast_realtime_require_field("iaxpeers", "name", RQ_CHAR, 10, "ipaddr", RQ_CHAR, 15, "port", RQ_UINTEGER2, 5, "regseconds", RQ_UINTEGER2, 6, SENTINEL);
 
 	return AST_MODULE_LOAD_SUCCESS;
 }
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 2caaa0d76..c6ff79b94 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3643,13 +3643,13 @@ static void realtime_update_peer(const char *peername, struct sockaddr_in *sin,
 			"port", port, "regseconds", regseconds,
 			deprecated_username ? "username" : "defaultuser", defaultuser,
 			"useragent", useragent,
-			fc, fullcontact, syslabel, sysname, NULL); /* note fc and syslabel _can_ be NULL */
+			fc, fullcontact, syslabel, sysname, SENTINEL); /* note fc and syslabel _can_ be NULL */
 	} else {
 		ast_update_realtime(tablename, "name", peername, "ipaddr", ipaddr,
 			"port", port, "regseconds", regseconds,
 			"useragent", useragent,
 			deprecated_username ? "username" : "defaultuser", defaultuser,
-			syslabel, sysname, NULL); /* note syslabel _can_ be NULL */
+			syslabel, sysname, SENTINEL); /* note syslabel _can_ be NULL */
 	}
 }
 
@@ -3828,13 +3828,13 @@ static struct sip_peer *realtime_peer(const char *newpeername, struct sockaddr_i
 	/* First check on peer name */
 	if (newpeername) {
 		if (realtimeregs)
-			varregs = ast_load_realtime("sipregs", "name", newpeername, NULL);
+			varregs = ast_load_realtime("sipregs", "name", newpeername, SENTINEL);
 
-		var = ast_load_realtime("sippeers", "name", newpeername, "host", "dynamic", NULL);
+		var = ast_load_realtime("sippeers", "name", newpeername, "host", "dynamic", SENTINEL);
 		if (!var && sin)
-			var = ast_load_realtime("sippeers", "name", newpeername, "host", ast_inet_ntoa(sin->sin_addr), NULL);
+			var = ast_load_realtime("sippeers", "name", newpeername, "host", ast_inet_ntoa(sin->sin_addr), SENTINEL);
 		if (!var) {
-			var = ast_load_realtime("sippeers", "name", newpeername, NULL);
+			var = ast_load_realtime("sippeers", "name", newpeername, SENTINEL);
 			/*!\note
 			 * If this one loaded something, then we need to ensure that the host
 			 * field matched.  The only reason why we can't have this as a criteria
@@ -3862,62 +3862,62 @@ static struct sip_peer *realtime_peer(const char *newpeername, struct sockaddr_i
 		ast_copy_string(ipaddr, ast_inet_ntoa(sin->sin_addr), sizeof(ipaddr));
 		portnum = ntohs(sin->sin_port);
 		sprintf(portstring, "%u", portnum);
-		var = ast_load_realtime("sippeers", "host", ipaddr, "port", portstring, NULL);	/* First check for fixed IP hosts */
+		var = ast_load_realtime("sippeers", "host", ipaddr, "port", portstring, SENTINEL);	/* First check for fixed IP hosts */
 		if (var) {
 			if (realtimeregs) {
 				newpeername = get_name_from_variable(var, newpeername);
-				varregs = ast_load_realtime("sipregs", "name", newpeername, NULL);
+				varregs = ast_load_realtime("sipregs", "name", newpeername, SENTINEL);
 			}
 		} else {
 			if (realtimeregs)
-				varregs = ast_load_realtime("sipregs", "ipaddr", ipaddr, "port", portstring, NULL); /* Then check for registered hosts */
+				varregs = ast_load_realtime("sipregs", "ipaddr", ipaddr, "port", portstring, SENTINEL); /* Then check for registered hosts */
 			else
-				var = ast_load_realtime("sippeers", "ipaddr", ipaddr, "port", portstring, NULL); /* Then check for registered hosts */
+				var = ast_load_realtime("sippeers", "ipaddr", ipaddr, "port", portstring, SENTINEL); /* Then check for registered hosts */
 			if (varregs) {
 				newpeername = get_name_from_variable(varregs, newpeername);
-				var = ast_load_realtime("sippeers", "name", newpeername, NULL);
+				var = ast_load_realtime("sippeers", "name", newpeername, SENTINEL);
 			}
 		}
 		if (!var) { /*We couldn't match on ipaddress and port, so we need to check if port is insecure*/
-			peerlist = ast_load_realtime_multientry("sippeers", "host", ipaddr, NULL);
+			peerlist = ast_load_realtime_multientry("sippeers", "host", ipaddr, SENTINEL);
 			if (peerlist) {
 				var = get_insecure_variable_from_config(peerlist);
 				if(var) {
 					if (realtimeregs) {
 						newpeername = get_name_from_variable(var, newpeername);
-						varregs = ast_load_realtime("sipregs", "name", newpeername, NULL);
+						varregs = ast_load_realtime("sipregs", "name", newpeername, SENTINEL);
 					}
 				} else { /*var wasn't found in the list of "hosts", so try "ipaddr"*/
 					peerlist = NULL;
 					cat = NULL;
-					peerlist = ast_load_realtime_multientry("sippeers", "ipaddr", ipaddr, NULL);
+					peerlist = ast_load_realtime_multientry("sippeers", "ipaddr", ipaddr, SENTINEL);
 					if(peerlist) {
 						var = get_insecure_variable_from_config(peerlist);
 						if(var) {
 							if (realtimeregs) {
 								newpeername = get_name_from_variable(var, newpeername);
-								varregs = ast_load_realtime("sipregs", "name", newpeername, NULL);
+								varregs = ast_load_realtime("sipregs", "name", newpeername, SENTINEL);
 							}
 						}
 					}
 				}
 			} else {
 				if (realtimeregs) {
-					peerlist = ast_load_realtime_multientry("sipregs", "ipaddr", ipaddr, NULL);
+					peerlist = ast_load_realtime_multientry("sipregs", "ipaddr", ipaddr, SENTINEL);
 					if (peerlist) {
 						varregs = get_insecure_variable_from_config(peerlist);
 						if (varregs) {
 							newpeername = get_name_from_variable(varregs, newpeername);
-							var = ast_load_realtime("sippeers", "name", newpeername, NULL);
+							var = ast_load_realtime("sippeers", "name", newpeername, SENTINEL);
 						}
 					}
 				} else {
-					peerlist = ast_load_realtime_multientry("sippeers", "ipaddr", ipaddr, NULL);
+					peerlist = ast_load_realtime_multientry("sippeers", "ipaddr", ipaddr, SENTINEL);
 					if (peerlist) {
 						var = get_insecure_variable_from_config(peerlist);
 						if (var) {
 							newpeername = get_name_from_variable(var, newpeername);
-							varregs = ast_load_realtime("sipregs", "name", newpeername, NULL);
+							varregs = ast_load_realtime("sipregs", "name", newpeername, SENTINEL);
 						}
 					}
 				}
@@ -4063,7 +4063,7 @@ static struct sip_user *realtime_user(const char *username)
 	struct ast_variable *tmp;
 	struct sip_user *user = NULL;
 
-	var = ast_load_realtime("sipusers", "name", username, NULL);
+	var = ast_load_realtime("sipusers", "name", username, SENTINEL);
 
 	if (!var)
 		return NULL;
@@ -10108,7 +10108,7 @@ static void destroy_association(struct sip_peer *peer)
 
 	if (!sip_cfg.ignore_regexpire) {
 		if (peer->rt_fromcontact)
-			ast_update_realtime(tablename, "name", peer->name, "fullcontact", "", "ipaddr", "", "port", "", "regseconds", "0", peer->deprecated_username ? "username" : "defaultuser", "", "regserver", "", "useragent", "", NULL);
+			ast_update_realtime(tablename, "name", peer->name, "fullcontact", "", "ipaddr", "", "port", "", "regseconds", "0", peer->deprecated_username ? "username" : "defaultuser", "", "regserver", "", "useragent", "", SENTINEL);
 		else 
 			ast_db_del("SIP/Registry", peer->name);
 	}
@@ -22985,7 +22985,7 @@ static int load_module(void)
 		"fullcontact", RQ_CHAR, 20,
 		"regserver", RQ_CHAR, 20,
 		"useragent", RQ_CHAR, 20,
-		NULL);
+		SENTINEL);
 
 	return AST_MODULE_LOAD_SUCCESS;
 }