COLLECTION: Cleaning FIXME comments

I scanned through the code and made sure that the FIXME
comments are either addressed or a corresponding ticket exists.
I removed two comments that had "FIXME" in them.
The tickets for those comments are #72 and #308.

3 files changed, 2 insertions, 20 deletions

diff --git a/common/collection/collection.c b/common/collection/collection.c
index c8a007795..e3644e4e2 100644
--- a/common/collection/collection.c
+++ b/common/collection/collection.c
@@ -2455,7 +2455,6 @@ int col_get_reference_from_item(struct collection_item *ci,
 /* ADDITION */
 
 /* Add collection to collection */
-/* FIXME - allow to add collection to a collection with disposition */
 int col_add_collection_to_collection(struct collection_item *ci,
                                      const char *sub_collection_name,
                                      const char *as_property,
diff --git a/common/collection/collection.h b/common/collection/collection.h
index 665d5f00c..1121b16fe 100644
--- a/common/collection/collection.h
+++ b/common/collection/collection.h
@@ -51,10 +51,6 @@
                                                collections */
 
 
-/* Any data we deal with can't be longer than this */
-/* FIXME - make it compile time option */
-#define COL_MAX_DATA    65535
-
 /* Default class for a free form collection */
 #define COL_CLASS_DEFAULT      0
 
@@ -219,21 +215,6 @@ int col_create_collection(struct collection_item **ci,
                           const char *name,
                           unsigned cclass);
 
-/* Function that creates a named collection using a memory descriptor */
-/* FIXME - function is a placeholder. It is not implemented yet.
- * will be added in future together with the definition of the
- * descriptor structure.
- * The purpose is to control the internal implementation of the collection
- * a) Use hash table for faster searches if the collection is expected to be large.
- * b) Define memory functions to use.
- */
-/*
-int col_create_collection_ex(struct collection_item **ci,
-                             const char *name,
-                             unsigned cclass,
-                             struct cdescriptor *descrptor);
-*/
-
 /* Function that destroys a collection */
 void col_destroy_collection(struct collection_item *ci);
 
diff --git a/common/collection/configure.ac b/common/collection/configure.ac
index cf7a1ff3c..3ba1eb71c 100644
--- a/common/collection/configure.ac
+++ b/common/collection/configure.ac
@@ -30,6 +30,8 @@ AC_CHECK_FUNC([strcasestr],
                         [Define if strcasestr exists]),
               AC_MSG_ERROR("Platform must support strcasestr"))
 
+AC_DEFINE([COL_MAX_DATA], [65535], [Max length of the data block allowed in the collection value.])
+
 
 AC_CONFIG_FILES([Makefile collection.pc])
 AC_OUTPUT