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 --- tests/files/system-modules/win32/two-duplicate.module | 3 --- tests/files/system-modules/win32/two.badname | 5 ----- 8 files changed, 28 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 (limited to 'tests/files/system-modules') 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 -- cgit v1.1