projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed linker flags for chan LCR
[lcr.git]
/
join.cpp
diff --git
a/join.cpp
b/join.cpp
index
2a1e0a7
..
5dcbde2
100644
(file)
--- a/
join.cpp
+++ b/
join.cpp
@@
-9,21
+9,12
@@
** **
\*****************************************************************************/
** **
\*****************************************************************************/
-#include <stdio.h>
-//#include <string.h>
-//#include <stdlib.h>
-//#include <unistd.h>
-//#include <poll.h>
-//#include <sys/types.h>
-//#include <sys/stat.h>
-//#include <fcntl.h>
#include "main.h"
//#define __u8 unsigned char
//#define __u16 unsigned short
#include "main.h"
//#define __u8 unsigned char
//#define __u16 unsigned short
-//#define __u32 unsigned long
-//#include "linux/isdnif.h"
+//#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
//JOIN_STATES
@@
-32,14
+23,13
@@
class Join *join_first = NULL;
/*
* find the join with join_id
*/
/*
* 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;
{
class Join *join = join_first;
- while(join)
- {
-//printf("comparing: '%s' with '%s'\n", name, join->c_name);
- if (join->c_serial == join_id)
+ while(join) {
+//printf("comparing: '%s' with '%s'\n", name, join->j_name);
+ if (join->j_serial == join_id)
return(join);
join = join->next;
}
return(join);
join = join->next;
}
@@
-55,8
+45,8
@@
Join::Join(void)
{
class Join **joinp;
{
class Join **joinp;
-
c
_serial = join_serial++;
-
c
_type = JOIN_TYPE_NONE;
+
j
_serial = join_serial++;
+
j
_type = JOIN_TYPE_NONE;
/* attach to chain */
next = NULL;
/* attach to chain */
next = NULL;
@@
-80,8
+70,7
@@
Join::~Join()
cl = join_first;
clp = &join_first;
cl = join_first;
clp = &join_first;
- while(cl)
- {
+ while(cl) {
if (cl == this)
break;
clp = &cl->next;
if (cl == this)
break;
clp = &cl->next;
@@
-97,33
+86,21
@@
Join::~Join()
/* epoint sends a message to a 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)
{
}
{
}
-/* join process is called from the main loop
- * it processes the current calling state.
- * returns 0 if nothing was done
- */
-int Join::handler(void)
-{
- return(0);
-}
-
/* free all join structures */
void join_free(void)
{
/* free all join structures */
void join_free(void)
{
- if (!join_first)
- {
+ if (!join_first) {
PDEBUG(DEBUG_JOIN, "no more pending join(s), done!\n");
return;
}
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");
}
PDEBUG(DEBUG_JOIN, "freeing pending join\n");
}