Skip to content

F/fix warnings#310

Merged
lbudai merged 7 commits intomasterfrom
f/fix-warnings
Nov 24, 2014
Merged

F/fix warnings#310
lbudai merged 7 commits intomasterfrom
f/fix-warnings

Conversation

@bazsi
Copy link
Collaborator

@bazsi bazsi commented Nov 22, 2014

fix a couple of compilation warnings and a s/r conflict in afsocket grammar.

Please merge!

Instead of open-coding the optional libsyslog-ng-crypto as a dependency
use $(CRYPTO_LIBS) which conditionally contains the same if
libsyslog-ng-crypto is built.

Signed-off-by: Balazs Scheidler <[email protected]>
Due to a stray colon, the grammar contained a conflict as both
source_systemd_syslog_option and its recursive parent
source_systemd_syslog_options permitted an empty evaluation.

By removing the extra colon, only the "options" rule allows the empty
match, which in turn removes the conflict.

Signed-off-by: Balazs Scheidler <[email protected]>
…atching character signs

The types used for detecting the message boundaries were not consistently
used and some of the call-sites lacked type-casts. This patch fixes
that up by consistently using guchar * for detecting line endings,
and only casting it to a gchar * when passing it on to pcre.

Signed-off-by: Balazs Scheidler <[email protected]>
The test program contained a function that was named like as it was part
of the LogPipe API, called log_pipe_queue_with_default_path_options().
call that invoke_rewrite_rule() instead, that reflects its purpose
much better. If we need the API extension, we should do that in the
core.

Signed-off-by: Balazs Scheidler <[email protected]>
lbudai added a commit that referenced this pull request Nov 24, 2014
@lbudai lbudai merged commit 5b19c34 into master Nov 24, 2014
@bazsi bazsi deleted the f/fix-warnings branch January 14, 2016 06:42
HofiOne pushed a commit to HofiOne/syslog-ng that referenced this pull request Sep 26, 2024
HofiOne pushed a commit to HofiOne/syslog-ng that referenced this pull request Nov 22, 2024
HofiOne pushed a commit to HofiOne/syslog-ng that referenced this pull request Nov 22, 2024
otel: fix multi-worker window and fetch-limit calculation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants