[asterisk-commits] russell: branch 1.6.2 r297229 - in /branches/1.6.2: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Dec  2 07:16:47 2010
New Revision: 297229

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=297229
Log:
Merged revisions 297228 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r297228 | russell | 2010-12-02 07:16:15 -0600 (Thu, 02 Dec 2010) | 6 lines
  
  Add "DAHDI" to a couple of app_meetme error messages.
  
  This is in response to some questions on IRC.  To the user, there was nothing
  that made it obvious that this error had anything to do with DAHDI not being
  loaded.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_meetme.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_meetme.c?view=diff&rev=297229&r1=297228&r2=297229
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Thu Dec  2 07:16:47 2010
@@ -1120,7 +1120,7 @@
 	dahdic.confmode = DAHDI_CONF_CONFANN | DAHDI_CONF_CONFANNMON;
 	cnf->fd = open("/dev/dahdi/pseudo", O_RDWR);
 	if (cnf->fd < 0 || ioctl(cnf->fd, DAHDI_SETCONF, &dahdic)) {
-		ast_log(LOG_WARNING, "Unable to open pseudo device\n");
+		ast_log(LOG_WARNING, "Unable to open DAHDI pseudo device\n");
 		if (cnf->fd >= 0)
 			close(cnf->fd);
 		ast_free(cnf);
@@ -2415,7 +2415,7 @@
 		/* open pseudo in non-blocking mode */
 		fd = open("/dev/dahdi/pseudo", O_RDWR | O_NONBLOCK);
 		if (fd < 0) {
-			ast_log(LOG_WARNING, "Unable to open pseudo channel: %s\n", strerror(errno));
+			ast_log(LOG_WARNING, "Unable to open DAHDI pseudo channel: %s\n", strerror(errno));
 			goto outrun;
 		}
 		using_pseudo = 1;