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.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@297245 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index c2e81a139fec6b3f987b5218a680d61ce5518975..c0dcf13e5b515b7892dabbdab475661bd5c8acc5 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1215,9 +1215,9 @@ static struct ast_conference *build_conf(const char *confno, const char *pin,
                        /* 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);
@@ -2571,7 +2571,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
                /* 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;