X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinpbx.cpp;h=630c59941332149e2d3364ccd8b0272076807ff4;hp=0e15ef1e421369713f1cb6c233a2e39cf44e0f62;hb=b2a665f8f1cdeb7d02c3f665d95e6a80297e21d1;hpb=44b6b77e68c2b685174c09da4467139e009130b4

diff --git a/joinpbx.cpp b/joinpbx.cpp
index 0e15ef1..630c599 100644
--- a/joinpbx.cpp
+++ b/joinpbx.cpp
@@ -12,7 +12,7 @@
 #include "main.h"
 //#define __u8 unsigned char
 //#define __u16 unsigned short
-//#define __u32 unsigned long
+//#define __u32 unsigned int
 
 
 /* notify endpoint about state change (if any) */
@@ -112,7 +112,7 @@ static int notify_state_change(int join_id, int epoint_id, int old_state, int ne
 
 
 /* debug function for join */
-void joinpbx_debug(class JoinPBX *joinpbx, char *function)
+void joinpbx_debug(class JoinPBX *joinpbx, const char *function)
 {
 	struct join_relation *relation;
 	struct port_list *portlist;
@@ -134,12 +134,12 @@ void joinpbx_debug(class JoinPBX *joinpbx, char *function)
 		epoint = find_epoint_id(relation->epoint_id);
 		if (!epoint)
 		{
-			PDEBUG(DEBUG_JOIN, "warning: relations epoint id=%ld doesn't exists!\n", relation->epoint_id);
+			PDEBUG(DEBUG_JOIN, "warning: relations epoint id=%d doesn't exists!\n", relation->epoint_id);
 			relation = relation->next;
 			continue;
 		}
 		buffer[0] = '\0';
-		UPRINT(strchr(buffer,0), "*** ep%ld", relation->epoint_id);
+		UPRINT(strchr(buffer,0), "*** ep%d", relation->epoint_id);
 		UPRINT(strchr(buffer,0), " ifs=");
 		portlist = epoint->ep_portlist;
 		while(portlist)
@@ -148,7 +148,7 @@ void joinpbx_debug(class JoinPBX *joinpbx, char *function)
 			if (port)
 				UPRINT(strchr(buffer,0), "%s,", port->p_name);
 			else
-				UPRINT(strchr(buffer,0), "<port %ld doesn't exist>,", portlist->port_id);
+				UPRINT(strchr(buffer,0), "<port %d doesn't exist>,", portlist->port_id);
 			portlist = portlist->next;
 		}
 //		UPRINT(strchr(buffer,0), " endpoint=%d on=%s hold=%s", epoint->ep_serial, (epoint->ep_join_id==joinpbx->j_serial)?"yes":"no", (epoint->get_hold_id()==joinpbx->j_serial)?"yes":"no");
@@ -432,7 +432,7 @@ void JoinPBX::bridge(void)
 /*
  * bridging is only possible with two connected endpoints
  */
-void JoinPBX::bridge_data(unsigned long epoint_from, struct join_relation *relation_from, union parameter *param)
+void JoinPBX::bridge_data(unsigned int epoint_from, struct join_relation *relation_from, union parameter *param)
 {
 	struct join_relation *relation_to;
 
@@ -549,7 +549,7 @@ int JoinPBX::release(struct join_relation *relation, int location, int cause)
 
 /* count number of relations in a join
  */
-int joinpbx_countrelations(unsigned long join_id)
+int joinpbx_countrelations(unsigned int join_id)
 {
 	struct join_relation *relation;
 	int i;
@@ -633,7 +633,7 @@ struct join_relation *JoinPBX::add_relation(void)
 /* epoint sends a message to a join
  *
  */
-void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union parameter *param)
+void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union parameter *param)
 {
 	class Join *cl;
 	struct join_relation *relation, *reltemp;
@@ -986,7 +986,7 @@ int track_notify(int oldstate, int notify)
  * if other outgoing endpoints already exists, they are release as well.
  * note: if this functions fails, it will destroy its own join object!
  */
-int JoinPBX::out_setup(unsigned long epoint_id, int message_type, union parameter *param, char *newnumber)
+int JoinPBX::out_setup(unsigned int epoint_id, int message_type, union parameter *param, char *newnumber)
 {
 	struct join_relation *relation;
 	struct lcr_msg *message;