projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clang-tidy: add Chrome-inspired checks
[lttng-tools.git]
/
src
/
common
/
string-utils
/
string-utils.cpp
diff --git
a/src/common/string-utils/string-utils.cpp
b/src/common/string-utils/string-utils.cpp
index 8e6a76adc4ca097940a8d4c1600357dee4e86353..63de5267442721ac861ffb666c6a6b42d332ccb4 100644
(file)
--- a/
src/common/string-utils/string-utils.cpp
+++ b/
src/common/string-utils/string-utils.cpp
@@
-6,17
+6,17
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdbool.h>
-#include <type_traits>
+#include "../macros.hpp"
+#include "string-utils.hpp"
+
#include <assert.h>
#include <errno.h>
#include <stdarg.h>
#include <assert.h>
#include <errno.h>
#include <stdarg.h>
-
-#include "string-utils.h"
-#include "../macros.h"
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <type_traits>
enum star_glob_pattern_type_flags {
STAR_GLOB_PATTERN_TYPE_FLAG_NONE = 0,
enum star_glob_pattern_type_flags {
STAR_GLOB_PATTERN_TYPE_FLAG_NONE = 0,
@@
-24,13
+24,11
@@
enum star_glob_pattern_type_flags {
STAR_GLOB_PATTERN_TYPE_FLAG_END_ONLY = 2,
};
STAR_GLOB_PATTERN_TYPE_FLAG_END_ONLY = 2,
};
-static
-star_glob_pattern_type_flags &operator|=(star_glob_pattern_type_flags &l,
- star_glob_pattern_type_flags r)
+static star_glob_pattern_type_flags& operator|=(star_glob_pattern_type_flags& l,
+ star_glob_pattern_type_flags r)
{
using T = std::underlying_type<star_glob_pattern_type_flags>::type;
{
using T = std::underlying_type<star_glob_pattern_type_flags>::type;
- l = static_cast<star_glob_pattern_type_flags> (
- static_cast<T> (l) | static_cast<T> (r));
+ l = static_cast<star_glob_pattern_type_flags>(static_cast<T>(l) | static_cast<T>(r));
return l;
}
return l;
}
@@
-66,7
+64,7
@@
void strutils_normalize_star_glob_pattern(char *pattern)
goto end;
}
goto end;
}
- /*
Fall through default case.
*/
+ /*
fall through
*/
default:
got_star = false;
break;
default:
got_star = false;
break;
@@
-81,11
+79,9
@@
end:
*np = '\0';
}
*np = '\0';
}
-static
-enum star_glob_pattern_type_flags strutils_test_glob_pattern(const char *pattern)
+static enum star_glob_pattern_type_flags strutils_test_glob_pattern(const char *pattern)
{
{
- enum star_glob_pattern_type_flags ret =
- STAR_GLOB_PATTERN_TYPE_FLAG_NONE;
+ enum star_glob_pattern_type_flags ret = STAR_GLOB_PATTERN_TYPE_FLAG_NONE;
const char *p;
LTTNG_ASSERT(pattern);
const char *p;
LTTNG_ASSERT(pattern);
@@
-122,8
+118,7
@@
end:
*/
bool strutils_is_star_glob_pattern(const char *pattern)
{
*/
bool strutils_is_star_glob_pattern(const char *pattern)
{
- return strutils_test_glob_pattern(pattern) &
- STAR_GLOB_PATTERN_TYPE_FLAG_PATTERN;
+ return strutils_test_glob_pattern(pattern) & STAR_GLOB_PATTERN_TYPE_FLAG_PATTERN;
}
/*
}
/*
@@
-132,8
+127,7
@@
bool strutils_is_star_glob_pattern(const char *pattern)
*/
bool strutils_is_star_at_the_end_only_glob_pattern(const char *pattern)
{
*/
bool strutils_is_star_at_the_end_only_glob_pattern(const char *pattern)
{
- return strutils_test_glob_pattern(pattern) &
- STAR_GLOB_PATTERN_TYPE_FLAG_END_ONLY;
+ return strutils_test_glob_pattern(pattern) & STAR_GLOB_PATTERN_TYPE_FLAG_END_ONLY;
}
/*
}
/*
@@
-148,7
+142,7
@@
char *strutils_unescape_string(const char *input, char only_char)
const char *i;
LTTNG_ASSERT(input);
const char *i;
LTTNG_ASSERT(input);
- output =
(char *) zmalloc
(strlen(input) + 1);
+ output =
calloc<char>
(strlen(input) + 1);
if (!output) {
goto end;
}
if (!output) {
goto end;
}
@@
-251,9
+245,9
@@
void strutils_free_null_terminated_array_of_strings(char **array)
* Returns -1 if there's an error.
*/
int strutils_split(const char *input,
* Returns -1 if there's an error.
*/
int strutils_split(const char *input,
- char delim,
- bool escape_delim,
- struct lttng_dynamic_pointer_array *out_strings)
+
char delim,
+
bool escape_delim,
+
struct lttng_dynamic_pointer_array *out_strings)
{
int ret;
size_t at;
{
int ret;
size_t at;
@@
-299,14
+293,13
@@
int strutils_split(const char *input,
for (at = 0, s = input; at < number_of_substrings; at++) {
const char *ss;
char *d;
for (at = 0, s = input; at < number_of_substrings; at++) {
const char *ss;
char *d;
- char *substring =
(char *) zmalloc
(longest_substring_len + 1);
+ char *substring =
calloc<char>
(longest_substring_len + 1);
if (!substring) {
goto error;
}
if (!substring) {
goto error;
}
- ret = lttng_dynamic_pointer_array_add_pointer(
- out_strings, substring);
+ ret = lttng_dynamic_pointer_array_add_pointer(out_strings, substring);
if (ret) {
free(substring);
goto error;
if (ret) {
free(substring);
goto error;
@@
-364,9
+357,9
@@
end:
return ret;
}
return ret;
}
-size_t strutils_array_of_strings_len(char *
const *array)
+size_t strutils_array_of_strings_len(char *const *array)
{
{
- char *
const *item;
+ char *const *item;
size_t count = 0;
LTTNG_ASSERT(array);
size_t count = 0;
LTTNG_ASSERT(array);
@@
-382,10
+375,10
@@
int strutils_append_str(char **s, const char *append)
{
char *old = *s;
char *new_str;
{
char *old = *s;
char *new_str;
- size_t oldlen = (old ==
NULL
) ? 0 : strlen(old);
+ size_t oldlen = (old ==
nullptr
) ? 0 : strlen(old);
size_t appendlen = strlen(append);
size_t appendlen = strlen(append);
- new_str =
(char *) zmalloc
(oldlen + appendlen + 1);
+ new_str =
zmalloc<char>
(oldlen + appendlen + 1);
if (!new_str) {
return -ENOMEM;
}
if (!new_str) {
return -ENOMEM;
}
@@
-407,7
+400,7
@@
int strutils_appendf(char **s, const char *fmt, ...)
/* Compute length of formatted string we append. */
va_start(args, fmt);
/* Compute length of formatted string we append. */
va_start(args, fmt);
- ret = vsnprintf(
NULL
, 0, fmt, args);
+ ret = vsnprintf(
nullptr
, 0, fmt, args);
va_end(args);
if (ret == -1) {
va_end(args);
if (ret == -1) {
@@
-415,7
+408,7
@@
int strutils_appendf(char **s, const char *fmt, ...)
}
/* Allocate space for old string + new string + \0. */
}
/* Allocate space for old string + new string + \0. */
- new_str =
(char *) zmalloc
(oldlen + ret + 1);
+ new_str =
zmalloc<char>
(oldlen + ret + 1);
if (!new_str) {
ret = -ENOMEM;
goto end;
if (!new_str) {
ret = -ENOMEM;
goto end;
@@
-428,7
+421,7
@@
int strutils_appendf(char **s, const char *fmt, ...)
/* Format new string in-place. */
va_start(args, fmt);
/* Format new string in-place. */
va_start(args, fmt);
- ret = vsprintf(&new_str[oldlen], fmt, args);
+ ret = vsprintf(&new_str[oldlen], fmt, args);
va_end(args);
if (ret == -1) {
va_end(args);
if (ret == -1) {
@@
-438,7
+431,7
@@
int strutils_appendf(char **s, const char *fmt, ...)
free(*s);
*s = new_str;
free(*s);
*s = new_str;
- new_str =
NULL
;
+ new_str =
nullptr
;
end:
return ret;
end:
return ret;
This page took
0.026247 seconds
and
4
git commands to generate.