linux-atm-commits

[chas w. <ch...@us...>]

Update of /cvsroot/linux-atm/linux-atm/src/lane
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22549/src/lane

Modified Files:
      Tag: V2_5_3
	connect.c connect_bus.c lane_atm.c lecs.c 
Log Message:
integrate 000-debian_16.patch patch from openwrt

socket int to socket_t conversion and some warning cleanups.
also corrects some errors in the man page macros.


Index: connect.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lane/connect.c,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -C2 -d -r1.2 -r1.2.8.1
*** connect.c	9 Oct 2001 22:33:06 -0000	1.2
--- connect.c	24 Jan 2011 16:21:39 -0000	1.2.8.1
***************
*** 259,263 ****
  {
    Conn_t *tmp, *newconn;
!   int fd, nbytes;
    static char buffer[BUFSIZE];
    LaneControl_t *ctmp;
--- 259,264 ----
  {
    Conn_t *tmp, *newconn;
!   int fd;
!   socklen_t nbytes;
    static char buffer[BUFSIZE];
    LaneControl_t *ctmp;

Index: connect_bus.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lane/connect_bus.c,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -C2 -d -r1.2 -r1.2.8.1
*** connect_bus.c	9 Oct 2001 22:33:06 -0000	1.2
--- connect_bus.c	24 Jan 2011 16:21:39 -0000	1.2.8.1
***************
*** 171,175 ****
  {
    Conn_t *tmp, *newconn;
!   int fd, nbytes;
    static char buffer[BUFSIZE];
    struct sockaddr_atmsvc addr;
--- 171,176 ----
  {
    Conn_t *tmp, *newconn;
!   int fd;
!   socklen_t nbytes;
    static char buffer[BUFSIZE];
    struct sockaddr_atmsvc addr;

Index: lane_atm.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lane/lane_atm.c,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -C2 -d -r1.2 -r1.2.8.1
*** lane_atm.c	9 Oct 2001 22:33:07 -0000	1.2
--- lane_atm.c	24 Jan 2011 16:21:39 -0000	1.2.8.1
***************
*** 139,143 ****
    struct atm_qos qos;
    int fd, ret;
!   int len = sizeof(address);
    
    fd = socket(PF_ATMSVC, SOCK_DGRAM, 0);
--- 139,143 ----
    struct atm_qos qos;
    int fd, ret;
!   socklen_t len = sizeof(address);
    
    fd = socket(PF_ATMSVC, SOCK_DGRAM, 0);

Index: lecs.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lane/lecs.c,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -C2 -d -r1.2 -r1.2.8.1
*** lecs.c	9 Oct 2001 22:33:07 -0000	1.2
--- lecs.c	24 Jan 2011 16:21:39 -0000	1.2.8.1
***************
*** 120,124 ****
    fd_set fds;
    struct sockaddr_atmsvc client;
!   int len;
    unsigned char buffer[P_SIZE];
  
--- 120,124 ----
    fd_set fds;
    struct sockaddr_atmsvc client;
!   socklen_t len;
    unsigned char buffer[P_SIZE];