linux-atm-commits

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

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

Modified Files:
      Tag: V2_5_3
	asn_int.c asn_oid.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: asn_int.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/asn_int.c,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -C2 -d -r1.2 -r1.2.8.1
*** asn_int.c	9 Oct 2001 22:33:06 -0000	1.2
--- asn_int.c	24 Jan 2011 16:21:39 -0000	1.2.8.1
***************
*** 186,190 ****
  unsigned short int indent)
  {
!     fprintf(f,"%d", *v);
  } 
  
--- 186,190 ----
  unsigned short int indent)
  {
!     fprintf(f,"%ld", *v);
  } 
  
***************
*** 371,374 ****
  unsigned short int indent)
  {
!     fprintf(f,"%u", *v);
  } 
--- 371,374 ----
  unsigned short int indent)
  {
!     fprintf(f,"%lu", *v);
  } 

Index: asn_oid.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/asn_oid.c,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** asn_oid.c	3 Mar 2009 18:23:26 -0000	1.3
--- asn_oid.c	24 Jan 2011 16:21:39 -0000	1.3.4.1
***************
*** 128,132 ****
          firstArcNum = 2;
  
!     fprintf(f,"%u %u", firstArcNum, arcNum - (firstArcNum * 40));
  
      for (; i < v->octetLen ; )
--- 128,132 ----
          firstArcNum = 2;
  
!     fprintf(f,"%d %lu", firstArcNum, arcNum - (firstArcNum * 40));
  
      for (; i < v->octetLen ; )
***************
*** 137,141 ****
          arcNum = (arcNum << 7) + (v->octs[i] & 0x7f);
          i++;
!         fprintf(f," %u", arcNum);
      }
      fprintf(f,"}");
--- 137,141 ----
          arcNum = (arcNum << 7) + (v->octs[i] & 0x7f);
          i++;
!         fprintf(f," %lu", arcNum);
      }
      fprintf(f,"}");