MT#55283 rename STR_CONST_INIT...

... to STR_CONST...() for consistency

no-op

Change-Id: I68da3d1a80b9d6db69adba1091e58cc4909305ca

daemon/audio_player.c

@@ -72,7 +72,7 @@ bool audio_player_setup(struct call_media *m, const rtp_payload_type *dst_pt,
 	// TODO: shortcut this to avoid the detour of avframe -> avpacket -> avframe (all in s16)
 	rtp_payload_type src_pt = {
 		.payload_type = -1,
-		.encoding = STR_CONST_INIT("PCM-S16LE"), // XXX support flp
+		.encoding = STR_CONST("PCM-S16LE"), // XXX support flp
 		.channels = dst_pt->channels,
 		.clock_rate = clockrate,
 		.ptime = ptime_ms,

daemon/call.c

@@ -1106,7 +1106,7 @@ enum call_stream_state call_stream_state_machine(struct packet_stream *ps) {
 
 	if (PS_ISSET(ps, PIERCE_NAT) && PS_ISSET(ps, FILLED) && !PS_ISSET(ps, CONFIRMED)) {
 		for (__auto_type l = ps->sfds.head; l; l = l->next) {
-			static const str fake_rtp = STR_CONST_INIT("\x80\x7f\xff\xff\x00\x00\x00\x00"
+			static const str fake_rtp = STR_CONST("\x80\x7f\xff\xff\x00\x00\x00\x00"
 					"\x00\x00\x00\x00");
 			stream_fd *sfd = l->data;
 			if (sfd->socket.fd == -1 || ps->endpoint.address.family == NULL)

daemon/call_interfaces.c

@@ -1011,7 +1011,7 @@ void call_ng_flags_flags(sdp_ng_flags *out, str *s, helper_arg dummy) {
 			out->allow_transcoding = 1;
 			break;
 		case CSH_LOOKUP("always-transcode"):;
-			static const str str_all = STR_CONST_INIT("all");
+			static const str str_all = STR_CONST("all");
 			call_ng_flags_esc_str_list(out, (str *) &str_all, &out->codec_accept);
 			break;
 		case CSH_LOOKUP("asymmetric"):
@@ -3734,7 +3734,7 @@ const char *call_subscribe_request_ng(bencode_item_t *input, bencode_item_t *out
 	/* get destination monologue */
 	if (!flags.to_tag.len) {
 		/* generate one */
-		flags.to_tag = STR_CONST_INIT(rand_buf);
+		flags.to_tag = STR_CONST(rand_buf);
 		rand_hex_str(flags.to_tag.s, flags.to_tag.len / 2);
 	}
 

daemon/codec.c

@@ -779,7 +779,7 @@ static void __check_dtmf_injector(struct call_media *receiver, struct call_media
 	src_pt.encoding = STR("DTMF injector");
 	src_pt.encoding_with_params = STR("DTMF injector");
 	src_pt.encoding_with_full_params = STR("DTMF injector");
-	static const str tp_event = STR_CONST_INIT("telephone-event");
+	static const str tp_event = STR_CONST("telephone-event");
 	src_pt.codec_def = codec_find(&tp_event, MT_AUDIO);
 	if (!src_pt.codec_def) {
 		ilogs(codec, LOG_ERR, "RTP payload type 'telephone-event' is not defined");
@@ -5736,8 +5736,8 @@ void codec_store_synthesise(struct codec_store *dst, struct codec_store *opposit
 		// audio <> T.38 transcoder
 		if (!dst->codec_prefs.length) {
 			// no codecs given: add defaults
-			static const str PCMU_str = STR_CONST_INIT("PCMU");
-			static const str PCMA_str = STR_CONST_INIT("PCMA");
+			static const str PCMU_str = STR_CONST("PCMU");
+			static const str PCMA_str = STR_CONST("PCMA");
 			codec_store_add_raw_order(dst, codec_make_payload_type(&PCMU_str, MT_AUDIO));
 			codec_store_add_raw_order(dst, codec_make_payload_type(&PCMA_str, MT_AUDIO));
 

daemon/control_ng.c

@@ -700,7 +700,7 @@ static void notify_tcp_client(gpointer key, gpointer value, gpointer user_data)
 	struct streambuf_stream *s = (struct streambuf_stream *)value;
 	str *to_send = (str *)user_data;
 	char cookie_buf[17];
-	str cookie = STR_CONST_INIT(cookie_buf);
+	str cookie = STR_CONST(cookie_buf);
 
 	rand_hex_str(cookie_buf, cookie.len / 2);
 	control_ng_send(&cookie, to_send, &s->sock.remote, NULL, &s->sock);

daemon/control_ng_flags_parser.c

@@ -139,7 +139,7 @@ static bool parse_received_from(str * key, str * val, bencode_buffer_t * buf,
 		bencode_list_add_str(item, &ipfamily);
 
 		bencode_list_add_str(item, &s);
-		call_ng_main_flags(out, &STR_CONST_INIT("received-from"), item, opmode);
+		call_ng_main_flags(out, &STR_CONST("received-from"), item, opmode);
 		return true;
 	}
 	return false;
@@ -195,7 +195,7 @@ static void parse_transports(sdp_ng_flags *out, bencode_buffer_t *buf,
 	const char * val = transports[transport & 0x007];
 	if (!val)
 		return;
-	call_ng_main_flags(out, &STR_CONST_INIT("transport-protocol"), bencode_string(buf, val), opmode);
+	call_ng_main_flags(out, &STR_CONST("transport-protocol"), bencode_string(buf, val), opmode);
 }
 
 #if 0

daemon/media_socket.c

@@ -763,7 +763,7 @@ static void __add_intf_rr_1(struct logical_intf *lif, str *name_base, sockfamily
 }
 static void __add_intf_rr(struct logical_intf *lif, str *name_base, sockfamily_t *fam) {
 	__add_intf_rr_1(lif, name_base, fam);
-	static str legacy_rr_str = STR_CONST_INIT("round-robin-calls");
+	static str legacy_rr_str = STR_CONST("round-robin-calls");
 	__add_intf_rr_1(lif, &legacy_rr_str, fam);
 }
 static GQueue *__interface_list_for_family(sockfamily_t *fam) {

daemon/recording.c

@@ -370,7 +370,7 @@ void recording_start_daemon(call_t *call) {
 		rand_hex_str(rand_str, rand_bytes);
 		g_autoptr(char) meta_prefix = g_strdup_printf("%s-%s", escaped_callid, rand_str);
 		call_str_cpy(call, &call->recording_meta_prefix, &STR(meta_prefix));
-		call_str_cpy(call, &call->recording_random_tag, &STR_CONST_INIT(rand_str));
+		call_str_cpy(call, &call->recording_random_tag, &STR_CONST(rand_str));
 	}
 
 	_rm(init_struct, call);

daemon/sdp.c

@@ -293,7 +293,7 @@ struct sdp_attribute {
  * Globaly visible variables for this file.
  */
 static char __id_buf[6*2 + 1]; // 6 hex encoded characters
-const str rtpe_instance_id = STR_CONST_INIT(__id_buf);
+const str rtpe_instance_id = STR_CONST(__id_buf);
 
 /**
  * Declarations for inner functions/helpers.
@@ -3148,7 +3148,7 @@ static struct packet_stream *print_sdp_media_section(GString *s, struct call_med
 		}
 
 		if (MEDIA_ISSET(media, TRICKLE_ICE) && media->ice_agent) {
-			append_attr_to_gstring(s, "ice-options", &STR_CONST_INIT("trickle"), flags,
+			append_attr_to_gstring(s, "ice-options", &STR_CONST("trickle"), flags,
 					media->type_id);
 		}
 		if (MEDIA_ISSET(media, ICE)) {

lib/codeclib.c

@@ -399,7 +399,7 @@ static struct codec_def_s __codec_defs[] = {
 		.bits_per_sample = 8,
 		.media_type = MT_AUDIO,
 		.codec_type = &codec_type_avcodec,
-		.silence_pattern = STR_CONST_INIT("\xd5"),
+		.silence_pattern = STR_CONST("\xd5"),
 		.dtx_methods = {
 			[DTX_SILENCE] = &dtx_method_silence,
 			[DTX_CN] = &dtx_method_cn,
@@ -416,7 +416,7 @@ static struct codec_def_s __codec_defs[] = {
 		.bits_per_sample = 8,
 		.media_type = MT_AUDIO,
 		.codec_type = &codec_type_avcodec,
-		.silence_pattern = STR_CONST_INIT("\xff"),
+		.silence_pattern = STR_CONST("\xff"),
 		.dtx_methods = {
 			[DTX_SILENCE] = &dtx_method_silence,
 			[DTX_CN] = &dtx_method_cn,
@@ -451,7 +451,7 @@ static struct codec_def_s __codec_defs[] = {
 		.bits_per_sample = 4,
 		.media_type = MT_AUDIO,
 		.codec_type = &codec_type_avcodec,
-		.silence_pattern = STR_CONST_INIT("\xfa"),
+		.silence_pattern = STR_CONST("\xfa"),
 		.dtx_methods = {
 			[DTX_SILENCE] = &dtx_method_silence,
 			[DTX_CN] = &dtx_method_cn,
@@ -3063,7 +3063,7 @@ static int amr_decoder_input(decoder_t *dec, const str *data, GQueue *out) {
 	unsigned int ill = 0, ilp = 0;
 
 	unsigned char cmr_chr[2];
-	str cmr = STR_CONST_INIT_BUF(cmr_chr);
+	str cmr = STR_CONST_BUF(cmr_chr);
 	err = "no CMR";
 	if (bitstr_shift_ret(&d, 4, &cmr))
 		goto err;
@@ -3091,7 +3091,7 @@ static int amr_decoder_input(decoder_t *dec, const str *data, GQueue *out) {
 
 		if (dec->format_options.amr.interleaving) {
 			unsigned char ill_ilp_chr[2];
-			str ill_ilp = STR_CONST_INIT_BUF(ill_ilp_chr);
+			str ill_ilp = STR_CONST_BUF(ill_ilp_chr);
 			err = "no ILL/ILP";
 			if (bitstr_shift_ret(&d, 8, &ill_ilp))
 				goto err;
@@ -3111,7 +3111,7 @@ static int amr_decoder_input(decoder_t *dec, const str *data, GQueue *out) {
 	int num_crcs = 0;
 	while (1) {
 		unsigned char toc_byte[2];
-		str toc_entry = STR_CONST_INIT_BUF(toc_byte);
+		str toc_entry = STR_CONST_BUF(toc_byte);
 		err = "missing TOC entry";
 		if (bitstr_shift_ret(&d, 6, &toc_entry))
 			goto err;
@@ -3155,7 +3155,7 @@ static int amr_decoder_input(decoder_t *dec, const str *data, GQueue *out) {
 
 		// AMR decoder expects an octet aligned TOC byte plus the payload
 		unsigned char frame_buf[(bits + 7) / 8 + 1 + 1];
-		str frame = STR_CONST_INIT_BUF(frame_buf);
+		str frame = STR_CONST_BUF(frame_buf);
 		str_shift(&frame, 1);
 		err = "short frame";
 		if (bitstr_shift_ret(&d, bits, &frame))
@@ -3370,7 +3370,7 @@ static int amr_dtx(decoder_t *dec, GQueue *out, int ptime) {
 	ilog(LOG_DEBUG, "pushing empty/lost frame to AMR decoder");
 	unsigned char frame_buf[1];
 	frame_buf[0] = 0xf << 3; // no data
-	str frame = STR_CONST_INIT_BUF(frame_buf);
+	str frame = STR_CONST_BUF(frame_buf);
 	if (avc_decoder_input(dec, &frame, out))
 		ilog(LOG_WARN | LOG_FLAG_LIMIT, "Error while writing 'no data' frame to AMR decoder");
 	return 0;

lib/rtplib.c

@@ -17,8 +17,8 @@ struct rtp_extension {
 #define RFC_TYPE_FULL(type, name, c_rate, chans, pt)			\
 	[type] = {							\
 		.payload_type		= type,				\
-		.encoding		= STR_CONST_INIT(#name),	\
-		.encoding_with_params	= STR_CONST_INIT(#name "/" #c_rate),	\
+		.encoding		= STR_CONST(#name),	\
+		.encoding_with_params	= STR_CONST(#name "/" #c_rate),	\
 		.clock_rate		= c_rate,			\
 		.channels		= chans,			\
 		.ptime			= pt,				\

lib/str.h

@@ -36,12 +36,12 @@ TYPED_GQUEUE(str, str)
 
 #define STR_NULL ((str) { NULL, 0 })
 #define STR_EMPTY ((str) { "", 0 })
-#define STR_CONST_INIT(s) ((str) { s, sizeof(s)-1 })
+#define STR_CONST(s) ((str) { s, sizeof(s)-1 })
 #define STR(s) ((str) { (char *) (s), (s) ? strlen(s) : 0 })
 #define STR_INIT_GS(s) ((str) { (s)->str, (s)->len })
 #define STR_LEN(s, len) ((str) { (char *) (s), len })
 #define STR_INIT_DUP(s) ((str) { g_strdup(s), strlen(s) })
-#define STR_CONST_INIT_BUF(buf) ((str) { (char *) &buf, sizeof(buf) })
+#define STR_CONST_BUF(buf) ((str) { (char *) &buf, sizeof(buf) })
 
 
 

t/test-bitstr.c

@@ -56,7 +56,7 @@ int do_test(const char *input, unsigned int input_len,
 		int result = va_arg(ap, int);
 
 		char out_buf[output_len+1];
-		str outp = STR_CONST_INIT_BUF(out_buf);
+		str outp = STR_CONST_BUF(out_buf);
 
 		int ret;
 		if (output)

t/test-stats.c

@@ -4308,8 +4308,8 @@ int main(void) {
 
 	// test average call duration
 
-	const str callid1 = STR_CONST_INIT("test1");
-	const str callid2 = STR_CONST_INIT("test2");
+	const str callid1 = STR_CONST("test1");
+	const str callid2 = STR_CONST("test2");
 	call_t *call1 = call_get_or_create(&callid1, true);
 	struct call_monologue *ml1 = call_get_or_create_monologue(call1, &callid1);
 	call_t *call2 = call_get_or_create(&callid2, true);

t/test-transcode.c

@@ -138,8 +138,8 @@ static void codec_set(char *c) {
 //#define ht_set(ht, s) __ht_set(flags.ht, #s)
 
 #define sdp_pt_fmt_ch(num, codec, clockrate, channels, fmt) \
-	__sdp_pt_fmt(num, (str) STR_CONST_INIT(#codec), clockrate, channels, (str) STR_CONST_INIT(#codec "/" #clockrate), \
-			(str) STR_CONST_INIT(#codec "/" #clockrate "/" #channels), (str) STR_CONST_INIT(fmt))
+	__sdp_pt_fmt(num, (str) STR_CONST(#codec), clockrate, channels, (str) STR_CONST(#codec "/" #clockrate), \
+			(str) STR_CONST(#codec "/" #clockrate "/" #channels), (str) STR_CONST(fmt))
 
 #define sdp_pt_fmt(num, codec, clockrate, fmt) sdp_pt_fmt_ch(num, codec, clockrate, 1, fmt)
 #define sdp_pt_fmt_s(num, codec, clockrate, fmt) sdp_pt_fmt_ch(num, codec, clockrate, 2, fmt)
@@ -152,7 +152,7 @@ static void __sdp_pt_fmt(int num, str codec, int clockrate, int channels, str fu
 		.encoding_with_full_params = full_full,
 		.encoding = codec,
 		.clock_rate = clockrate,
-		.encoding_parameters = STR_CONST_INIT(""),
+		.encoding_parameters = STR_CONST(""),
 		.channels = channels,
 		.format_parameters = *fmtdup,
 		.codec_opts = STR_NULL,
@@ -224,13 +224,13 @@ static void __check_encoder(const char *file, int line, struct call_media *m,
 #endif
 
 #define packet_seq_ts(side, pt_in, pload, rtp_ts, rtp_seq, pt_out, pload_exp, ts_exp, fatal) \
-	__packet_seq_ts( __FILE__, __LINE__, media_ ## side, pt_in, (str) STR_CONST_INIT(pload), \
-			(str) STR_CONST_INIT(pload_exp), ssrc_ ## side, rtp_ts, rtp_seq, pt_out, \
+	__packet_seq_ts( __FILE__, __LINE__, media_ ## side, pt_in, (str) STR_CONST(pload), \
+			(str) STR_CONST(pload_exp), ssrc_ ## side, rtp_ts, rtp_seq, pt_out, \
 			ts_exp, 1, fatal)
 
 #define packet_seq_exp(side, pt_in, pload, rtp_ts, rtp_seq, pt_out, pload_exp, ts_diff_exp) \
-	__packet_seq_ts( __FILE__, __LINE__, media_ ## side, pt_in, (str) STR_CONST_INIT(pload), \
-			(str) STR_CONST_INIT(pload_exp), ssrc_ ## side, rtp_ts, rtp_seq, pt_out, \
+	__packet_seq_ts( __FILE__, __LINE__, media_ ## side, pt_in, (str) STR_CONST(pload), \
+			(str) STR_CONST(pload_exp), ssrc_ ## side, rtp_ts, rtp_seq, pt_out, \
 			-1, ts_diff_exp, 1)
 
 static void __packet_seq_ts(const char *file, int line, struct call_media *media, long long pt_in, str pload,
@@ -544,7 +544,7 @@ int main(void) {
 
 #ifdef WITH_AMR_TESTS
 	{
-		str codec_name = STR_CONST_INIT("AMR-WB");
+		str codec_name = STR_CONST("AMR-WB");
 		codec_def_t *def = codec_find(&codec_name, MT_AUDIO);
 		assert(def);
 		if (def->support_encoding && def->support_decoding) {
@@ -602,7 +602,7 @@ int main(void) {
 	}
 
 	{
-		str codec_name = STR_CONST_INIT("AMR");
+		str codec_name = STR_CONST("AMR");
 		codec_def_t *def = codec_find(&codec_name, MT_AUDIO);
 		assert(def);
 		if (def->support_encoding && def->support_decoding) {