Skip to content

Commit 28aae28

Browse files
authored
Merge pull request #635 from pabuhler/no-system-include
do not use system include for srtp_priv.h
2 parents f8ad243 + a315027 commit 28aae28

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

include/stream_list_priv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#ifndef SRTP_STREAM_LIST_PRIV_H
4646
#define SRTP_STREAM_LIST_PRIV_H
4747

48-
#include <srtp_priv.h>
48+
#include "srtp_priv.h"
4949

5050
#ifdef __cplusplus
5151
extern "C" {

test/cutest.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,8 @@ static void test_run__(const struct test__ *test)
467467
signame = "SIGTERM";
468468
break;
469469
default:
470-
sprintf(tmp, "signal %d", WTERMSIG(exit_code));
470+
snprintf(tmp, sizeof(tmp), "signal %d",
471+
WTERMSIG(exit_code));
471472
signame = tmp;
472473
break;
473474
}

test/srtp_driver.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,22 +1621,22 @@ char *srtp_packet_to_string(srtp_hdr_t *hdr, int pkt_octet_len)
16211621
}
16221622

16231623
/* write packet into string */
1624-
sprintf(packet_string,
1625-
"(s)rtp packet: {\n"
1626-
" version:\t%d\n"
1627-
" p:\t\t%d\n"
1628-
" x:\t\t%d\n"
1629-
" cc:\t\t%d\n"
1630-
" m:\t\t%d\n"
1631-
" pt:\t\t%x\n"
1632-
" seq:\t\t%x\n"
1633-
" ts:\t\t%x\n"
1634-
" ssrc:\t%x\n"
1635-
" data:\t%s\n"
1636-
"} (%d octets in total)\n",
1637-
hdr->version, hdr->p, hdr->x, hdr->cc, hdr->m, hdr->pt, hdr->seq,
1638-
hdr->ts, hdr->ssrc, octet_string_hex_string(data, hex_len),
1639-
pkt_octet_len);
1624+
snprintf(packet_string, sizeof(packet_string),
1625+
"(s)rtp packet: {\n"
1626+
" version:\t%d\n"
1627+
" p:\t\t%d\n"
1628+
" x:\t\t%d\n"
1629+
" cc:\t\t%d\n"
1630+
" m:\t\t%d\n"
1631+
" pt:\t\t%x\n"
1632+
" seq:\t\t%x\n"
1633+
" ts:\t\t%x\n"
1634+
" ssrc:\t%x\n"
1635+
" data:\t%s\n"
1636+
"} (%d octets in total)\n",
1637+
hdr->version, hdr->p, hdr->x, hdr->cc, hdr->m, hdr->pt, hdr->seq,
1638+
hdr->ts, hdr->ssrc, octet_string_hex_string(data, hex_len),
1639+
pkt_octet_len);
16401640

16411641
return packet_string;
16421642
}

0 commit comments

Comments
 (0)