Skip to content

CFE-3629: Unset C/CPP-flags to avoid repetition in compiler-flags #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SimonThalvorsen wants to merge 2 commits into from
Closed

CFE-3629: Unset C/CPP-flags to avoid repetition in compiler-flags #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f70302
CFE-3629: Unset C/CPP-flags to avoid repetition in compiler-flags
SimonThalvorsen Jun 12, 2026
5fa1e49
Fix: some typecast pointer warnings
SimonThalvorsen Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ dnl ######################################################################

AC_PROG_GREP
AC_PROG_EGREP
: ${CFLAGS=""}
: ${CPPFLAGS=""}
AC_PROG_CC
AC_PROG_MKDIR_P
AC_EXEEXT
Expand Down Expand Up @@ -1283,8 +1285,8 @@ dnl ######################################################################
dnl Collect all the options
dnl ######################################################################

CORE_CPPFLAGS="$PCRE2_CPPFLAGS $OPENSSL_CPPFLAGS $LIBYAML_CPPFLAGS $CPPFLAGS"
CORE_CFLAGS="$PCRE2_CFLAGS $OPENSSL_CFLAGS $LIBYAML_CFLAGS $CFLAGS"
CORE_CPPFLAGS="$PCRE2_CPPFLAGS $OPENSSL_CPPFLAGS $LIBYAML_CPPFLAGS"
CORE_CFLAGS="$PCRE2_CFLAGS $OPENSSL_CFLAGS $LIBYAML_CFLAGS"
CORE_LDFLAGS="$PCRE2_LDFLAGS $OPENSSL_LDFLAGS $LIBYAML_LDFLAGS $LDFLAGS"
CORE_LIBS="$PCRE2_LIBS $OPENSSL_LIBS $LIBYAML_LIBS $LIBS"

Expand Down
2 changes: 1 addition & 1 deletion libutils/buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ const char* BufferSearchAndReplace(Buffer *buffer, const char *pattern,
ret = pcre2_substitute(regex, (PCRE2_SPTR) BufferData(buffer), BufferSize(buffer),
0, subst_opts, match_data, NULL,
(PCRE2_SPTR) substitute, PCRE2_ZERO_TERMINATED,
result, &out_size);
(PCRE2_UCHAR8 *) result, &out_size);
if (ret == PCRE2_ERROR_NOMEMORY)
{
result = xrealloc(result, out_size);
Expand Down
4 changes: 2 additions & 2 deletions libutils/json-yaml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static void JsonParseYamlData(yaml_parser_t *parser, JsonElement *element, const
if (key == NULL)
{
// save key
key = xstrdup(event.data.scalar.value);
key = xstrdup((const char *)event.data.scalar.value);
}
else
{
Expand Down Expand Up @@ -343,7 +343,7 @@ JsonParseError JsonParseYamlString(const char **data, JsonElement **json_out)
return JSON_PARSE_ERROR_LIBYAML_FAILURE;
}

yaml_parser_set_input_string(&parser, *data, strlen(*data));
yaml_parser_set_input_string(&parser, (const unsigned char *) *data, strlen(*data));

JsonElement *holder = JsonArrayCreate(1);
JsonParseYamlData(&parser, holder, 0);
Expand Down
Loading