A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ignore some cruft generated by scala
[simgrid.git]
/
src
/
xbt
/
snprintf.c
diff --git
a/src/xbt/snprintf.c
b/src/xbt/snprintf.c
index
1e443fb
..
e4d51ca
100644
(file)
--- a/
src/xbt/snprintf.c
+++ b/
src/xbt/snprintf.c
@@
-1,3
+1,8
@@
+/* Copyright (c) 2005-2010, 2012-2014. The SimGrid Team.
+ * All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
/*
* snprintf.c - a portable implementation of snprintf
/*
* snprintf.c - a portable implementation of snprintf
@@
-365,17
+370,17
@@
#endif
#define fast_memcpy(d,s,n) \
#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*/\
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) \
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*/\
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 */
for (dd=(d); nn>0; nn--) *dd++ = cc; } }
/* prototypes */
@@
-422,6
+427,9
@@
int portable_vsnprintf(char *str, size_t str_m, const char *fmt,
#endif
#endif
#endif
#endif
+ /* FIXME: better place */
+#include "xbt/sysdep.h"
+
/* declarations */
static char credits[] = "\n\
/* declarations */
static char credits[] = "\n\
@@
-447,7
+455,7
@@
int asprintf(char **ptr, const char *fmt, /*args */ ...)
str_l = portable_vsnprintf(NULL, (size_t) 0, fmt, ap);
va_end(ap);
assert(str_l >= 0); /* possible integer overflow if str_m > INT_MAX */
str_l = portable_vsnprintf(NULL, (size_t) 0, fmt, ap);
va_end(ap);
assert(str_l >= 0); /* possible integer overflow if str_m > INT_MAX */
- *ptr = (char *) malloc(str_m = (size_t) str_l + 1);
+ *ptr = (char *)
xbt_
malloc(str_m = (size_t) str_l + 1);
if (*ptr == NULL) {
errno = ENOMEM;
str_l = -1;
if (*ptr == NULL) {
errno = ENOMEM;
str_l = -1;
@@
-476,7
+484,7
@@
int vasprintf(char **ptr, const char *fmt, va_list ap)
va_end(ap2);
}
assert(str_l >= 0); /* possible integer overflow if str_m > INT_MAX */
va_end(ap2);
}
assert(str_l >= 0); /* possible integer overflow if str_m > INT_MAX */
- *ptr = (char *) malloc(str_m = (size_t) str_l + 1);
+ *ptr = (char *)
xbt_
malloc(str_m = (size_t) str_l + 1);
if (*ptr == NULL) {
errno = ENOMEM;
str_l = -1;
if (*ptr == NULL) {
errno = ENOMEM;
str_l = -1;
@@
-504,7
+512,7
@@
int asnprintf(char **ptr, size_t str_m, const char *fmt, /*args */ ...)
/* if str_m is 0, no buffer is allocated, just set *ptr to NULL */
if (str_m == 0) { /* not interested in resulting string, just return size */
} else {
/* if str_m is 0, no buffer is allocated, just set *ptr to NULL */
if (str_m == 0) { /* not interested in resulting string, just return size */
} else {
- *ptr = (char *) malloc(str_m);
+ *ptr = (char *)
xbt_
malloc(str_m);
if (*ptr == NULL) {
errno = ENOMEM;
str_l = -1;
if (*ptr == NULL) {
errno = ENOMEM;
str_l = -1;
@@
-538,7
+546,7
@@
int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap)
/* if str_m is 0, no buffer is allocated, just set *ptr to NULL */
if (str_m == 0) { /* not interested in resulting string, just return size */
} else {
/* if str_m is 0, no buffer is allocated, just set *ptr to NULL */
if (str_m == 0) { /* not interested in resulting string, just return size */
} else {
- *ptr = (char *) malloc(str_m);
+ *ptr = (char *)
xbt_
malloc(str_m);
if (*ptr == NULL) {
errno = ENOMEM;
str_l = -1;
if (*ptr == NULL) {
errno = ENOMEM;
str_l = -1;
@@
-1165,9
+1173,6
@@
int portable_vsnprintf(char *str, size_t str_m, const char *fmt,
#endif
#endif
- /* FIXME: better place */
-#include "xbt/sysdep.h"
-
char *bvprintf(const char *fmt, va_list ap)
{
char *res;
char *bvprintf(const char *fmt, va_list ap)
{
char *res;
@@
-1176,7
+1181,7
@@
char *bvprintf(const char *fmt, va_list ap)
/* Do not want to use xbt_die() here, as it uses the logging
* infrastucture and may fail to allocate memory too. */
fprintf(stderr, "bprintf: vasprintf failed. Aborting.\n");
/* Do not want to use xbt_die() here, as it uses the logging
* infrastucture and may fail to allocate memory too. */
fprintf(stderr, "bprintf: vasprintf failed. Aborting.\n");
- abort();
+
xbt_
abort();
}
return res;
}
}
return res;
}