CVS: linux-atm/src/ilmid/asn1 .cvsignore, 1.1, 1.2 asn_config.h, 1.2, 1.3 nibble_alloc.c, 1.2, 1.3 nibble_alloc.h, 1.2, 1.3

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

Update of /cvsroot/linux-atm/linux-atm/src/ilmid/asn1
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24942/src/ilmid/asn1

Modified Files:
	asn_config.h nibble_alloc.c nibble_alloc.h 
Added Files:
	.cvsignore 
Log Message:
merge 2.5.0 branch into the head



Index: asn_config.h
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/asn_config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** asn_config.h	9 Oct 2001 22:33:06 -0000	1.2
--- asn_config.h	1 Jan 2008 00:14:50 -0000	1.3
***************
*** 24,27 ****
--- 24,29 ----
  #include <ctype.h> /*  for isprint() in asn_octs.c */
  #include <setjmp.h> /* for jmp_buf type, setjmp and longjmp */
+ #include <string.h> /* memcpy, etc */
+ #include <stdlib.h> /* for free */
  
  /* for pow() used in asn_real.c - must include to avoid casting err on pow */

Index: nibble_alloc.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/nibble_alloc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nibble_alloc.c	9 Oct 2001 22:33:06 -0000	1.2
--- nibble_alloc.c	1 Jan 2008 00:14:50 -0000	1.3
***************
*** 153,156 ****
--- 153,158 ----
          tmp = nextTmp;
      }
+     nm->firstNibbleBuf->next = NULL;
+     nm->currNibbleBuf = nm->firstNibbleBuf;
  
  } /* ResetNibbleMem */

Index: nibble_alloc.h
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/asn1/nibble_alloc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nibble_alloc.h	9 Oct 2001 22:33:06 -0000	1.2
--- nibble_alloc.h	1 Jan 2008 00:14:50 -0000	1.3
***************
*** 40,44 ****
                            unsigned long int incrementSize));
  
! void ShutdownNibbleMem();
  
  void ServiceNibbleFault PROTO((unsigned long int size));
--- 40,44 ----
                            unsigned long int incrementSize));
  
! void ShutdownNibbleMem(void);
  
  void ServiceNibbleFault PROTO((unsigned long int size));
***************
*** 46,50 ****
  void* NibbleAlloc PROTO((unsigned long int size));
  
! void ResetNibbleMem();
  
  
--- 46,50 ----
  void* NibbleAlloc PROTO((unsigned long int size));
  
! void ResetNibbleMem(void);