Enlightenment CVS committal Author : mej Project : eterm Module : libast
Dir : eterm/libast/src Modified Files: mem.c strings.c Log Message: Tue Jun 29 17:23:34 2004 Michael Jennings (mej) Oops, forgot some re-ordering. ---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/eterm/libast/src/mem.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- mem.c 29 Jun 2004 21:18:09 -0000 1.21 +++ mem.c 29 Jun 2004 21:26:18 -0000 1.22 @@ -28,11 +28,11 @@ * This file contains the memory management subsystem. * * @author Michael Jennings <[EMAIL PROTECTED]> - * $Revision: 1.21 $ - * $Date: 2004/06/29 21:18:09 $ + * $Revision: 1.22 $ + * $Date: 2004/06/29 21:26:18 $ */ -static const char cvs_ident[] = "$Id: mem.c,v 1.21 2004/06/29 21:18:09 mej Exp $"; +static const char cvs_ident[] = "$Id: mem.c,v 1.22 2004/06/29 21:26:18 mej Exp $"; #ifdef HAVE_CONFIG_H # include <config.h> @@ -156,7 +156,7 @@ D_MEM(("Storing as pointer #%lu at %10p (from %10p).\n", memrec->cnt, p, memrec->ptrs)); p->ptr = ptr; p->size = size; - spiftool_safe_strncpy(p->file, filename, LIBAST_FNAME_LEN); + spiftool_safe_strncpy(p->file, SPIF_CONST_CAST(charptr) filename, LIBAST_FNAME_LEN); p->file[LIBAST_FNAME_LEN] = 0; p->line = line; } @@ -267,7 +267,7 @@ D_MEM(("Changing variable %s (%10p, %lu -> %10p, %lu)\n", var, oldp, p->size, newp, size)); p->ptr = newp; p->size = size; - spiftool_safe_strncpy(p->file, filename, LIBAST_FNAME_LEN); + spiftool_safe_strncpy(p->file, SPIF_CONST_CAST(charptr) filename, LIBAST_FNAME_LEN); p->line = line; } =================================================================== RCS file: /cvsroot/enlightenment/eterm/libast/src/strings.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- strings.c 29 Jun 2004 21:18:09 -0000 1.19 +++ strings.c 29 Jun 2004 21:26:18 -0000 1.20 @@ -30,7 +30,7 @@ * @author Michael Jennings <[EMAIL PROTECTED]> */ -static const char cvs_ident[] = "$Id: strings.c,v 1.19 2004/06/29 21:18:09 mej Exp $"; +static const char cvs_ident[] = "$Id: strings.c,v 1.20 2004/06/29 21:26:18 mej Exp $"; #ifdef HAVE_CONFIG_H # include <config.h> @@ -232,7 +232,7 @@ if ((len < 0) || (len >= size)) { return FALSE; } else { - return spiftool_safe_strncpy(dest + len, size - len, src); + return spiftool_safe_strncpy(dest + len, src, size - len); } } ------------------------------------------------------- This SF.Net email sponsored by Black Hat Briefings & Training. Attend Black Hat Briefings & Training, Las Vegas July 24-29 - digital self defense, top technical experts, no vendor pitches, unmatched networking opportunities. Visit www.blackhat.com _______________________________________________ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs