X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..ce6136d5f1a9ce68cfa6c968c257bd6c00c531d7:/src/xbt/snprintf.c diff --git a/src/xbt/snprintf.c b/src/xbt/snprintf.c index c1a4983a1f..89df5fbaae 100644 --- a/src/xbt/snprintf.c +++ b/src/xbt/snprintf.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2005-2010, 2012-2014. The SimGrid Team. +/* Copyright (c) 2005-2010, 2012-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -321,7 +321,7 @@ #define LINUX_COMPATIBLE #endif -#include "portable.h" /* to get a working stdarg.h */ +#include "src/portable.h" /* to get a working stdarg.h */ #include #include @@ -370,17 +370,17 @@ #endif #define fast_memcpy(d,s,n) \ - { register size_t nn = (size_t)(n); \ + { size_t nn = (size_t)(n); \ if (nn >= breakeven_point) memcpy((d), (s), nn); \ else if (nn > 0) { /* proc call overhead is worth only for large strings*/\ - register char *dd; register const char *ss; \ + char *dd; const char *ss; \ for (ss=(s), dd=(d); nn>0; nn--) *dd++ = *ss++; } } #define fast_memset(d,c,n) \ - { register size_t nn = (size_t)(n); \ + { size_t nn = (size_t)(n); \ if (nn >= breakeven_point) memset((d), (int)(c), nn); \ else if (nn > 0) { /* proc call overhead is worth only for large strings*/\ - register char *dd; register const int cc=(int)(c); \ + char *dd; const int cc=(int)(c); \ for (dd=(d); nn>0; nn--) *dd++ = cc; } } /* prototypes */ @@ -432,16 +432,12 @@ int portable_vsnprintf(char *str, size_t str_m, const char *fmt, /* declarations */ -static char credits[] = "\n\ - @(#)snprintf.c, v2.2: Mark Martinec, \n\ - @(#)snprintf.c, v2.2: Copyright 1999, Mark Martinec. Frontier Artistic License applies.\n\ - @(#)snprintf.c, v2.2: http://www.ijs.si/software/snprintf/\n"; - -static void __foo__(void) -{ - printf("%s", credits); - __foo__(); -} +/* + Old copyright + snprintf.c, v2.2: Mark Martinec, + snprintf.c, v2.2: Copyright 1999, Mark Martinec. Frontier Artistic License applies. + snprintf.c, v2.2: http://www.ijs.si/software/snprintf +*/ #if defined(NEED_ASPRINTF) int asprintf(char **ptr, const char *fmt, /*args */ ...)