CVS: linux-atm/src/lane .cvsignore,1.1,1.2 dump.c,1.2,1.3

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

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

Modified Files:
	dump.c 
Added Files:
	.cvsignore 
Log Message:
merge 2.5.0 branch into the head



Index: dump.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/lane/dump.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dump.c	9 Oct 2001 22:33:06 -0000	1.2
--- dump.c	1 Jan 2008 00:14:50 -0000	1.3
***************
*** 186,190 ****
    case DT_FILE:
      va_start(args, format);
!     printf_ret = vsprintf(buffer, format, args);
      assert(printf_ret > 0);
      printf_ret = fprintf(dump_filep, "%s%s%s", el_prefix[level], buffer,
--- 186,190 ----
    case DT_FILE:
      va_start(args, format);
!     printf_ret = vsnprintf(buffer, BUFSIZE, format, args);
      assert(printf_ret > 0);
      printf_ret = fprintf(dump_filep, "%s%s%s", el_prefix[level], buffer,
***************
*** 197,201 ****
    case DT_SYSLOG:
      va_start(args, format);
!     printf_ret = vsprintf(buffer, format, args);
      assert(printf_ret > 0);
      syslog(el_to_log[level], "%s", buffer);
--- 197,201 ----
    case DT_SYSLOG:
      va_start(args, format);
!     printf_ret = vsnprintf(buffer, BUFSIZE, format, args);
      assert(printf_ret > 0);
      syslog(el_to_log[level], "%s", buffer);
***************
*** 221,225 ****
  
      va_start(args, format);
!     sprintf_ret = vsprintf(buffer2, buffer, args);
      assert(sprintf_ret > 0);
      va_end(args);
--- 221,225 ----
  
      va_start(args, format);
!     sprintf_ret = vsnprintf(buffer2, 2048, buffer, args);
      assert(sprintf_ret > 0);
      va_end(args);