Skip to content
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.

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

Jump to bottom

Ticket26494: fix logs<-> containers dependency #182

Merged
merged 5 commits into from Jun 27, 2018
Merged

Ticket26494: fix logs<-> containers dependency #182

merged 5 commits into from Jun 27, 2018

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@nmathewson @gvanem @tor-bot
@nmathewson
Copy link
Contributor

@nmathewson nmathewson commented Jun 26, 2018

No description provided.

nmathewson added 5 commits Jun 26, 2018
@nmathewson
Remove some accidentally committed code in checkIncludes.py
860b9a9
@nmathewson
Extract core part of smartlist code into its own library.
b1de1e7 
The smartlist_core library now contains only the parts of smartlists
that are needed for the logging library.  This resolves the
circularity between "container" and "log".

The "containers" library still uses the logging code, and has the
higher-level smartlist functions.
@nmathewson
Use raw_assert directly in smartlist_core
d7bd8cf 
I had previously added a "#define tor_assert raw_assert" here, to
make code movement in the previous commit more clear.
@nmathewson
fixup! Extract core part of smartlist code into its own library.
6e2b6a6
@nmathewson
fixup! Extract core part of smartlist code into its own library.
82a7343
@tor-bot tor-bot merged commit 82a7343 into torproject:master Jun 27, 2018
1 of 2 checks passed
gvanem
Copy link
Contributor

gvanem commented on b1de1e7 Jul 5, 2018

From clang-cl I get the warning:

../lib/container/smartlist.c(137,9):  warning: implicitly declaring library 
function 'strcasecmp' with type 'int (const char *, const char *)'     [-Wimplicit-function-declaration]
    if (strcasecmp((const char*)sl->list[i],element)==0)

So smartlist.c should be patched:

--- a/lib/container/smartlist.c 2018-07-04 19:27:39
+++ b/lib/container/smartlist.c 2018-07-05 09:19:02
@@ -21,6 +21,7 @@
 #include "lib/defs/digest_sizes.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/string/compat_ctype.h"
+#include "lib/string/compat_string.h"
 #include "lib/string/util_string.h"
 #include "lib/string/printf.h"
nmathewson
Copy link
Contributor

nmathewson commented on b1de1e7 Jul 5, 2018

Thanks! I've tried to fix that in 3d61036.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment