From 582124da6820f81abe11868871ad52e43639da07 Mon Sep 17 00:00:00 2001 From: mquinson Date: Thu, 22 Mar 2007 16:04:20 +0000 Subject: [PATCH 1/1] Split the string related function to their own header file. It will ease their documentation, at least git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3337 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/xbt/str.h | 32 ++++++++++++++++++++++++++++++++ include/xbt/sysdep.h | 10 +--------- 2 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 include/xbt/str.h diff --git a/include/xbt/str.h b/include/xbt/str.h new file mode 100644 index 0000000000..ae25643cc8 --- /dev/null +++ b/include/xbt/str.h @@ -0,0 +1,32 @@ +/* $Id$ */ + +/* str.h - XBT string related functions. */ + +/* Copyright (c) 2004-7, Martin Quinson and Arnaud Legrand. */ +/* 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. */ + +#include "xbt/misc.h" + +#ifndef XBT_STR_H +#define XBT_STR_H + +SG_BEGIN_DECL() + +XBT_PUBLIC(int) asprintf (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3); +XBT_PUBLIC(int) vasprintf (char **ptr, const char *fmt, va_list ap); +XBT_PUBLIC(char*) bprintf (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2); + +#if defined(_WIN32) || !defined(__GNUC__) +XBT_PUBLIC(long) getline(char **lineptr, size_t *n, FILE *stream); +#endif + +SG_END_DECL() + +#endif /* XBT_STR_H */ + + + + diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index 524bfb2bff..a159ff300d 100644 --- a/include/xbt/sysdep.h +++ b/include/xbt/sysdep.h @@ -18,18 +18,10 @@ #include "xbt/misc.h" #include "xbt/asserts.h" +#include "xbt/str.h" SG_BEGIN_DECL() -/* FIXME: better place? */ -extern int asprintf (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3); -extern int vasprintf (char **ptr, const char *fmt, va_list ap); -XBT_PUBLIC(char*) bprintf (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2); - -#if defined(_WIN32) || !defined(__GNUC__) -XBT_PUBLIC(long) getline(char **lineptr, size_t *n, FILE *stream); -#endif - /* They live in asserts.h, but need to be declared before this module. double declaration to cut dependency cycle */ /** -- 2.20.1