denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved printf hooks to utils folder

Browse Source
This commit is contained in:
Tobias Brunner
2012-10-24 16:00:50 +02:00
parent 08944b68ac
commit 05e448c5cc
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/Android.mk
+2 -2
View File
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
# copy-n-paste from Makefile.am # copy-n-paste from Makefile.am
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
library.c chunk.c debug.c enum.c settings.c printf_hook.c \ library.c chunk.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 \ 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/blocking_queue.c collections/enumerator.c collections/hashtable.c \
collections/linked_list.c \ collections/linked_list.c \
@@ -31,7 +31,7 @@ processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
selectors/traffic_selector.c threading/thread.c threading/thread_value.c \ selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \ threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
utils.c utils/identification.c utils/lexparser.c \ utils.c utils/identification.c utils/lexparser.c \
utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/printf_hook.c
# adding the plugin source files # adding the plugin source files
src/libstrongswan/Makefile.am
+4 -4
View File
@@ -1,7 +1,7 @@
ipseclib_LTLIBRARIES = libstrongswan.la ipseclib_LTLIBRARIES = libstrongswan.la
libstrongswan_la_SOURCES = \ libstrongswan_la_SOURCES = \
library.c chunk.c debug.c enum.c settings.c printf_hook.c \ library.c chunk.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 \ 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/blocking_queue.c collections/enumerator.c collections/hashtable.c \
collections/linked_list.c \ collections/linked_list.c \
@@ -29,12 +29,12 @@ processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
selectors/traffic_selector.c threading/thread.c threading/thread_value.c \ selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \ threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
utils.c utils/identification.c utils/lexparser.c \ utils.c utils/identification.c utils/lexparser.c \
utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/printf_hook.c
if USE_DEV_HEADERS if USE_DEV_HEADERS
strongswan_includedir = ${dev_headers} strongswan_includedir = ${dev_headers}
nobase_strongswan_include_HEADERS = \ nobase_strongswan_include_HEADERS = \
library.h chunk.h debug.h enum.h settings.h printf_hook.h \ library.h chunk.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 \ 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/blocking_queue.h collections/enumerator.h collections/hashtable.h \
collections/linked_list.h \ collections/linked_list.h \
@@ -70,7 +70,7 @@ threading/mutex.h threading/condvar.h threading/spinlock.h threading/semaphore.h
threading/rwlock.h threading/rwlock_condvar.h threading/lock_profiler.h \ threading/rwlock.h threading/rwlock_condvar.h threading/lock_profiler.h \
utils.h utils/identification.h utils/lexparser.h \ utils.h utils/identification.h utils/lexparser.h \
utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \ utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \
utils/leak_detective.h utils/integrity_checker.h utils/leak_detective.h utils/printf_hook.h utils/integrity_checker.h
endif endif
library.lo : $(top_builddir)/config.status library.lo : $(top_builddir)/config.status
src/libstrongswan/enum.h
+1 -1
View File
@@ -22,7 +22,7 @@
#ifndef ENUM_H_ #ifndef ENUM_H_
#define ENUM_H_ #define ENUM_H_
#include "printf_hook.h" #include "utils/printf_hook.h"
typedef struct enum_name_t enum_name_t; typedef struct enum_name_t enum_name_t;
src/libstrongswan/library.h
+2 -1
View File
@@ -80,7 +80,8 @@
# error config.h not included, pass "-include [...]/config.h" to gcc # error config.h not included, pass "-include [...]/config.h" to gcc
#endif #endif
#include "printf_hook.h" /* make sure we include printf_hook.h first */
#include "utils/printf_hook.h"
#include "utils.h" #include "utils.h"
#include "chunk.h" #include "chunk.h"
#include "settings.h" #include "settings.h"
src/libstrongswan/printf_hook.c → src/libstrongswan/utils/printf_hook.c
View File
src/libstrongswan/printf_hook.h → src/libstrongswan/utils/printf_hook.h
+1 -1
View File
@@ -16,7 +16,7 @@
/** /**
* @defgroup printf_hook printf_hook * @defgroup printf_hook printf_hook
* @{ @ingroup libstrongswan * @{ @ingroup utils
*/ */
#ifndef PRINTF_HOOK_H_ #ifndef PRINTF_HOOK_H_