OPENZAP-237: [freetdm] Use __FTDM_FUNC__ instead of __FUNCTION__ to comply with c99 in gcc 5.1

libs/freetdm/configure.ac

@@ -91,7 +91,7 @@ gnu)
 	COMP_VENDOR_CFLAGS="-ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0"
 	;;
 sun)
-	COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -D__FUNCTION__=__func__ -xvpara"
+	COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -xvpara"
 	if test "$enable_64" != "no" ; then
 		COMP_VENDOR_CFLAGS="-m64 $COMP_VENDOR_CFLAGS"
 	fi

libs/freetdm/mod_freetdm/mod_freetdm.c

@@ -37,10 +37,6 @@
 
 //#define CUDATEL_DEBUG
 
-#ifndef __FUNCTION__
-#define __FUNCTION__ __SWITCH_FUNC__
-#endif
-
 #define FREETDM_LIMIT_REALM "__freetdm"
 #define FREETDM_VAR_PREFIX "freetdm_"
 #define FREETDM_VAR_PREFIX_LEN (sizeof(FREETDM_VAR_PREFIX)-1)

libs/freetdm/src/ftdm_io.c

@@ -3863,7 +3863,7 @@ skipdebug:
 			if (!strcmp(ftdmchan->dtmf_hangup_buf, ftdmchan->span->dtmf_hangup)) {
 				ftdm_log(FTDM_LOG_DEBUG, "DTMF hangup detected.\n");
 
-				ftdm_channel_set_state(__FILE__, __FUNCTION__, __LINE__, ftdmchan, FTDM_CHANNEL_STATE_HANGUP, 0, NULL);
+				ftdm_channel_set_state(__FILE__, __FTDM_FUNC__, __LINE__, ftdmchan, FTDM_CHANNEL_STATE_HANGUP, 0, NULL);
 				break;
 			}
 		}
@@ -6122,7 +6122,7 @@ static void execute_safety_hangup(void *data)
 	fchan->hangup_timer = 0;
 	if (fchan->state == FTDM_CHANNEL_STATE_TERMINATING) {
 		ftdm_log_chan(fchan, FTDM_LOG_WARNING, "Forcing hangup since the user did not confirmed our hangup after %dms\n", FORCE_HANGUP_TIMER);
-		_ftdm_channel_call_hangup_nl(__FILE__, __FUNCTION__, __LINE__, fchan, NULL);
+		_ftdm_channel_call_hangup_nl(__FILE__, __FTDM_FUNC__, __LINE__, fchan, NULL);
 	} else {
 		ftdm_log_chan(fchan, FTDM_LOG_CRIT, "Not performing safety hangup, channel state is %s\n", ftdm_channel_state2str(fchan->state));
 	}

libs/freetdm/src/ftmod/ftmod_gsm/ftmod_gsm.c

@@ -507,7 +507,7 @@ void on_wat_log_span(uint8_t span_id, uint8_t level, char *fmt, ...)
 	
 	vsprintf(buff, fmt, argptr);
 
-	ftdm_log_chan_ex(gsm_data->dchan, __FILE__, __FUNCTION__, __LINE__, ftdm_level, "%s", buff);
+	ftdm_log_chan_ex(gsm_data->dchan, __FILE__, __FTDM_FUNC__, __LINE__, ftdm_level, "%s", buff);
 
 	va_end(argptr);
 }

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c

@@ -2340,7 +2340,7 @@ outgoing_successful:
 #if 0
 	  static FIO_CHANNEL_REQUEST_FUNCTION (ftdm_sangoma_ss7_request_chan)
 	  {
-	SS7_INFO ("KONRAD-> I got called %s\n", __FUNCTION__);
+	SS7_INFO ("KONRAD-> I got called %s\n", __FTDM_FUNC__);
 	return FTDM_SUCCESS;
 	  }
 

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_timers.c

@@ -55,7 +55,7 @@
 /* FUNCTIONS ******************************************************************/
 void handle_isup_t35(void *userdata)
 {
-    SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+    SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
     sngss7_timer_data_t *timer = userdata;
     sngss7_chan_data_t  *sngss7_info = timer->sngss7_info;
@@ -87,14 +87,14 @@ void handle_isup_t35(void *userdata)
     /*unlock*/
     ftdm_channel_unlock(ftdmchan);
 
-    SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+    SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
     return;
 }
 
 
 void handle_isup_t10(void *userdata)
 {
-	SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+	SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
 	sngss7_timer_data_t *timer = userdata;
 	sngss7_chan_data_t  *sngss7_info = timer->sngss7_info;
@@ -109,12 +109,12 @@ void handle_isup_t10(void *userdata)
 
 	ftdm_channel_unlock(ftdmchan);
 
-	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+	SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 
 void handle_isup_t39(void *userdata)
 {
-	SS7_FUNC_TRACE_ENTER(__FUNCTION__);
+	SS7_FUNC_TRACE_ENTER(__FTDM_FUNC__);
 
 	sngss7_timer_data_t *timer = userdata;
 	sngss7_chan_data_t  *sngss7_info = timer->sngss7_info;
@@ -146,7 +146,7 @@ void handle_isup_t39(void *userdata)
 	/*unlock*/
 	ftdm_channel_unlock(ftdmchan);
 
-	SS7_FUNC_TRACE_EXIT(__FUNCTION__);
+	SS7_FUNC_TRACE_EXIT(__FTDM_FUNC__);
 }
 /******************************************************************************/
 /* For Emacs:

libs/freetdm/src/include/ftdm_declare.h

@@ -57,6 +57,7 @@ extern "C" {
 #endif
 
 #ifdef _MSC_VER
+#define __FTDM_FUNC__ __FUNCTION__
 #if defined(FT_DECLARE_STATIC)
 #define FT_DECLARE(type)			type __stdcall
 #define FT_DECLARE_NONSTD(type)		type __cdecl
@@ -73,6 +74,7 @@ extern "C" {
 #define FT_DECLARE_INLINE(type)		extern __inline__ type /* why extern? see http://support.microsoft.com/kb/123768 */
 #define EX_DECLARE_DATA				__declspec(dllexport)
 #else
+#define __FTDM_FUNC__ (const char *)__func__
 #if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(HAVE_VISIBILITY)
 #define FT_DECLARE(type)		__attribute__((visibility("default"))) type
 #define FT_DECLARE_NONSTD(type)	__attribute__((visibility("default"))) type

libs/freetdm/src/include/ftdm_threadmutex.h

@@ -43,13 +43,13 @@ FT_DECLARE(void) ftdm_thread_override_default_stacksize(ftdm_size_t size);
 FT_DECLARE(ftdm_status_t) ftdm_mutex_create(ftdm_mutex_t **mutex);
 FT_DECLARE(ftdm_status_t) ftdm_mutex_destroy(ftdm_mutex_t **mutex);
 
-#define ftdm_mutex_lock(_x) _ftdm_mutex_lock(__FILE__, __LINE__, __FUNCTION__, _x)
+#define ftdm_mutex_lock(_x) _ftdm_mutex_lock(__FILE__, __LINE__, __FTDM_FUNC__, _x)
 FT_DECLARE(ftdm_status_t) _ftdm_mutex_lock(const char *file, int line, const char *func, ftdm_mutex_t *mutex);
 
-#define ftdm_mutex_trylock(_x) _ftdm_mutex_trylock(__FILE__, __LINE__, __FUNCTION__, _x)
+#define ftdm_mutex_trylock(_x) _ftdm_mutex_trylock(__FILE__, __LINE__, __FTDM_FUNC__, _x)
 FT_DECLARE(ftdm_status_t) _ftdm_mutex_trylock(const char *file, int line, const char *func, ftdm_mutex_t *mutex);
 
-#define ftdm_mutex_unlock(_x) _ftdm_mutex_unlock(__FILE__, __LINE__, __FUNCTION__, _x)
+#define ftdm_mutex_unlock(_x) _ftdm_mutex_unlock(__FILE__, __LINE__, __FTDM_FUNC__, _x)
 FT_DECLARE(ftdm_status_t) _ftdm_mutex_unlock(const char *file, int line, const char *func, ftdm_mutex_t *mutex);
 
 FT_DECLARE(ftdm_status_t) ftdm_interrupt_create(ftdm_interrupt_t **cond, ftdm_socket_t device, ftdm_wait_flag_t device_flags);

libs/freetdm/src/include/private/ftdm_state.h

@@ -106,7 +106,7 @@ typedef ftdm_status_t (*ftdm_channel_state_processor_t)(ftdm_channel_t *fchan);
 FT_DECLARE(ftdm_status_t) ftdm_channel_advance_states(ftdm_channel_t *fchan);
 
 FT_DECLARE(ftdm_status_t) _ftdm_channel_complete_state(const char *file, const char *function, int line, ftdm_channel_t *fchan);
-#define ftdm_channel_complete_state(obj) _ftdm_channel_complete_state(__FILE__, __FUNCTION__, __LINE__, obj)
+#define ftdm_channel_complete_state(obj) _ftdm_channel_complete_state(__FILE__, __FTDM_FUNC__, __LINE__, obj)
 FT_DECLARE(int) ftdm_check_state_all(ftdm_span_t *span, ftdm_channel_state_t state);
 
 /*!
@@ -201,7 +201,7 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_set_state(const char *file, const char *f
  * */
 FT_DECLARE(ftdm_status_t) _ftdm_set_state(const char *file, const char *func, int line,
 			ftdm_channel_t *fchan, ftdm_channel_state_t state);
-#define ftdm_set_state(obj, s) _ftdm_set_state(__FILE__, __FUNCTION__, __LINE__, obj, s);									\
+#define ftdm_set_state(obj, s) _ftdm_set_state(__FILE__, __FTDM_FUNC__, __LINE__, obj, s);									\
 
 /*!\brief This macro is deprecated, signaling modules should always lock the channel themselves anyways since they must
  * process first the user pending state changes then set a new state before releasing the lock 
@@ -211,11 +211,11 @@ FT_DECLARE(ftdm_status_t) _ftdm_set_state(const char *file, const char *func, in
 #define ftdm_set_state_locked(obj, s) \
 	do { \
 		ftdm_channel_lock(obj); \
-		ftdm_channel_set_state(__FILE__, __FUNCTION__, __LINE__, obj, s, 0, NULL);									\
+		ftdm_channel_set_state(__FILE__, __FTDM_FUNC__, __LINE__, obj, s, 0, NULL);									\
 		ftdm_channel_unlock(obj); \
 	} while(0);
 
-#define ftdm_set_state_r(obj, s, r) r = ftdm_channel_set_state(__FILE__, __FUNCTION__, __LINE__, obj, s, 0);
+#define ftdm_set_state_r(obj, s, r) r = ftdm_channel_set_state(__FILE__, __FTDM_FUNC__, __LINE__, obj, s, 0);
 
 #define ftdm_set_state_all(span, state) \
 	do { \

libs/freetdm/src/include/private/ftdm_types.h

@@ -337,10 +337,6 @@ typedef struct ftdm_module {
 	char path[256];
 } ftdm_module_t;
 
-#ifndef __FUNCTION__
-#define __FUNCTION__ (const char *)__func__
-#endif
-
 typedef struct ftdm_fsk_data_state ftdm_fsk_data_state_t;
 typedef int (*ftdm_fsk_data_decoder_t)(ftdm_fsk_data_state_t *state);
 typedef ftdm_status_t (*ftdm_fsk_write_sample_t)(int16_t *buf, ftdm_size_t buflen, void *user_data);

libs/freetdm/src/priserver.c

@@ -234,7 +234,7 @@ static int on_restart(struct sangoma_pri *spri, sangoma_pri_event_t event_type,
 
 static int on_anything(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event) 
 {
-	printf("%s: Caught Event %d (%s)\n", __FUNCTION__, event_type, sangoma_pri_event_str(event_type));
+	printf("%s: Caught Event %d (%s)\n", __FTDM_FUNC__, event_type, sangoma_pri_event_str(event_type));
 	return 0;
 }