diff options
| -rw-r--r-- | channels/chan_sip.c | 4 | ||||
| -rw-r--r-- | main/manager.c | 12 | ||||
| -rw-r--r-- | main/pbx.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 79b1e1889..32ac1de35 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12545,7 +12545,7 @@ static int manager_sip_show_peer(struct mansession *s, const struct message *m) peer = astman_get_header(m, "Peer"); if (ast_strlen_zero(peer)) { - astman_send_error(s, m, "Peer: <name> missing.\n"); + astman_send_error(s, m, "Peer: <name> missing."); return 0; } a[0] = "sip"; @@ -12617,7 +12617,7 @@ static char *_sip_show_peer(int type, int fd, struct mansession *s, const struct if (!ast_strlen_zero(id)) astman_append(s, "ActionID: %s\r\n", id); } else { - snprintf (cbuf, sizeof(cbuf), "Peer %s not found.\n", argv[3]); + snprintf (cbuf, sizeof(cbuf), "Peer %s not found.", argv[3]); astman_send_error(s, m, cbuf); return CLI_SUCCESS; } 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'; diff --git a/main/pbx.c b/main/pbx.c index 7de2e46f6..591a07bbd 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5150,7 +5150,7 @@ static int manager_show_dialplan_helper(struct mansession *s, const struct messa /* try to lock contexts */ if (ast_rdlock_contexts()) { - astman_send_error(s, m, "Failed to lock contexts\r\n"); + astman_send_error(s, m, "Failed to lock contexts"); ast_log(LOG_WARNING, "Failed to lock contexts list for manager: listdialplan\n"); return -1; } @@ -5295,7 +5295,7 @@ static int manager_show_dialplan(struct mansession *s, const struct message *m) if (context && !counters.context_existence) { char errorbuf[BUFSIZ]; - snprintf(errorbuf, sizeof(errorbuf), "Did not find context %s\r\n", context); + snprintf(errorbuf, sizeof(errorbuf), "Did not find context %s", context); astman_send_error(s, m, errorbuf); return 0; } @@ -5303,9 +5303,9 @@ static int manager_show_dialplan(struct mansession *s, const struct message *m) char errorbuf[BUFSIZ]; if (context) - snprintf(errorbuf, sizeof(errorbuf), "Did not find extension %s@%s\r\n", exten, context); + snprintf(errorbuf, sizeof(errorbuf), "Did not find extension %s@%s", exten, context); else - snprintf(errorbuf, sizeof(errorbuf), "Did not find extension %s in any context\r\n", exten); + snprintf(errorbuf, sizeof(errorbuf), "Did not find extension %s in any context", exten); astman_send_error(s, m, errorbuf); return 0; } |