Author: pnoltes
Date: Wed Jun 4 09:35:03 2014
New Revision: 1600061
URL: http://svn.apache.org/r1600061
Log:
CELIX-119: removed apr from linked_list. Note this will break the build...
Modified:
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/shape_component.c
incubator/celix/trunk/framework/private/include/manifest_parser.h
incubator/celix/trunk/framework/public/include/module.h
incubator/celix/trunk/framework/public/include/wire.h
incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h
incubator/celix/trunk/log_service/private/include/log.h
incubator/celix/trunk/log_service/public/include/log_reader_service.h
incubator/celix/trunk/utils/CMakeLists.txt
incubator/celix/trunk/utils/private/include/linked_list_private.h
incubator/celix/trunk/utils/private/test/linked_list_test.c
incubator/celix/trunk/utils/public/include/array_list.h
incubator/celix/trunk/utils/public/include/linked_list_iterator.h
Modified:
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
---
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c
(original)
+++
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c
Wed Jun 4 09:35:03 2014
@@ -46,7 +46,7 @@
#include "hash_map.h"
#include "simple_shape.h"
#include "linked_list_iterator.h"
-#include "linkedlist.h"
+#include "linked_list.h"
#include "paint_frame.h"
#include "shape_component.h"
#include "default_shape.h"
Modified:
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/shape_component.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/shape_component.c?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
---
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/shape_component.c
(original)
+++
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/shape_component.c
Wed Jun 4 09:35:03 2014
@@ -33,7 +33,7 @@
#include <gdk/gdk.h>
#include "bundle_context.h"
#include "utils.h"
-#include "linkedlist.h"
+#include "linked_list.h"
#include "hash_map.h"
#include "simple_shape.h"
#include "shape_component.h"
Modified: incubator/celix/trunk/framework/private/include/manifest_parser.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/manifest_parser.h?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/manifest_parser.h (original)
+++ incubator/celix/trunk/framework/private/include/manifest_parser.h Wed Jun
4 09:35:03 2014
@@ -30,7 +30,7 @@
#include "module.h"
#include "version.h"
#include "manifest.h"
-#include "linkedlist.h"
+#include "linked_list.h"
typedef struct manifestParser * manifest_parser_pt;
Modified: incubator/celix/trunk/framework/public/include/module.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/module.h?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/module.h (original)
+++ incubator/celix/trunk/framework/public/include/module.h Wed Jun 4 09:35:03
2014
@@ -30,7 +30,7 @@
typedef struct module *module_pt;
#include "celixbool.h"
-#include "linkedlist.h"
+#include "linked_list.h"
#include "manifest.h"
#include "version.h"
#include "array_list.h"
Modified: incubator/celix/trunk/framework/public/include/wire.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/wire.h?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/wire.h (original)
+++ incubator/celix/trunk/framework/public/include/wire.h Wed Jun 4 09:35:03
2014
@@ -32,7 +32,7 @@ typedef struct wire *wire_pt;
#include "requirement.h"
#include "capability.h"
#include "module.h"
-#include "linkedlist.h"
+#include "linked_list.h"
#include "module.h"
/**
Modified: incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
--- incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h
(original)
+++ incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h Wed
Jun 4 09:35:03 2014
@@ -29,7 +29,7 @@
#include <stdbool.h>
-//#include "linkedlist.h"
+//#include "linked_list.h"
//#include "array_list.h"
#include "hessian_2.0.h"
Modified: incubator/celix/trunk/log_service/private/include/log.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/include/log.h?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/include/log.h (original)
+++ incubator/celix/trunk/log_service/private/include/log.h Wed Jun 4 09:35:03
2014
@@ -29,7 +29,7 @@
#include <apr_general.h>
-#include "linkedlist.h"
+#include "linked_list.h"
#include "log_entry.h"
#include "log_listener.h"
Modified: incubator/celix/trunk/log_service/public/include/log_reader_service.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/public/include/log_reader_service.h?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/public/include/log_reader_service.h
(original)
+++ incubator/celix/trunk/log_service/public/include/log_reader_service.h Wed
Jun 4 09:35:03 2014
@@ -29,7 +29,7 @@
#include <apr_general.h>
#include "celix_errno.h"
-#include "linkedlist.h"
+#include "linked_list.h"
#include "log_listener.h"
static const char * const OSGI_LOGSERVICE_READER_SERVICE_NAME =
"log_reader_service";
Modified: incubator/celix/trunk/utils/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/utils/CMakeLists.txt?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
--- incubator/celix/trunk/utils/CMakeLists.txt (original)
+++ incubator/celix/trunk/utils/CMakeLists.txt Wed Jun 4 09:35:03 2014
@@ -32,9 +32,9 @@ if (UTILS)
public/include/hash_map.h
private/include/hash_map_private.h
- private/src/linkedlist.c
+ private/src/linked_list.c
private/src/linked_list_iterator.c
- public/include/linkedlist.h
+ public/include/linked_list.h
public/include/linked_list_iterator.h
private/include/linked_list_private.h
Modified: incubator/celix/trunk/utils/private/include/linked_list_private.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/utils/private/include/linked_list_private.h?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
--- incubator/celix/trunk/utils/private/include/linked_list_private.h (original)
+++ incubator/celix/trunk/utils/private/include/linked_list_private.h Wed Jun
4 09:35:03 2014
@@ -27,17 +27,15 @@
#ifndef LINKED_LIST_PRIVATE_H_
#define LINKED_LIST_PRIVATE_H_
-#include "linkedlist.h"
+#include "linked_list.h"
-struct linkedListEntry {
- apr_pool_t *memory_pool; // this is the (sub)memory pool specific for this
linked list entry
+struct linked_list_entry {
void * element;
- struct linkedListEntry * next;
- struct linkedListEntry * previous;
+ struct linked_list_entry * next;
+ struct linked_list_entry * previous;
};
-struct linkedList {
- apr_pool_t *memory_pool;
+struct linked_list {
linked_list_entry_pt header;
size_t size;
int modificationCount;
Modified: incubator/celix/trunk/utils/private/test/linked_list_test.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/utils/private/test/linked_list_test.c?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
--- incubator/celix/trunk/utils/private/test/linked_list_test.c (original)
+++ incubator/celix/trunk/utils/private/test/linked_list_test.c Wed Jun 4
09:35:03 2014
@@ -28,7 +28,7 @@
#include <stddef.h>
#include <CUnit/Automated.h>
-#include "linkedlist.h"
+#include "linked_list.h"
apr_pool_t *memory_pool;
linked_list_pt list;
Modified: incubator/celix/trunk/utils/public/include/array_list.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/utils/public/include/array_list.h?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
--- incubator/celix/trunk/utils/public/include/array_list.h (original)
+++ incubator/celix/trunk/utils/public/include/array_list.h Wed Jun 4 09:35:03
2014
@@ -27,8 +27,6 @@
#ifndef ARRAY_LIST_H_
#define ARRAY_LIST_H_
-#include <apr_general.h>
-
#include "celixbool.h"
#include "exports.h"
#include "celix_errno.h"
Modified: incubator/celix/trunk/utils/public/include/linked_list_iterator.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/utils/public/include/linked_list_iterator.h?rev=1600061&r1=1600060&r2=1600061&view=diff
==============================================================================
--- incubator/celix/trunk/utils/public/include/linked_list_iterator.h (original)
+++ incubator/celix/trunk/utils/public/include/linked_list_iterator.h Wed Jun
4 09:35:03 2014
@@ -29,7 +29,7 @@
#include "celixbool.h"
-#include "linkedlist.h"
+#include "linked_list.h"
#include "exports.h"
typedef struct linkedListIterator * linked_list_iterator_pt;
