add missing return statements

Fix occurences of "no return in non-void function".

7 files changed, 14 insertions, 0 deletions

diff --git a/src/log.cpp b/src/log.cpp
index ee2ce87..9514b13 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -40,6 +40,7 @@ void *main_logview(void *arg) {
 		// TODO: handle situation where log file was zapped.
 		if (ui) ui->cb_log_updated(false);
 	}
+	return NULL;
 }
 
 bool t_log::move_current_to_old(void) {
diff --git a/src/mwi/mwi_dialog.cpp b/src/mwi/mwi_dialog.cpp
index 41ca0dd..135a866 100644
--- a/src/mwi/mwi_dialog.cpp
+++ b/src/mwi/mwi_dialog.cpp
@@ -32,4 +32,5 @@ t_mwi_dialog::t_mwi_dialog(t_phone_user *_phone_user) :
 t_mwi_dialog *t_mwi_dialog::copy(void) {
 	// Copy is not needed.
 	assert(false);
+	return NULL;
 }
diff --git a/src/parser/definitions.cpp b/src/parser/definitions.cpp
index c849553..ef2e51d 100644
--- a/src/parser/definitions.cpp
+++ b/src/parser/definitions.cpp
@@ -38,6 +38,7 @@ string method2str(const t_method &m, const string &unknown) {
 	case METHOD_UNKNOWN:	return unknown;
 	default:		assert(false);
 	}
+	return unknown;
 }
 
 t_method str2method(const string &s) {
diff --git a/src/presence/presence_dialog.cpp b/src/presence/presence_dialog.cpp
index f281493..070dbc2 100644
--- a/src/presence/presence_dialog.cpp
+++ b/src/presence/presence_dialog.cpp
@@ -32,4 +32,5 @@ t_presence_dialog::t_presence_dialog(t_phone_user *_phone_user, t_presence_state
 t_presence_dialog *t_presence_dialog::copy(void) {
 	// Copy is not needed.
 	assert(false);
+	return NULL;
 }
diff --git a/src/sdp/sdp.cpp b/src/sdp/sdp.cpp
index 7d5de3b..3c9a93d 100644
--- a/src/sdp/sdp.cpp
+++ b/src/sdp/sdp.cpp
@@ -37,6 +37,7 @@ string sdp_ntwk_type2str(t_sdp_ntwk_type n) {
 	default:
 		assert(false);
 	}
+	return "";
 }
 
 t_sdp_ntwk_type str2sdp_ntwk_type(string s) {
@@ -53,6 +54,7 @@ string sdp_addr_type2str(t_sdp_addr_type a) {
 	default:
 		assert(false);
 	}
+	return "";
 }
 
 t_sdp_addr_type str2sdp_addr_type(string s) {
@@ -69,6 +71,7 @@ string sdp_transport2str(t_sdp_transport t) {
 	default:
 		assert(false);
 	}
+	return "";
 }
 
 t_sdp_transport str2sdp_transport(string s) {
@@ -92,6 +95,7 @@ string sdp_media_type2str(t_sdp_media_type m) {
 	default:
 		assert(false);
 	}
+	return "";
 }
 
 string get_rtpmap(unsigned format, t_audio_codec codec) {
@@ -153,6 +157,7 @@ string sdp_media_direction2str(t_sdp_media_direction d) {
 	default:
 		assert(false);
 	}
+	return "";
 }
 
 ///////////////////////////////////
diff --git a/src/timekeeper.cpp b/src/timekeeper.cpp
index 9a1a515..88983e1 100644
--- a/src/timekeeper.cpp
+++ b/src/timekeeper.cpp
@@ -782,4 +782,5 @@ void *timekeeper_sigwait(void *arg) {
 		if (sigwait(&sigset, &sig) == EINTR) continue;
 		evq_timekeeper->interrupt();
 	}
+	return NULL;
 }
diff --git a/src/user.cpp b/src/user.cpp
index 224e291..b3de725 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -225,6 +225,7 @@ string t_user::bit_rate_type2str(t_bit_rate_type b) const {
 	default:
 		assert(false);
 	}
+	return "";
 }
 
 t_dtmf_transport t_user::str2dtmf_transport(const string &s) const {
@@ -244,6 +245,7 @@ string t_user::dtmf_transport2str(t_dtmf_transport d) const {
 	default:
 		assert(false);
 	}
+	return "";
 }
 
 t_g726_packing t_user::str2g726_packing(const string &s) const {
@@ -259,6 +261,7 @@ string t_user::g726_packing2str(t_g726_packing packing) const {
 	default:
 		assert(false);
 	}
+	return "";
 }
 
 t_sip_transport t_user::str2sip_transport(const string &s) const {
@@ -276,6 +279,7 @@ string t_user::sip_transport2str(t_sip_transport transport) const {
 	default:
 		assert(false);
 	}
+	return "";
 }
 
 string t_user::expand_filename(const string &filename) {