/* 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/ex.hpp>
#include "src/internal_config.h"
#include "xbt/misc.h"
#include "xbt/sysdep.h"
/** @brief Strip whitespace (or other characters) from the end of a string.
*
* Strips the whitespaces from the end of s.
- * By default (when char_list=NULL), these characters get stripped:
+ * By default (when char_list=nullptr), these characters get stripped:
*
* - " " (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.
+ * - "\0" (ASCII 0 (0x00)) nullptr.
* - "\x0B" (ASCII 11 (0x0B)) vertical tab.
*
* @param s The string to strip. Modified in place.
/** @brief Strip whitespace (or other characters) from the beginning of a string.
*
* Strips the whitespaces from the begining of s.
- * By default (when char_list=NULL), these characters get stripped:
+ * By default (when char_list=nullptr), these characters get stripped:
*
* - " " (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.
+ * - "\0" (ASCII 0 (0x00)) nullptr.
* - "\x0B" (ASCII 11 (0x0B)) vertical tab.
*
* @param s The string to strip. Modified in place.
/** @brief Strip whitespace (or other characters) from the end and the begining of a string.
*
* Strips the whitespaces from both the beginning and the end of s.
- * By default (when char_list=NULL), these characters get stripped:
+ * By default (when char_list=nullptr), these characters get stripped:
*
* - " " (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.
+ * - "\0" (ASCII 0 (0x00)) nullptr.
* - "\x0B" (ASCII 11 (0x0B)) vertical tab.
*
* @param s The string to strip.
* @param s: the string to split
* @param sep: a string of all chars to consider as separator.
*
- * By default (with sep=NULL), these characters are used as separator:
+ * By default (with sep=nullptr), these characters are used as separator:
*
* - " " (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.
+ * - "\0" (ASCII 0 (0x00)) nullptr.
* - "\x0B" (ASCII 11 (0x0B)) vertical tab.
*/
xbt_dynar_t xbt_str_split(const char *s, const char *sep)
is_sep[0] = 1; /* End of string is also separator */
/* Do the job */
- p = q = s;
+ p = s;
+ q = s;
done = 0;
if (s[0] == '\0')
/**
* \brief This functions splits a string after using another string as separator
- * For example A!!B!!C splitted after !! will return the dynar {A,B,C}
+ * For example A!!B!!C split after !! will return the dynar {A,B,C}
* \return An array of dynars containing the string tokens
*/
xbt_dynar_t xbt_str_split_str(const char *s, const char *sep)
int done;
const char *p, *q;
- p = q = s;
+ p = s;
+ q = s;
done = 0;
if (s[0] == '\0')
while (!done) {
char *to_push;
int v = 0;
- //get the start of the first occurence of the substring
+ // get the start of the first occurrence of the substring
q = strstr(p, sep);
//if substring was not found add the entire string
- if (NULL == q) {
+ if (nullptr == q) {
v = strlen(p);
to_push = (char*) xbt_malloc(v + 1);
memcpy(to_push, p, v);
* pushes the address of each chunk in the resulting dynar. Yes, that's uneven. Yes, that's gory. But that's efficient.
*/
xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
- xbt_dynar_t res = xbt_dynar_new(sizeof(char *), NULL);
+ xbt_dynar_t res = xbt_dynar_new(sizeof(char *), nullptr);
char *beg, *end; /* pointers around the parsed chunk */
int in_simple_quote = 0, in_double_quote = 0;
int done = 0;
/** @brief Join a set of strings as a single string
*
- * The parameter must be a NULL-terminated array of chars,
+ * The parameter must be a nullptr-terminated array of chars,
* just like xbt_dynar_to_array() produces
*/
char *xbt_str_join_array(const char *const *strs, const char *sep)
len += strlen(sep) * amount_strings;
/* Do the job */
- q = res = (char*) xbt_malloc(len);
+ res = (char*) xbt_malloc(len);
+ q = res;
for (i=0;strs[i];i++) {
if (i!=0) { // not first loop
q += snprintf(q,len, "%s%s", sep, strs[i]);
long int xbt_str_parse_int(const char* str, const char* error_msg)
{
char *endptr;
- if (str == NULL || str[0] == '\0')
+ if (str == nullptr || str[0] == '\0')
THROWF(arg_error, 0, error_msg, str);
long int res = strtol(str, &endptr, 10);
double xbt_str_parse_double(const char* str, const char* error_msg)
{
char *endptr;
- if (str == NULL || str[0] == '\0')
+ if (str == nullptr || str[0] == '\0')
THROWF(arg_error, 0, error_msg, str);
double res = strtod(str, &endptr);
}
#ifdef SIMGRID_TEST
+#include <xbt/ex.hpp>
#include "xbt/str.h"
XBT_TEST_SUITE("xbt_str", "String Handling");
test_parse_ok(xbt_str_parse_int, "Parse -1 as an int", rint, "-1", -1);
test_parse_error(xbt_str_parse_int, "Parse int + noise", rint, "342 cruft");
- test_parse_error(xbt_str_parse_int, "Parse NULL as an int", rint, NULL);
+ test_parse_error(xbt_str_parse_int, "Parse nullptr as an int", rint, nullptr);
test_parse_error(xbt_str_parse_int, "Parse '' as an int", rint, "");
test_parse_error(xbt_str_parse_int, "Parse cruft as an int", rint, "cruft");
test_parse_ok(xbt_str_parse_double, "Parse -1 as a double", rdouble, "-1", -1);
test_parse_error(xbt_str_parse_double, "Parse double + noise", rdouble, "342 cruft");
- test_parse_error(xbt_str_parse_double, "Parse NULL as a double", rdouble, NULL);
+ test_parse_error(xbt_str_parse_double, "Parse nullptr as a double", rdouble, nullptr);
test_parse_error(xbt_str_parse_double, "Parse '' as a double", rdouble, "");
test_parse_error(xbt_str_parse_double, "Parse cruft as a double", rdouble, "cruft");
}
