From d02507ebe50c22e527485e06e4cdab7b5681115b Mon Sep 17 00:00:00 2001 From: tilghman Date: Tue, 15 Jul 2008 18:29:31 +0000 Subject: Merged revisions 131044 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r131044 | tilghman | 2008-07-15 13:25:34 -0500 (Tue, 15 Jul 2008) | 16 lines Merged revisions 130959 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r130959 | tilghman | 2008-07-15 12:19:13 -0500 (Tue, 15 Jul 2008) | 8 lines astman_send_error does not need a newline appended -- the API takes care of that for us. (closes issue #13068) Reported by: gknispel_proformatique Patches: asterisk_1_4_astman_send.patch uploaded by gknispel (license 261) asterisk_trunk_astman_send.patch uploaded by gknispel (license 261) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131060 f38db490-d61c-443f-a65b-d21fe96a405b --- main/manager.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'main/manager.c') diff --git a/main/manager.c b/main/manager.c index 8b91262b1..8cf75eead 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1900,7 +1900,7 @@ static int action_redirect(struct mansession *s, const struct message *m) } if (!ast_strlen_zero(priority) && (sscanf(priority, "%d", &pi) != 1)) { if ((pi = ast_findlabel_extension(NULL, context, exten, priority, NULL)) < 1) { - astman_send_error(s, m, "Invalid priority\n"); + astman_send_error(s, m, "Invalid priority"); return 0; } } @@ -1913,14 +1913,14 @@ static int action_redirect(struct mansession *s, const struct message *m) return 0; } if (ast_check_hangup(chan)) { - astman_send_error(s, m, "Redirect failed, channel not up.\n"); + astman_send_error(s, m, "Redirect failed, channel not up."); ast_channel_unlock(chan); return 0; } if (!ast_strlen_zero(name2)) chan2 = ast_get_channel_by_name_locked(name2); if (chan2 && ast_check_hangup(chan2)) { - astman_send_error(s, m, "Redirect failed, extra channel not up.\n"); + astman_send_error(s, m, "Redirect failed, extra channel not up."); ast_channel_unlock(chan); ast_channel_unlock(chan2); return 0; @@ -2146,19 +2146,19 @@ static int action_originate(struct mansession *s, const struct message *m) } if (!ast_strlen_zero(priority) && (sscanf(priority, "%d", &pi) != 1)) { if ((pi = ast_findlabel_extension(NULL, context, exten, priority, NULL)) < 1) { - astman_send_error(s, m, "Invalid priority\n"); + astman_send_error(s, m, "Invalid priority"); return 0; } } if (!ast_strlen_zero(timeout) && (sscanf(timeout, "%d", &to) != 1)) { - astman_send_error(s, m, "Invalid timeout\n"); + astman_send_error(s, m, "Invalid timeout"); return 0; } ast_copy_string(tmp, name, sizeof(tmp)); tech = tmp; data = strchr(tmp, '/'); if (!data) { - astman_send_error(s, m, "Invalid channel\n"); + astman_send_error(s, m, "Invalid channel"); return 0; } *data++ = '\0'; -- cgit v1.2.3