X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/662a6e6939c1b41ac17141f171627cd59d2938f3..380344ba7ad3d0ed0f7fb8f86990e83b97f39831:/include/xbt/misc.h

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index a8d8c00107..dc19d77d9b 100644
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -1,6 +1,6 @@
 /* xbt.h - Public interface to the xbt (simgrid's toolbox)                     */
 
-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,12 +9,12 @@
 #ifndef XBT_MISC_H
 #define XBT_MISC_H
 
-#include <stdarg.h>
-
 #include "simgrid_config.h"
 #include "base.h"
 #include "dynar.h"
 
+#include <stdarg.h>
+
 SG_BEGIN_DECL()
 
 /** Cache the size of a memory page for the current system. */
@@ -23,53 +23,26 @@ XBT_PUBLIC_DATA(int) xbt_pagesize;
 /** Cache the number of bits of addresses inside a given page, log2(xbt_pagesize). */
 XBT_PUBLIC_DATA(int) xbt_pagebits;
 
-XBT_PUBLIC(const char *) xbt_procname(void);
-
-/** Retrieves the version numbers of the used dynamic library (so, DLL or dynlib) , while
-    SIMGRID_VERSION_MAJOR and friends give the version numbers of the used header files */
-XBT_PUBLIC(void) sg_version(int *major,int *minor,int *patch);
+/** Helps ensuring that header version (SIMGRID_VERSION_MAJOR and friends) and dynamic library version do match. */
+XBT_PUBLIC(void) sg_version_check(int lib_version_major,int lib_version_minor,int lib_version_patch);
 
 /** Contains all the parameters we got from the command line */
 XBT_PUBLIC_DATA(xbt_dynar_t) sg_cmdline;
 
-#define XBT_BACKTRACE_SIZE 10   /* FIXME: better place? Do document */
-
 /* snprintf related functions */
 /** @addtogroup XBT_str
   * @{ */
-/** @brief print to allocated string (reimplemented when not provided by the system)
- *
- * The functions asprintf() and vasprintf() are analogues of
- * sprintf() and vsprintf(), except that they allocate a string large
- * enough to hold the output including the terminating null byte, and
- * return a pointer to it via the first parameter.  This pointer
- * should be passed to free(3) to release the allocated storage when
- * it is no longer needed.
- */
-#if defined(SIMGRID_NEED_ASPRINTF)||defined(DOXYGEN)
-XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt,   /*args */
-                         ...) _XBT_GNUC_PRINTF(2, 3);
-#endif
-/** @brief print to allocated string (reimplemented when not provided by the system)
- *
- * See asprintf()
- */
-#if defined(SIMGRID_NEED_VASPRINTF)||defined(DOXYGEN)
-XBT_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap);
-#endif
 
 /** @brief print to allocated string
  *
- * Works just like vasprintf(), but returns a pointer to the newly
- * created string, or aborts on error.
+ * Similar to vasprintf(), but returns a pointer to the newly created string (or aborts on error).
  */
 XBT_PUBLIC(char *) bvprintf(const char *fmt, va_list ap);
 /** @brief print to allocated string
  *
- * Works just like asprintf(), but returns a pointer to the newly
- * created string, or aborts on error.
+ * Similar to asprintf(), but returns a pointer to the newly created string (or aborts on error).
  */
-XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
+XBT_PUBLIC(char *) bprintf(const char *fmt, ...) XBT_ATTRIB_PRINTF(1, 2);
 /** @} */
 
 SG_END_DECL()