MT#55283 update return type

Change-Id: Ia4fc6e186a9cb0ca6cee9ecd53118362233b1f09

daemon/call_interfaces.c

@@ -2701,10 +2701,13 @@ static const char *call_offer_answer_ng(ng_command_ctx_t *ctx, const char* addr)
 			goto out;
 
 		/* if all fine, prepare an outer sdp and save it */
-		if ((ret = sdp_create(&sdp_out, to_ml, &flags)) == 0) {
+		if (sdp_create(&sdp_out, to_ml, &flags)) {
 			/* TODO: should we save sdp_out? */
 			save_last_sdp(from_ml, &sdp, &parsed, &streams);
+			ret = 0;
 		}
+		else
+			ret = -1;
 
 		/* place return output SDP */
 		if (sdp_out.len) {
@@ -4140,15 +4143,14 @@ const char *call_publish_ng(ng_command_ctx_t *ctx, const char *addr) {
 	if (ret)
 		ilog(LOG_ERR, "Publish error"); // XXX close call? handle errors?
 
-	ret = sdp_create(&sdp_out, ml, &flags);
-	if (!ret) {
+	bool ok = sdp_create(&sdp_out, ml, &flags);
+	if (ok) {
 		save_last_sdp(ml, &sdp_in, &parsed, &streams);
 		ctx->ngbuf->sdp_out = sdp_out.s;
 		parser->dict_add_str(ctx->resp, "sdp", &sdp_out);
 		sdp_out = STR_NULL; // ownership passed to output
 	}
-
-	if (ret)
+	else
 		return "Failed to create SDP";
 
 	dequeue_sdp_fragments(ml);
@@ -4201,8 +4203,8 @@ const char *call_subscribe_request_ng(ng_command_ctx_t *ctx) {
 		return "Failed to request subscription";
 
 	/* create new SDP */
-	ret = sdp_create(&sdp_out, dest_ml, &flags);
-	if (ret)
+	bool ok = sdp_create(&sdp_out, dest_ml, &flags);
+	if (!ok)
 		return "Failed to create SDP";
 
 	/* place return output SDP */

daemon/janus.c

@@ -642,14 +642,14 @@ static const char *janus_videoroom_join(struct websocket_message *wm, struct jan
 			return "Subscribe error";
 
 		/* create SDP */
-		ret = sdp_create(jsep_sdp_out, dest_ml, &flags);
+		bool ok = sdp_create(jsep_sdp_out, dest_ml, &flags);
 
 		if (!dest_ml->janus_session)
 			dest_ml->janus_session = obj_get(session);
 
 		dequeue_sdp_fragments(dest_ml);
 
-		if (ret)
+		if (!ok)
 			return "Error generating SDP";
 
 		*jsep_type_out = "offer";
@@ -873,8 +873,8 @@ static const char *janus_videoroom_configure(struct websocket_message *wm, struc
 		// XXX check there's only one audio and one video stream?
 
 		g_auto(str) sdp_out = STR_NULL;
-		ret = sdp_create(&sdp_out, ml, &flags);
-		if (ret)
+		bool ok = sdp_create(&sdp_out, ml, &flags);
+		if (!ok)
 			return "Publish error";
 
 		if (!ml->janus_session)

daemon/sdp.c

@@ -3406,7 +3406,7 @@ static struct call_media *sdp_out_set_source_media_address(struct call_media *me
  * given monologue is a monologue which is being processed.
  */
 __attribute__((nonnull(1, 2, 3)))
-int sdp_create(str *out, struct call_monologue *monologue, sdp_ng_flags *flags)
+bool sdp_create(str *out, struct call_monologue *monologue, sdp_ng_flags *flags)
 {
 	const char *err = NULL;
 	GString *s = NULL;
@@ -3536,30 +3536,30 @@ int sdp_create(str *out, struct call_monologue *monologue, sdp_ng_flags *flags)
 
 	out->len = s->len;
 	out->s = g_string_free(s, FALSE);
-	return 0;
+	return true;
 err:
 	if (s)
 		g_string_free(s, TRUE);
 	ilog(LOG_ERR, "Failed to create SDP: %s", err);
-	return -1;
+	return false;
 }
 
-int sdp_is_duplicate(sdp_sessions_q *sessions) {
+bool sdp_is_duplicate(sdp_sessions_q *sessions) {
 	for (__auto_type l = sessions->head; l; l = l->next) {
 		struct sdp_session *s = l->data;
 		attributes_q *attr_list = attr_list_get_by_id(&s->attributes, ATTR_RTPENGINE);
 		if (!attr_list)
-			return 0;
+			return false;
 		for (__auto_type ql = attr_list->head; ql; ql = ql->next) {
 			struct sdp_attribute *attr = ql->data;
 			if (!str_cmp_str(&attr->strs.value, &rtpe_instance_id))
 				goto next;
 		}
-		return 0;
+		return false;
 next:
 		;
 	}
-	return 1;
+	return true;
 }
 
 void sdp_init(void) {

include/sdp.h

@@ -48,8 +48,8 @@ bool sdp_parse(str *body, sdp_sessions_q *sessions, const sdp_ng_flags *);
 bool sdp_streams(const sdp_sessions_q *sessions, sdp_streams_q *streams, sdp_ng_flags *);
 void sdp_streams_clear(sdp_streams_q *);
 void sdp_sessions_clear(sdp_sessions_q *sessions);
-int sdp_is_duplicate(sdp_sessions_q *sessions);
-int sdp_create(str *out, struct call_monologue *, sdp_ng_flags *flags);
+bool sdp_is_duplicate(sdp_sessions_q *sessions);
+bool sdp_create(str *out, struct call_monologue *, sdp_ng_flags *flags);
 const char *sdp_get_sendrecv(struct call_media *media);
 
 int sdp_parse_candidate(struct ice_candidate *cand, const str *s); // returns -1, 0, 1