add-contextual-data: build fixed on SLES-11 #1148
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* include missing header * as `g_array_set_clear_func` is only available from glib version 2.32, I removed it Fixes: syslog-ng#1144 Signed-off-by: Laszlo Budai <stentor.bgyk@gmail.com>
| @@ -1074,7 +1075,7 @@ _verify_unique_persist_names_among_pipes(const GPtrArray *initialized_pipes) | |||
|
|
|||
| if (current_pipe_name != NULL) | |||
| { | |||
| if (g_hash_table_contains(pipe_persist_names, current_pipe_name)) | |||
| if (g_hash_table_lookup_extended(pipe_persist_names, current_pipe_name, &orig_key, &value)) | |||
There was a problem hiding this comment.
The last two arguments can be NULL, if we don't need them in the future (they hid it well in their documentation: orig_key, value - [optional][nullable]).
There was a problem hiding this comment.
Thanks, I'll update the PR.
|
👍 |
* use g_hash_table_replace instead of g_hash_table_add Documentation[1] says : This is a convenience function for using a GHashTable as a set. It is equivalent to calling g_hash_table_replace() with key as both the key and the value. [1] - https://developer.gnome.org/glib/stable/glib-Hash-Tables.html#g-hash-table-replace * use g_hash_table_lookup_extended instead of g_hash_table_contains Signed-off-by: Laszlo Budai <Laszlo.Budai@balabit.com>
lbudai
force-pushed
the
f/add-contextual-data-compile-fixes
branch
from
5dd4878 to
16a21b8
Compare
|
👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
g_array_set_clear_funcis only available from glib version 2.32,I removed it
Fixes: #1144
Signed-off-by: Laszlo Budai stentor.bgyk@gmail.com