Skip to content

Commit ab02dd5

Browse files
mroethkesmlng
authored andcommitted
third-party: move tommyds from spki/hashtable into third party folder and remove version from folder name
tommyds has not be used exclusively by spki for quite some time, it therefore does not make sense to keep in under the spki directory. Furthermore having the tommyds version in the folder name only makes updating the lib more verbose and is not necessary for knowing the current version since the version number is available in several places within files of the library.
1 parent 6c30a53 commit ab02dd5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+10
-7
lines changed

.codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ coverage:
88
range: "50...80"
99

1010
ignore:
11-
- rtrlib/spki/hashtable/tommyds-2.2/.*
11+
- third-party/
1212
- tests/*
1313

1414
status: {}

CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ endif(CMAKE_BUILD_TYPE STREQUAL Debug)
3232

3333
include_directories(.)
3434

35+
add_subdirectory(third-party)
36+
3537
find_package(codecov)
3638

3739
find_package(Threads REQUIRED)
@@ -45,7 +47,7 @@ set(RTRLIB_SRC rtrlib/rtr_mgr.c rtrlib/lib/utils.c rtrlib/lib/alloc_utils.c rtrl
4547
rtrlib/lib/ip.c rtrlib/lib/ipv4.c rtrlib/lib/ipv6.c rtrlib/lib/log.c
4648
rtrlib/pfx/trie/trie.c rtrlib/pfx/trie/trie-pfx.c rtrlib/transport/transport.c
4749
rtrlib/transport/tcp/tcp_transport.c rtrlib/rtr/rtr.c rtrlib/rtr/packets.c
48-
rtrlib/spki/hashtable/ht-spkitable.c rtrlib/spki/hashtable/tommyds-2.2/tommy.c)
50+
rtrlib/spki/hashtable/ht-spkitable.c ${tommyds})
4951
set(RTRLIB_LINK ${RT_LIB} ${CMAKE_THREAD_LIBS_INIT})
5052

5153
find_package(LibSSH 0.5.0 QUIET)

rtrlib/rtr_mgr_private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#ifndef RTR_MGR_PRIVATE
1111
#define RTR_MGR_PRIVATE
1212
#include "rtrlib/rtr_mgr.h"
13-
#include "rtrlib/spki/hashtable/tommyds-2.2/tommylist.h"
13+
#include "third-party/tommyds/tommylist.h"
1414

1515
struct tommy_list_wrapper {
1616
tommy_list list;

rtrlib/spki/hashtable/ht-spkitable_private.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#define RTR_HT_SPKITABLE_PRIVATE_H
1111

1212
#include "rtrlib/spki/spkitable_private.h"
13-
#include "rtrlib/spki/hashtable/tommyds-2.2/tommyhashlin.h"
14-
#include "rtrlib/spki/hashtable/tommyds-2.2/tommylist.h"
13+
#include "third-party/tommyds/tommyhashlin.h"
14+
#include "third-party/tommyds/tommylist.h"
1515

1616
typedef int (*hash_cmp_fp)(const void *arg, const void *obj);
1717

scripts/travis.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function run_command {
2323

2424
function checkpatch {
2525
git diff $TRAVIS_BRANCH '*.[ch]' > /tmp/patch
26-
run_command scripts/checkpatch.pl --terse --no-tree --strict --show-types /tmp/patch
26+
run_command scripts/checkpatch.pl --ignore FILE_PATH_CHANGES,PREFER_KERNEL_TYPES,CONST_STRUCT,OPEN_BRACE,SPDX_LICENSE_TAG,OPEN_ENDED_LINE,UNNECESSARY_PARENTHESES --terse --no-tree --strict --show-types /tmp/patch
2727
ret=$?
2828
if [ $ret != 0]; then
2929
cat -n /tmp/patch

tests/test_dynamic_groups.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "rtrlib/rtrlib.h"
77
#include "rtrlib/rtr_mgr_private.h"
8-
#include "rtrlib/spki/hashtable/tommyds-2.2/tommylist.h"
8+
#include "third-party/tommyds/tommylist.h"
99

1010
const int connection_timeout = 20;
1111
enum rtr_mgr_status connection_status = -1;

third-party/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
set(tommyds "${CMAKE_CURRENT_SOURCE_DIR}/tommyds/tommy.c" PARENT_SCOPE)
File renamed without changes.

0 commit comments

Comments
 (0)