[svn-commits] russell: trunk r297248 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Dec  2 07:20:48 2010
New Revision: 297248

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

................
  r297245 | russell | 2010-12-02 07:20:19 -0600 (Thu, 02 Dec 2010) | 20 lines
  
  Merged revisions 297229 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297229 | russell | 2010-12-02 07:16:47 -0600 (Thu, 02 Dec 2010) | 13 lines
    
    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:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=297248&r1=297247&r2=297248
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Thu Dec  2 07:20:48 2010
@@ -1226,9 +1226,9 @@
 			/* if we are creating a conference for a unit test, it is not neccesary
 			 * to open a pseudo channel, so, if we fail continue creating
 			 * the conference. */
-			ast_test_status_update(test, "Unable to open pseudo device\n");
+			ast_test_status_update(test, "Unable to open DAHDI pseudo device\n");
 		} else {
-			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);
@@ -2618,7 +2618,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;