From f2ef3bcc89d2ecfdf083257665a7db032a963f91 Mon Sep 17 00:00:00 2001 From: mquinson Date: Mon, 16 Apr 2007 15:56:10 +0000 Subject: [PATCH] merge trim.h into str.h, where it belongs to git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3424 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/xbt/str.h | 7 +++- include/xbt/trim.h | 82 ---------------------------------------------- src/xbt/trim.c | 2 +- tools/tesh/tesh.c | 2 +- 4 files changed, 8 insertions(+), 85 deletions(-) delete mode 100644 include/xbt/trim.h diff --git a/include/xbt/str.h b/include/xbt/str.h index 6a9bccfc13..60682476e9 100644 --- a/include/xbt/str.h +++ b/include/xbt/str.h @@ -2,7 +2,7 @@ /* str.h - XBT string related functions. */ -/* Copyright (c) 2004-7, Martin Quinson and Arnaud Legrand. */ +/* Copyright (c) 2004-7, Martin Quinson, Arnaud Legrand and Cherier Malek. */ /* All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -29,6 +29,11 @@ XBT_PUBLIC(char*) bprintf (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2); XBT_PUBLIC(long) getline(char **lineptr, size_t *n, FILE *stream); #endif +/* Trim related functions */ +XBT_PUBLIC(char*) rtrim(char* s, const char* char_list); +XBT_PUBLIC(char*) ltrim( char* s, const char* char_list); +XBT_PUBLIC(char*) trim(char* s, const char* char_list); + SG_END_DECL() #endif /* XBT_STR_H */ diff --git a/include/xbt/trim.h b/include/xbt/trim.h deleted file mode 100644 index e6f4ca595f..0000000000 --- a/include/xbt/trim.h +++ /dev/null @@ -1,82 +0,0 @@ -/* xbt/trim.h -- Declarations of the functions ltrim(), rtrim() and trim() */ - -/* Copyright (c) 2007 Cherier Malek. 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. */ - - -#ifndef XBT_TRIM_H -#define XBT_TRIM_H - -#include "xbt/misc.h" - -SG_BEGIN_DECL() - -/** @brief Strip whitespace (or other characters) from the end of a string. - * - * The function rtrim() returns a string with whitespace stripped from the end of s. - * By default (without the second parameter char_list), rtrim() will strip these characters : - * - * - " " (ASCII 32 (0x20)) space. - * - "\t" (ASCII 9 (0x09)) tab. - * - "\n" (ASCII 10 (0x0A)) line feed. - * - "\r" (ASCII 13 (0x0D)) carriage return. - * - "\0" (ASCII 0 (0x00)) NULL. - * - "\x0B" (ASCII 11 (0x0B)) vertical tab. - * - * @param s The string to strip. - * @param char_list A string which contains the characters you want to strip. - * - * @return If the specified is NULL the function returns NULL. Otherwise the - * function returns the string with whitespace stripped from the end. - */ -XBT_PUBLIC(char*) -rtrim(char* s, const char* char_list); - -/** @brief Strip whitespace (or other characters) from the beginning of a string. - * - * The function ltrim() returns a string with whitespace stripped from the beginning of s. - * By default (without the second parameter char_list), ltrim() will strip these characters : - * - * - " " (ASCII 32 (0x20)) space. - * - "\t" (ASCII 9 (0x09)) tab. - * - "\n" (ASCII 10 (0x0A)) line feed. - * - "\r" (ASCII 13 (0x0D)) carriage return. - * - "\0" (ASCII 0 (0x00)) NULL. - * - "\x0B" (ASCII 11 (0x0B)) vertical tab. - * - * @param s The string to strip. - * @param char_list A string which contains the characters you want to strip. - * - * @return If the specified is NULL the function returns NULL. Otherwise the - * function returns the string with whitespace stripped from the beginning. - */ -XBT_PUBLIC(char*) -ltrim( char* s, const char* char_list); - - -/** @brief Strip whitespace (or other characters) from the end and the begining of a string. - * - * The function trim() returns a string with whitespace stripped from the end and the begining of s. - * By default (without the second parameter char_list), trim() will strip these characters : - * - * - " " (ASCII 32 (0x20)) space. - * - "\t" (ASCII 9 (0x09)) tab. - * - "\n" (ASCII 10 (0x0A)) line feed. - * - "\r" (ASCII 13 (0x0D)) carriage return. - * - "\0" (ASCII 0 (0x00)) NULL. - * - "\x0B" (ASCII 11 (0x0B)) vertical tab. - * - * @param s The string to strip. - * @param char_list A string which contains the characters you want to strip. - * - * @return If the specified is NULL the function returns NULL. Otherwise the - * function returns the string with whitespace stripped from the end and the begining. - */ -XBT_PUBLIC(char*) -trim(char* s, const char* char_list); - -SG_END_DECL() - -#endif /* !XBT_TRIM_H */ diff --git a/src/xbt/trim.c b/src/xbt/trim.c index 48f185c771..f259b6a810 100644 --- a/src/xbt/trim.c +++ b/src/xbt/trim.c @@ -11,7 +11,7 @@ #include "xbt/misc.h" #include "xbt/sysdep.h" -#include "xbt/trim.h" /* headers of these functions */ +#include "xbt/str.h" /* headers of these functions */ #include "portable.h" /** @brief Strip whitespace (or other characters) from the end of a string. diff --git a/tools/tesh/tesh.c b/tools/tesh/tesh.c index 3703b4b2b5..abbaf22177 100644 --- a/tools/tesh/tesh.c +++ b/tools/tesh/tesh.c @@ -17,7 +17,7 @@ #include "xbt/sysdep.h" #include "xbt/function_types.h" #include "xbt/log.h" -#include "xbt/trim.h" +#include "xbt/str.h" #include #include -- 2.20.1