From 125b37af6d39e445086b6e80f60b3316a7602b6c Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 16 Oct 2012 15:53:49 +0200 Subject: [PATCH] Moved chunk_t to utils folder --- src/libhydra/attributes/attribute_handler.h | 2 +- src/libstrongswan/Android.mk | 4 ++-- src/libstrongswan/Makefile.am | 8 ++++---- src/libstrongswan/fetcher/fetcher.h | 2 +- src/libstrongswan/library.h | 2 +- src/libstrongswan/networking/host.h | 2 +- src/libstrongswan/plugins/agent/agent_private_key.c | 2 +- src/libstrongswan/plugins/mysql/mysql_database.c | 2 +- src/libstrongswan/plugins/pkcs11/pkcs11_library.h | 2 +- src/libstrongswan/{ => utils}/chunk.c | 0 src/libstrongswan/{ => utils}/chunk.h | 4 ++-- src/libstrongswan/utils/identification.h | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) rename src/libstrongswan/{ => utils}/chunk.c (100%) rename src/libstrongswan/{ => utils}/chunk.h (99%) diff --git a/src/libhydra/attributes/attribute_handler.h b/src/libhydra/attributes/attribute_handler.h index 91fa4e5b01..bc488f6cbc 100644 --- a/src/libhydra/attributes/attribute_handler.h +++ b/src/libhydra/attributes/attribute_handler.h @@ -21,7 +21,7 @@ #ifndef ATTRIBUTE_HANDLER_H_ #define ATTRIBUTE_HANDLER_H_ -#include +#include #include #include diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk index ef9f378c66..7308e3fee2 100644 --- a/src/libstrongswan/Android.mk +++ b/src/libstrongswan/Android.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) # copy-n-paste from Makefile.am LOCAL_SRC_FILES := \ -library.c chunk.c debug.c enum.c settings.c \ +library.c debug.c enum.c settings.c \ asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \ collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \ collections/linked_list.c \ @@ -30,7 +30,7 @@ pen/pen.c plugins/plugin_loader.c plugins/plugin_feature.c processing/jobs/job.c processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \ selectors/traffic_selector.c threading/thread.c threading/thread_value.c \ threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \ -utils.c utils/identification.c utils/lexparser.c \ +utils.c utils/chunk.c utils/identification.c utils/lexparser.c \ utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/printf_hook.c # adding the plugin source files diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 77120c6e5d..07d04b03e6 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -1,7 +1,7 @@ ipseclib_LTLIBRARIES = libstrongswan.la libstrongswan_la_SOURCES = \ -library.c chunk.c debug.c enum.c settings.c \ +library.c debug.c enum.c settings.c \ asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \ collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \ collections/linked_list.c \ @@ -28,13 +28,13 @@ pen/pen.c plugins/plugin_loader.c plugins/plugin_feature.c processing/jobs/job.c processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \ selectors/traffic_selector.c threading/thread.c threading/thread_value.c \ threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \ -utils.c utils/identification.c utils/lexparser.c \ +utils.c utils/chunk.c utils/identification.c utils/lexparser.c \ utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/printf_hook.c if USE_DEV_HEADERS strongswan_includedir = ${dev_headers} nobase_strongswan_include_HEADERS = \ -library.h chunk.h debug.h enum.h settings.h \ +library.h debug.h enum.h settings.h \ asn1/asn1.h asn1/asn1_parser.h asn1/oid.h bio/bio_reader.h bio/bio_writer.h \ collections/blocking_queue.h collections/enumerator.h collections/hashtable.h \ collections/linked_list.h \ @@ -68,7 +68,7 @@ processing/scheduler.h selectors/traffic_selector.h \ threading/thread.h threading/thread_value.h \ threading/mutex.h threading/condvar.h threading/spinlock.h threading/semaphore.h \ threading/rwlock.h threading/rwlock_condvar.h threading/lock_profiler.h \ -utils.h utils/identification.h utils/lexparser.h \ +utils.h utils/chunk.h utils/identification.h utils/lexparser.h \ utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \ utils/leak_detective.h utils/printf_hook.h utils/integrity_checker.h endif diff --git a/src/libstrongswan/fetcher/fetcher.h b/src/libstrongswan/fetcher/fetcher.h index 5b734da3d1..58451aef23 100644 --- a/src/libstrongswan/fetcher/fetcher.h +++ b/src/libstrongswan/fetcher/fetcher.h @@ -26,7 +26,7 @@ typedef struct fetcher_t fetcher_t; typedef enum fetcher_option_t fetcher_option_t; #include -#include +#include /** * Constructor function which creates fetcher instances. diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h index c8e8827432..699d5cb2e5 100644 --- a/src/libstrongswan/library.h +++ b/src/libstrongswan/library.h @@ -83,7 +83,6 @@ /* make sure we include printf_hook.h first */ #include "utils/printf_hook.h" #include "utils.h" -#include "chunk.h" #include "settings.h" #include "networking/host_resolver.h" #include "processing/processor.h" @@ -95,6 +94,7 @@ #include "credentials/credential_factory.h" #include "credentials/credential_manager.h" #include "credentials/cred_encoding.h" +#include "utils/chunk.h" #include "utils/integrity_checker.h" #include "utils/leak_detective.h" #include "plugins/plugin_loader.h" diff --git a/src/libstrongswan/networking/host.h b/src/libstrongswan/networking/host.h index cae2a4ff0b..1c49b1a508 100644 --- a/src/libstrongswan/networking/host.h +++ b/src/libstrongswan/networking/host.h @@ -34,7 +34,7 @@ typedef struct host_t host_t; #include #include -#include +#include /** * Differences between two hosts. They differ in diff --git a/src/libstrongswan/plugins/agent/agent_private_key.c b/src/libstrongswan/plugins/agent/agent_private_key.c index 60b57ad2dc..8d49431b39 100644 --- a/src/libstrongswan/plugins/agent/agent_private_key.c +++ b/src/libstrongswan/plugins/agent/agent_private_key.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #ifndef UNIX_PATH_MAX diff --git a/src/libstrongswan/plugins/mysql/mysql_database.c b/src/libstrongswan/plugins/mysql/mysql_database.c index 12a8ff54f4..d31e1eb33c 100644 --- a/src/libstrongswan/plugins/mysql/mysql_database.c +++ b/src/libstrongswan/plugins/mysql/mysql_database.c @@ -20,7 +20,7 @@ #include "mysql_database.h" #include -#include +#include #include #include #include diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_library.h b/src/libstrongswan/plugins/pkcs11/pkcs11_library.h index 81414a25f5..f225b9b8d0 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_library.h +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_library.h @@ -30,7 +30,7 @@ typedef struct pkcs11_library_t pkcs11_library_t; #include "pkcs11.h" #include -#include +#include #include /** diff --git a/src/libstrongswan/chunk.c b/src/libstrongswan/utils/chunk.c similarity index 100% rename from src/libstrongswan/chunk.c rename to src/libstrongswan/utils/chunk.c diff --git a/src/libstrongswan/chunk.h b/src/libstrongswan/utils/chunk.h similarity index 99% rename from src/libstrongswan/chunk.h rename to src/libstrongswan/utils/chunk.h index 91b23da3b0..865c1b82f6 100644 --- a/src/libstrongswan/chunk.h +++ b/src/libstrongswan/utils/chunk.h @@ -17,7 +17,7 @@ /** * @defgroup chunk chunk - * @{ @ingroup libstrongswan + * @{ @ingroup utils */ #ifndef CHUNK_H_ @@ -42,7 +42,7 @@ struct chunk_t { size_t len; }; -#include "utils.h" +#include "../utils.h" /** * A { NULL, 0 }-chunk handy for initialization. diff --git a/src/libstrongswan/utils/identification.h b/src/libstrongswan/utils/identification.h index 8b2173afb2..cdf2291270 100644 --- a/src/libstrongswan/utils/identification.h +++ b/src/libstrongswan/utils/identification.h @@ -29,7 +29,7 @@ typedef struct identification_t identification_t; typedef enum id_match_t id_match_t; typedef enum id_part_t id_part_t; -#include +#include #include /** -- 2.47.3