[asterisk-commits] tilghman: trunk r96147 - in /trunk: apps/ main/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Jan  2 19:59:27 2008
New Revision: 96147

URL: http://svn.digium.com/view/asterisk?view=rev&rev=96147
Log:
Compatibility fix for OpenBSD
Report and fix by: mvanbaak
(Closes issue #11669)

Modified:
    trunk/apps/app_ices.c
    trunk/apps/app_mp3.c
    trunk/main/asterisk.c

Modified: trunk/apps/app_ices.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_ices.c?view=diff&rev=96147&r1=96146&r2=96147
==============================================================================
--- trunk/apps/app_ices.c (original)
+++ trunk/apps/app_ices.c Wed Jan  2 19:59:27 2008
@@ -86,11 +86,11 @@
 			close(x);
 	}
 	/* Most commonly installed in /usr/local/bin */
-	execl(ICES, "ices", filename, NULL);
+	execl(ICES, "ices", filename, (char *)NULL);
 	/* But many places has it in /usr/bin */
-	execl(LOCAL_ICES, "ices", filename, NULL);
+	execl(LOCAL_ICES, "ices", filename, (char *)NULL);
 	/* As a last-ditch effort, try to use PATH */
-	execlp("ices", "ices", filename, NULL);
+	execlp("ices", "ices", filename, (char *)NULL);
 	ast_log(LOG_WARNING, "Execute of ices failed\n");
 	_exit(0);
 }

Modified: trunk/apps/app_mp3.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_mp3.c?view=diff&rev=96147&r1=96146&r2=96147
==============================================================================
--- trunk/apps/app_mp3.c (original)
+++ trunk/apps/app_mp3.c Wed Jan  2 19:59:27 2008
@@ -82,19 +82,19 @@
 	/* Execute mpg123, but buffer if it's a net connection */
 	if (!strncasecmp(filename, "http://", 7)) {
 		/* Most commonly installed in /usr/local/bin */
-	    execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-b", "1024", "-f", "8192", "--mono", "-r", "8000", filename, NULL);
+	    execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-b", "1024", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 		/* But many places has it in /usr/bin */
-	    execl(MPG_123, "mpg123", "-q", "-s", "-b", "1024","-f", "8192", "--mono", "-r", "8000", filename, NULL);
+	    execl(MPG_123, "mpg123", "-q", "-s", "-b", "1024","-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 		/* As a last-ditch effort, try to use PATH */
-	    execlp("mpg123", "mpg123", "-q", "-s", "-b", "1024",  "-f", "8192", "--mono", "-r", "8000", filename, NULL);
+	    execlp("mpg123", "mpg123", "-q", "-s", "-b", "1024",  "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 	}
 	else {
 		/* Most commonly installed in /usr/local/bin */
-	    execl(MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, NULL);
+	    execl(MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 		/* But many places has it in /usr/bin */
-	    execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, NULL);
+	    execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 		/* As a last-ditch effort, try to use PATH */
-	    execlp("mpg123", "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, NULL);
+	    execlp("mpg123", "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 	}
 	ast_log(LOG_WARNING, "Execute of mpg123 failed\n");
 	_exit(0);

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=96147&r1=96146&r2=96147
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Wed Jan  2 19:59:27 2008
@@ -2894,13 +2894,13 @@
 				for (fd = 0; fd < 100; fd++)
 					close(fd);
 
-				execlp("astcanary", "astcanary", canary_filename, NULL);
+				execlp("astcanary", "astcanary", canary_filename, (char *)NULL);
 
 				/* If not found, try the same path as used to execute asterisk */
 				ast_copy_string(canary_binary, argv[0], sizeof(canary_binary));
 				if ((lastslash = strrchr(canary_binary, '/'))) {
 					ast_copy_string(lastslash + 1, "astcanary", sizeof(canary_binary) + canary_binary - (lastslash + 1));
-					execl(canary_binary, "astcanary", canary_filename, NULL);
+					execl(canary_binary, "astcanary", canary_filename, (char *)NULL);
 				}
 
 				/* Should never happen */