From 3d503948450d69293a3fdfec096e398fedf714f2 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Thu, 6 Dec 2012 22:42:02 +0100 Subject: Move debug and library code into the common/ subdirectory Start using p11_ as our internal prefix rather than _p11_. We explicitly export p11_kit_ so this is fine as far as visibility. Move the threading, mutex, and module compat, dict, and array code into the common directory too. Take this opportunity to clean up a bit of internal API as well, since so many lines are being touched internally. --- tests/files/system-modules/four.module | 3 -- tests/files/system-modules/one.module | 3 -- tests/files/system-modules/two-duplicate.module | 3 -- tests/files/system-modules/two.badname | 5 -- tests/files/system-modules/win32/four.module | 3 -- tests/files/system-modules/win32/one.module | 3 -- .../system-modules/win32/two-duplicate.module | 3 -- tests/files/system-modules/win32/two.badname | 5 -- tests/files/system-pkcs11.conf | 3 -- tests/files/test-1.conf | 6 --- tests/files/test-pinfile | 1 - tests/files/test-pinfile-large | 53 ---------------------- tests/files/test-system-invalid.conf | 3 -- tests/files/test-system-merge.conf | 7 --- tests/files/test-system-none.conf | 8 ---- tests/files/test-system-only.conf | 8 ---- tests/files/test-user-invalid.conf | 3 -- tests/files/test-user-only.conf | 4 -- tests/files/test-user.conf | 3 -- tests/files/user-modules/one.module | 2 - tests/files/user-modules/three.module | 5 -- tests/files/user-modules/win32/one.module | 2 - tests/files/user-modules/win32/three.module | 5 -- 23 files changed, 141 deletions(-) delete mode 100644 tests/files/system-modules/four.module delete mode 100644 tests/files/system-modules/one.module delete mode 100644 tests/files/system-modules/two-duplicate.module delete mode 100644 tests/files/system-modules/two.badname delete mode 100644 tests/files/system-modules/win32/four.module delete mode 100644 tests/files/system-modules/win32/one.module delete mode 100644 tests/files/system-modules/win32/two-duplicate.module delete mode 100644 tests/files/system-modules/win32/two.badname delete mode 100644 tests/files/system-pkcs11.conf delete mode 100644 tests/files/test-1.conf delete mode 100644 tests/files/test-pinfile delete mode 100644 tests/files/test-pinfile-large delete mode 100644 tests/files/test-system-invalid.conf delete mode 100644 tests/files/test-system-merge.conf delete mode 100644 tests/files/test-system-none.conf delete mode 100644 tests/files/test-system-only.conf delete mode 100644 tests/files/test-user-invalid.conf delete mode 100644 tests/files/test-user-only.conf delete mode 100644 tests/files/test-user.conf delete mode 100644 tests/files/user-modules/one.module delete mode 100644 tests/files/user-modules/three.module delete mode 100644 tests/files/user-modules/win32/one.module delete mode 100644 tests/files/user-modules/win32/three.module (limited to 'tests/files') diff --git a/tests/files/system-modules/four.module b/tests/files/system-modules/four.module deleted file mode 100644 index 6eace3c..0000000 --- a/tests/files/system-modules/four.module +++ /dev/null @@ -1,3 +0,0 @@ - -module: mock-four.so -disable-in: test-disable, test-other diff --git a/tests/files/system-modules/one.module b/tests/files/system-modules/one.module deleted file mode 100644 index 3620869..0000000 --- a/tests/files/system-modules/one.module +++ /dev/null @@ -1,3 +0,0 @@ - -module: mock-one.so -setting: system1 \ No newline at end of file diff --git a/tests/files/system-modules/two-duplicate.module b/tests/files/system-modules/two-duplicate.module deleted file mode 100644 index 907aa75..0000000 --- a/tests/files/system-modules/two-duplicate.module +++ /dev/null @@ -1,3 +0,0 @@ - -# This is a duplicate of the 'two' module -module: mock-two.so diff --git a/tests/files/system-modules/two.badname b/tests/files/system-modules/two.badname deleted file mode 100644 index 0d41cac..0000000 --- a/tests/files/system-modules/two.badname +++ /dev/null @@ -1,5 +0,0 @@ -# This module doesn't have a .module extension, but p11-kit doesn't yet -# enforce the naming, just warns, so it should still be loaded - -module: mock-two.so -setting: system2 diff --git a/tests/files/system-modules/win32/four.module b/tests/files/system-modules/win32/four.module deleted file mode 100644 index 7fd1540..0000000 --- a/tests/files/system-modules/win32/four.module +++ /dev/null @@ -1,3 +0,0 @@ - -module: mock-four.dll -disable-in: test-disable, test-other diff --git a/tests/files/system-modules/win32/one.module b/tests/files/system-modules/win32/one.module deleted file mode 100644 index 5f80304..0000000 --- a/tests/files/system-modules/win32/one.module +++ /dev/null @@ -1,3 +0,0 @@ - -module: mock-one.dll -setting: system1 \ No newline at end of file diff --git a/tests/files/system-modules/win32/two-duplicate.module b/tests/files/system-modules/win32/two-duplicate.module deleted file mode 100644 index e80c9e8..0000000 --- a/tests/files/system-modules/win32/two-duplicate.module +++ /dev/null @@ -1,3 +0,0 @@ - -# This is a duplicate of the 'two' module -module: mock-two.dll diff --git a/tests/files/system-modules/win32/two.badname b/tests/files/system-modules/win32/two.badname deleted file mode 100644 index ae44b83..0000000 --- a/tests/files/system-modules/win32/two.badname +++ /dev/null @@ -1,5 +0,0 @@ -# This module doesn't have a .module extension, but p11-kit doesn't yet -# enforce the naming, just warns, so it should still be loaded - -module: mock-two.dll -setting: system2 diff --git a/tests/files/system-pkcs11.conf b/tests/files/system-pkcs11.conf deleted file mode 100644 index 20741e7..0000000 --- a/tests/files/system-pkcs11.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Merge in user config -user-config: merge \ No newline at end of file diff --git a/tests/files/test-1.conf b/tests/files/test-1.conf deleted file mode 100644 index d4ae0a1..0000000 --- a/tests/files/test-1.conf +++ /dev/null @@ -1,6 +0,0 @@ -key1:value1 -with-whitespace : value-with-whitespace -with-colon: value-of-colon - -# A comment -embedded-comment: this is # not a comment diff --git a/tests/files/test-pinfile b/tests/files/test-pinfile deleted file mode 100644 index f646f3d..0000000 --- a/tests/files/test-pinfile +++ /dev/null @@ -1 +0,0 @@ -yogabbagabba \ No newline at end of file diff --git a/tests/files/test-pinfile-large b/tests/files/test-pinfile-large deleted file mode 100644 index 506668d..0000000 --- a/tests/files/test-pinfile-large +++ /dev/null @@ -1,53 +0,0 @@ -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba yogabbagabba -yogabbagabba yogabbagabba yogabbagabba yo \ No newline at end of file diff --git a/tests/files/test-system-invalid.conf b/tests/files/test-system-invalid.conf deleted file mode 100644 index 344ee96..0000000 --- a/tests/files/test-system-invalid.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Invalid user-config setting -user-config: bad diff --git a/tests/files/test-system-merge.conf b/tests/files/test-system-merge.conf deleted file mode 100644 index 978427d..0000000 --- a/tests/files/test-system-merge.conf +++ /dev/null @@ -1,7 +0,0 @@ - -# Merge in user config -user-config: merge - -key1: system1 -key2: system2 -key3: system3 \ No newline at end of file diff --git a/tests/files/test-system-none.conf b/tests/files/test-system-none.conf deleted file mode 100644 index 95351e6..0000000 --- a/tests/files/test-system-none.conf +++ /dev/null @@ -1,8 +0,0 @@ - -# Only user config -user-config: none - -# These values will not be overriden -key1: system1 -key2: system2 -key3: system3 \ No newline at end of file diff --git a/tests/files/test-system-only.conf b/tests/files/test-system-only.conf deleted file mode 100644 index 589f1c7..0000000 --- a/tests/files/test-system-only.conf +++ /dev/null @@ -1,8 +0,0 @@ - -# Only user config -user-config: only - -# This stuff will be ignored -key1: system1 -key2: system2 -key3: system3 \ No newline at end of file diff --git a/tests/files/test-user-invalid.conf b/tests/files/test-user-invalid.conf deleted file mode 100644 index 344ee96..0000000 --- a/tests/files/test-user-invalid.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Invalid user-config setting -user-config: bad diff --git a/tests/files/test-user-only.conf b/tests/files/test-user-only.conf deleted file mode 100644 index 3224c01..0000000 --- a/tests/files/test-user-only.conf +++ /dev/null @@ -1,4 +0,0 @@ - -user-config: only -key2: user2 -key3: user3 \ No newline at end of file diff --git a/tests/files/test-user.conf b/tests/files/test-user.conf deleted file mode 100644 index 369544a..0000000 --- a/tests/files/test-user.conf +++ /dev/null @@ -1,3 +0,0 @@ - -key2: user2 -key3: user3 \ No newline at end of file diff --git a/tests/files/user-modules/one.module b/tests/files/user-modules/one.module deleted file mode 100644 index c371e4a..0000000 --- a/tests/files/user-modules/one.module +++ /dev/null @@ -1,2 +0,0 @@ - -setting: user1 \ No newline at end of file diff --git a/tests/files/user-modules/three.module b/tests/files/user-modules/three.module deleted file mode 100644 index 00caab5..0000000 --- a/tests/files/user-modules/three.module +++ /dev/null @@ -1,5 +0,0 @@ - -module: mock-three.so -setting: user3 - -enable-in: test-enable \ No newline at end of file diff --git a/tests/files/user-modules/win32/one.module b/tests/files/user-modules/win32/one.module deleted file mode 100644 index c371e4a..0000000 --- a/tests/files/user-modules/win32/one.module +++ /dev/null @@ -1,2 +0,0 @@ - -setting: user1 \ No newline at end of file diff --git a/tests/files/user-modules/win32/three.module b/tests/files/user-modules/win32/three.module deleted file mode 100644 index 58f883d..0000000 --- a/tests/files/user-modules/win32/three.module +++ /dev/null @@ -1,5 +0,0 @@ - -module: mock-three.dll -setting: user3 - -enable-in: test-enable \ No newline at end of file -- cgit v1.1