jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid some List warnings

Browse Source
This commit is contained in:
Juha Heinanen
2021-03-26 15:48:45 +02:00
parent 08f46745a1
commit 2740aa9d87
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/cpp/baresip.c
+4 -8
View File
@@ -387,7 +387,7 @@ static void mqueue_handler(int id, void *data, void *arg)
static int pfd[2]; static int pfd[2];
static pthread_t loggingThread; static pthread_t loggingThread;
static void *loggingFunction() { static void *loggingFunction(void *arg) {
ssize_t readSize; ssize_t readSize;
char buf[128]; char buf[128];
@@ -410,7 +410,7 @@ static int runLoggingThread() {
dup2(pfd[1], 1); dup2(pfd[1], 1);
dup2(pfd[1], 2); dup2(pfd[1], 2);
int ret = pthread_create(&loggingThread, 0, loggingFunction, 0); int ret = pthread_create(&loggingThread, NULL, loggingFunction, NULL);
if (ret != 0) if (ret != 0)
return ret; return ret;
@@ -446,7 +446,6 @@ Java_com_tutpro_baresip_BaresipService_baresipStart(JNIEnv *env, jobject instanc
LOGD("starting baresip\n"); LOGD("starting baresip\n");
struct sa temp_sa;
const char *net_interface = (*env)->GetStringUTFChars(env, jNetInterface, 0); const char *net_interface = (*env)->GetStringUTFChars(env, jNetInterface, 0);
const int net_af = jNetAf; const int net_af = jNetAf;
@@ -1370,7 +1369,7 @@ Java_com_tutpro_baresip_Call_call_1hold(JNIEnv *env, jobject thiz, jstring javaC
LOGD("holding call %s\n", native_call); LOGD("holding call %s\n", native_call);
(*env)->ReleaseStringUTFChars(env, javaCall, native_call); (*env)->ReleaseStringUTFChars(env, javaCall, native_call);
re_thread_enter(); re_thread_enter();
struct audio *au = call_audio(call); // struct audio *au = call_audio(call);
// audio_set_hold(au, true); // audio_set_hold(au, true);
// audio_set_source(au, NULL, NULL); // audio_set_source(au, NULL, NULL);
ret = call_hold(call, true); ret = call_hold(call, true);
@@ -1386,7 +1385,7 @@ Java_com_tutpro_baresip_Call_call_1unhold(JNIEnv *env, jobject thiz, jstring jav
LOGD("unholding call %s\n", native_call); LOGD("unholding call %s\n", native_call);
(*env)->ReleaseStringUTFChars(env, javaCall, native_call); (*env)->ReleaseStringUTFChars(env, javaCall, native_call);
re_thread_enter(); re_thread_enter();
struct audio *au = call_audio(call); // struct audio *au = call_audio(call);
// audio_set_hold(au, false); // audio_set_hold(au, false);
// audio_set_source(au, "opensles", "nil"); // audio_set_source(au, "opensles", "nil");
ret = call_hold(call, false); ret = call_hold(call, false);
@@ -1579,8 +1578,6 @@ Java_com_tutpro_baresip_Api_video_1codecs(JNIEnv *env, jobject thiz)
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_com_tutpro_baresip_Api_contact_1add(JNIEnv *env, jobject thiz, jstring javaContact) { Java_com_tutpro_baresip_Api_contact_1add(JNIEnv *env, jobject thiz, jstring javaContact) {
struct pl pl_addr; struct pl pl_addr;
const struct list *lst;
struct le *le;
const char *native_contact = (*env)->GetStringUTFChars(env, javaContact, 0); const char *native_contact = (*env)->GetStringUTFChars(env, javaContact, 0);
pl_set_str(&pl_addr, native_contact); pl_set_str(&pl_addr, native_contact);
if (contact_add(baresip_contacts(), NULL, &pl_addr) != 0) { if (contact_add(baresip_contacts(), NULL, &pl_addr) != 0) {
@@ -1594,7 +1591,6 @@ Java_com_tutpro_baresip_Api_contact_1add(JNIEnv *env, jobject thiz, jstring java
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_com_tutpro_baresip_Api_contacts_1remove(JNIEnv *env, jobject thiz) { Java_com_tutpro_baresip_Api_contacts_1remove(JNIEnv *env, jobject thiz) {
struct le *le; struct le *le;
le = list_head(contact_list(baresip_contacts()));
while ((le = list_head(contact_list(baresip_contacts())))) { while ((le = list_head(contact_list(baresip_contacts())))) {
struct contact *c = le->data; struct contact *c = le->data;
contact_remove(baresip_contacts(), c); contact_remove(baresip_contacts(), c);
app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+1 -1
View File
@@ -95,7 +95,7 @@ object Utils {
private fun uriParams(uri: String): List<String> { private fun uriParams(uri: String): List<String> {
val params = uri.split(";") val params = uri.split(";")
return if (params.size == 1) listOf<String>() else params.subList(1, params.size) return if (params.size == 1) listOf() else params.subList(1, params.size)
} }
fun friendlyUri(uri: String, domain: String): String { fun friendlyUri(uri: String, domain: String): String {