X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=join.cpp;h=b1a06bb500ad40eacafca5dc0ffacd11367cf7e6;hp=c41ae4bfa085b6d9033b9e02068048e9d59141bf;hb=b987a1bbbcabbf183ebe009903778671a1591337;hpb=0efcf371b4a61fa1376e83d2b7404aeb47a36e26

diff --git a/join.cpp b/join.cpp
index c41ae4b..b1a06bb 100644
--- a/join.cpp
+++ b/join.cpp
@@ -12,9 +12,9 @@
 #include "main.h"
 //#define __u8 unsigned char
 //#define __u16 unsigned short
-//#define __u32 unsigned long
+//#define __u32 unsigned int
 
-unsigned long join_serial = 1; /* must be 1, because 0== no join */
+unsigned int join_serial = 1; /* must be 1, because 0== no join */
 
 //JOIN_STATES
 
@@ -23,12 +23,11 @@ class Join *join_first = NULL;
 /*
  * find the join with join_id
  */ 
-class Join *find_join_id(unsigned long join_id)
+class Join *find_join_id(unsigned int join_id)
 {
 	class Join *join = join_first;
 
-	while(join)
-	{
+	while(join) {
 //printf("comparing: '%s' with '%s'\n", name, join->j_name);
 		if (join->j_serial == join_id)
 			return(join);
@@ -71,8 +70,7 @@ Join::~Join()
 
 	cl = join_first;
 	clp = &join_first;
-	while(cl)
-	{
+	while(cl) {
 		if (cl == this)
 			break;
 		clp = &cl->next;
@@ -88,7 +86,7 @@ Join::~Join()
 /* epoint sends a message to a join
  *
  */
-void Join::message_epoint(unsigned long epoint_id, int message_type, union parameter *param)
+void Join::message_epoint(unsigned int epoint_id, int message_type, union parameter *param)
 {
 }
 
@@ -106,15 +104,12 @@ int Join::handler(void)
 void join_free(void)
 {
 
-	if (!join_first)
-	{
+	if (!join_first) {
 		PDEBUG(DEBUG_JOIN, "no more pending join(s), done!\n");
 		return;
 	}
-	while(join_first)
-	{
-		if (options.deb & DEBUG_JOIN)
-		{
+	while(join_first) {
+		if (options.deb & DEBUG_JOIN) {
 			PDEBUG(DEBUG_JOIN, "freeing pending join\n");
 		}