From d62a4526fda0b286d2797aa99e560e2cfbe704b0 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 4 Oct 2007 08:21:53 +0000 Subject: moved enumerator from libappserv to libstrongswan --- src/libstrongswan/Makefile.am | 1 + src/libstrongswan/utils/enumerator.c | 44 ++++++++++++++++++++++++++++ src/libstrongswan/utils/enumerator.h | 57 ++++++++++++++++++++++++++++++++++++ src/manager/Makefile.am | 2 +- src/manager/database.c | 1 - src/manager/database.h | 2 +- src/manager/gateway.h | 2 +- src/manager/lib/enumerator.c | 44 ---------------------------- src/manager/lib/enumerator.h | 57 ------------------------------------ src/manager/lib/xml.h | 2 +- 10 files changed, 106 insertions(+), 106 deletions(-) create mode 100644 src/libstrongswan/utils/enumerator.c create mode 100644 src/libstrongswan/utils/enumerator.h delete mode 100644 src/manager/lib/enumerator.c delete mode 100644 src/manager/lib/enumerator.h (limited to 'src') diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 437608baf..1bfe3d842 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -50,6 +50,7 @@ utils/iterator.h \ utils/leak_detective.c utils/leak_detective.h \ utils/lexparser.c utils/lexparser.h \ utils/linked_list.c utils/linked_list.h \ +utils/enumerator.c utils/enumerator.h \ utils/optionsfrom.c utils/optionsfrom.h \ utils/randomizer.c utils/randomizer.h diff --git a/src/libstrongswan/utils/enumerator.c b/src/libstrongswan/utils/enumerator.c new file mode 100644 index 000000000..842a2e997 --- /dev/null +++ b/src/libstrongswan/utils/enumerator.c @@ -0,0 +1,44 @@ +/** + * @file enumerator.c + * + * @brief Implementation of enumerator_t. + * + */ + +/* + * Copyright (C) 2007 Martin Willi + * Hochschule fuer Technik Rapperswil + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. See . + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#include "enumerator.h" + + +/** + * Implementation of enumerator_create_empty().enumerate + */ +static bool enumerate_empty(enumerator_t *enumerator, ...) +{ + return FALSE; +} + +/** + * See header + */ +enumerator_t* enumerator_create_empty() +{ + enumerator_t *this = malloc_thing(enumerator_t); + this->enumerate = enumerate_empty; + this->destroy = (void*)free; + return this; +} + diff --git a/src/libstrongswan/utils/enumerator.h b/src/libstrongswan/utils/enumerator.h new file mode 100644 index 000000000..df1d78206 --- /dev/null +++ b/src/libstrongswan/utils/enumerator.h @@ -0,0 +1,57 @@ +/** + * @file enumerator.h + * + * @brief Interface of enumerator_t. + * + */ + +/* + * Copyright (C) 2007 Martin Willi + * Hochschule fuer Technik Rapperswil + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. See . + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#ifndef ENUMERATOR_H_ +#define ENUMERATOR_H_ + +#include + +typedef struct enumerator_t enumerator_t; + +/** + * @brief Enumerate is simpler, but more flexible than iterator. + */ +struct enumerator_t { + + /** + * @brief Enumerate collection. + * + * The enumerate function takes a variable argument list containing + * pointers where the enumerated values get written. + * + * @param ... variable list of enumerated items, implementation dependant + * @return TRUE if pointers returned + */ + bool (*enumerate)(enumerator_t *this, ...); + + /** + * @brief Destroy a enumerator instance. + */ + void (*destroy)(enumerator_t *this); +}; + +/** + * @brief Create an enumerator which enumerates over nothing + */ +enumerator_t* enumerator_create_empty(); + +#endif /* ENUMERATOR_H_ */ diff --git a/src/manager/Makefile.am b/src/manager/Makefile.am index 6380718d3..17eecdbab 100644 --- a/src/manager/Makefile.am +++ b/src/manager/Makefile.am @@ -15,7 +15,7 @@ lib_LTLIBRARIES = libappserv.la libappserv_la_SOURCES = \ lib/context.h lib/dispatcher.c lib/request.h lib/session.h \ lib/controller.h lib/dispatcher.h lib/request.c lib/session.c \ -lib/xml.h lib/xml.c lib/enumerator.h lib/enumerator.c +lib/xml.h lib/xml.c libappserv_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lfcgi -lpthread -lneo_cgi -lneo_cs -lneo_utl ${xml_LIBS} diff --git a/src/manager/database.c b/src/manager/database.c index 101e0c7ac..a7776c81e 100644 --- a/src/manager/database.c +++ b/src/manager/database.c @@ -24,7 +24,6 @@ #include #include -#include #include diff --git a/src/manager/database.h b/src/manager/database.h index 7edcde4fa..228d1cb22 100644 --- a/src/manager/database.h +++ b/src/manager/database.h @@ -23,7 +23,7 @@ #ifndef DATABASE_H_ #define DATABASE_H_ -#include +#include typedef struct database_t database_t; diff --git a/src/manager/gateway.h b/src/manager/gateway.h index d84f00038..1fe2aef4b 100644 --- a/src/manager/gateway.h +++ b/src/manager/gateway.h @@ -24,7 +24,7 @@ #define GATEWAY_H_ #include -#include +#include typedef struct gateway_t gateway_t; diff --git a/src/manager/lib/enumerator.c b/src/manager/lib/enumerator.c deleted file mode 100644 index 842a2e997..000000000 --- a/src/manager/lib/enumerator.c +++ /dev/null @@ -1,44 +0,0 @@ -/** - * @file enumerator.c - * - * @brief Implementation of enumerator_t. - * - */ - -/* - * Copyright (C) 2007 Martin Willi - * Hochschule fuer Technik Rapperswil - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. See . - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - */ - -#include "enumerator.h" - - -/** - * Implementation of enumerator_create_empty().enumerate - */ -static bool enumerate_empty(enumerator_t *enumerator, ...) -{ - return FALSE; -} - -/** - * See header - */ -enumerator_t* enumerator_create_empty() -{ - enumerator_t *this = malloc_thing(enumerator_t); - this->enumerate = enumerate_empty; - this->destroy = (void*)free; - return this; -} - diff --git a/src/manager/lib/enumerator.h b/src/manager/lib/enumerator.h deleted file mode 100644 index df1d78206..000000000 --- a/src/manager/lib/enumerator.h +++ /dev/null @@ -1,57 +0,0 @@ -/** - * @file enumerator.h - * - * @brief Interface of enumerator_t. - * - */ - -/* - * Copyright (C) 2007 Martin Willi - * Hochschule fuer Technik Rapperswil - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. See . - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - */ - -#ifndef ENUMERATOR_H_ -#define ENUMERATOR_H_ - -#include - -typedef struct enumerator_t enumerator_t; - -/** - * @brief Enumerate is simpler, but more flexible than iterator. - */ -struct enumerator_t { - - /** - * @brief Enumerate collection. - * - * The enumerate function takes a variable argument list containing - * pointers where the enumerated values get written. - * - * @param ... variable list of enumerated items, implementation dependant - * @return TRUE if pointers returned - */ - bool (*enumerate)(enumerator_t *this, ...); - - /** - * @brief Destroy a enumerator instance. - */ - void (*destroy)(enumerator_t *this); -}; - -/** - * @brief Create an enumerator which enumerates over nothing - */ -enumerator_t* enumerator_create_empty(); - -#endif /* ENUMERATOR_H_ */ diff --git a/src/manager/lib/xml.h b/src/manager/lib/xml.h index b73ddf074..738a8e1b3 100644 --- a/src/manager/lib/xml.h +++ b/src/manager/lib/xml.h @@ -23,7 +23,7 @@ #ifndef XML_H_ #define XML_H_ -#include +#include typedef struct xml_t xml_t; -- cgit v1.2.3