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
Inform valgrind about ucontextes [Sékou Diakite]
[simgrid.git]
/
src
/
xbt
/
snprintf.c
diff --git
a/src/xbt/snprintf.c
b/src/xbt/snprintf.c
index
afdc358
..
e534d0b
100644
(file)
--- a/
src/xbt/snprintf.c
+++ b/
src/xbt/snprintf.c
@@
-1,4
+1,3
@@
-#include "gras_config.h"
/*
* snprintf.c - a portable implementation of snprintf
/*
* snprintf.c - a portable implementation of snprintf
@@
-281,7
+280,6
@@
*/
*/
-
\f
/* ============================================= */
/* NO USER SERVICABLE PARTS FOLLOWING THIS POINT */
/* ============================================= */
/* ============================================= */
/* NO USER SERVICABLE PARTS FOLLOWING THIS POINT */
/* ============================================= */
@@
-318,14
+316,17
@@
#define LINUX_COMPATIBLE
#endif
#define LINUX_COMPATIBLE
#endif
+#include "portable.h" /* to get a working stdarg.h */
+
#include <sys/types.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <sys/types.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
-#include "gras_config.h" /* to get a working stdarg.h */
+
#include <assert.h>
#include <errno.h>
#include <assert.h>
#include <errno.h>
+#include "xbt/str.h"
#ifdef isdigit
#undef isdigit
#ifdef isdigit
#undef isdigit
@@
-379,12
+380,14
@@
/* prototypes */
/* prototypes */
+
#if defined(NEED_ASPRINTF)
int asprintf (char **ptr, const char *fmt, /*args*/ ...);
#endif
#if defined(NEED_ASPRINTF)
int asprintf (char **ptr, const char *fmt, /*args*/ ...);
#endif
-#if defined(NEED_VASPRINTF)
+#if defined(NEED_VASPRINTF)
int vasprintf (char **ptr, const char *fmt, va_list ap);
#endif
int vasprintf (char **ptr, const char *fmt, va_list ap);
#endif
+
#if defined(NEED_ASNPRINTF)
int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...);
#endif
#if defined(NEED_ASNPRINTF)
int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...);
#endif
@@
-395,6
+398,13
@@
int vasnprintf (char **ptr, size_t str_m, const char *fmt, va_list ap);
#if defined(HAVE_SNPRINTF)
/* declare our portable snprintf routine under name portable_snprintf */
/* declare our portable vsnprintf routine under name portable_vsnprintf */
#if defined(HAVE_SNPRINTF)
/* declare our portable snprintf routine under name portable_snprintf */
/* declare our portable vsnprintf routine under name portable_vsnprintf */
+# if defined(_MSC_VER) && (_MSC_VER >= 1400)
+# define portable_snprintf _snprintf
+# define portable_vsnprintf vsnprintf
+# else
+# define portable_snprintf snprintf
+# define portable_vsnprintf vsnprintf
+# endif
#else
/* declare our portable routines under names snprintf and vsnprintf */
#define portable_snprintf snprintf
#else
/* declare our portable routines under names snprintf and vsnprintf */
#define portable_snprintf snprintf
@@
-714,7
+724,7
@@
int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) {
else if (precision == 0) str_arg_l = 0;
else {
/* memchr on HP does not like n > 2^31 !!! */
else if (precision == 0) str_arg_l = 0;
else {
/* memchr on HP does not like n > 2^31 !!! */
- c
onst char *q =
memchr(str_arg, '\0',
+ c
har *q = (char *)
memchr(str_arg, '\0',
precision <= 0x7fffffff ? precision : 0x7fffffff);
str_arg_l = !q ? precision : (q-str_arg);
}
precision <= 0x7fffffff ? precision : 0x7fffffff);
str_arg_l = !q ? precision : (q-str_arg);
}
@@
-954,7
+964,7
@@
int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) {
int n = min_field_width - (str_arg_l+number_of_zeros_to_pad);
if (n > 0) {
if (str_l < str_m) {
int n = min_field_width - (str_arg_l+number_of_zeros_to_pad);
if (n > 0) {
if (str_l < str_m) {
-
size_
t avail = str_m-str_l;
+
in
t avail = str_m-str_l;
fast_memset(str+str_l, (zero_padding?'0':' '), (n>avail?avail:n));
}
str_l += n;
fast_memset(str+str_l, (zero_padding?'0':' '), (n>avail?avail:n));
}
str_l += n;
@@
-971,7
+981,7
@@
int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) {
int n = zero_padding_insertion_ind;
if (n > 0) {
if (str_l < str_m) {
int n = zero_padding_insertion_ind;
if (n > 0) {
if (str_l < str_m) {
-
size_
t avail = str_m-str_l;
+
in
t avail = str_m-str_l;
fast_memcpy(str+str_l, str_arg, (n>avail?avail:n));
}
str_l += n;
fast_memcpy(str+str_l, str_arg, (n>avail?avail:n));
}
str_l += n;
@@
-980,7
+990,7
@@
int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) {
n = number_of_zeros_to_pad;
if (n > 0) {
if (str_l < str_m) {
n = number_of_zeros_to_pad;
if (n > 0) {
if (str_l < str_m) {
-
size_
t avail = str_m-str_l;
+
in
t avail = str_m-str_l;
fast_memset(str+str_l, '0', (n>avail?avail:n));
}
str_l += n;
fast_memset(str+str_l, '0', (n>avail?avail:n));
}
str_l += n;
@@
-991,7
+1001,7
@@
int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) {
{ int n = str_arg_l - zero_padding_insertion_ind;
if (n > 0) {
if (str_l < str_m) {
{ int n = str_arg_l - zero_padding_insertion_ind;
if (n > 0) {
if (str_l < str_m) {
-
size_
t avail = str_m-str_l;
+
in
t avail = str_m-str_l;
fast_memcpy(str+str_l, str_arg+zero_padding_insertion_ind,
(n>avail?avail:n));
}
fast_memcpy(str+str_l, str_arg+zero_padding_insertion_ind,
(n>avail?avail:n));
}
@@
-1003,7
+1013,7
@@
int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) {
int n = min_field_width - (str_arg_l+number_of_zeros_to_pad);
if (n > 0) {
if (str_l < str_m) {
int n = min_field_width - (str_arg_l+number_of_zeros_to_pad);
if (n > 0) {
if (str_l < str_m) {
-
size_
t avail = str_m-str_l;
+
in
t avail = str_m-str_l;
fast_memset(str+str_l, ' ', (n>avail?avail:n));
}
str_l += n;
fast_memset(str+str_l, ' ', (n>avail?avail:n));
}
str_l += n;
@@
-1042,7
+1052,10
@@
char *bprintf(const char*fmt, ...) {
char *res;
va_start(ap, fmt);
char *res;
va_start(ap, fmt);
- vasprintf(&res,fmt,ap);
+
+
+ vasprintf(&res,fmt,ap);
+
va_end(ap);
return res;
}
va_end(ap);
return res;
}