Simplify sig_pri.c:build_status().

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

diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index f3bf64670d223ce34650411b5d4355914d3de56b..49fb246bedc4c918b217e41138dfd7672a9388f2 100644 (file)
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -8668,18 +8668,10 @@ static void build_status(char *s, size_t len, int status, int active)
        if (!s || len < 1) {
                return;
        }
-       s[0] = '\0';
-       if (!(status & DCHAN_NOTINALARM))
-               strncat(s, "In Alarm, ", len - strlen(s) - 1);
-       if (status & DCHAN_UP)
-               strncat(s, "Up", len - strlen(s) - 1);
-       else
-               strncat(s, "Down", len - strlen(s) - 1);
-       if (active)
-               strncat(s, ", Active", len - strlen(s) - 1);
-       else
-               strncat(s, ", Standby", len - strlen(s) - 1);
-       s[len - 1] = '\0';
+       snprintf(s, len, "%s%s, %s",
+               (status & DCHAN_NOTINALARM) ? "" : "In Alarm, ",
+               (status & DCHAN_UP) ? "Up" : "Down",
+               (active) ? "Active" : "Standby");
 }
 
 void sig_pri_cli_show_spans(int fd, int span, struct sig_pri_span *pri)