* This reverts r3646 and r3645.
* xrealloc/xmalloc are there for a reason:
** Every call to these functions does not check the return value of
   the memory allocation, hence error checking must be performed
   in the wrapper.
** This was historically done in the macros defined in dmemory.h,
   but redefining any identifier from the standard library to
   something which behaves differently is confusing.

merged trunk into cdi_conversion_c++ and changed type of len in function serializeStrTabGetSize() to int, removed anonymous function in serializeStrTabGetSize() and replaced it with &len

[cdi-tiles] changed locking mechanism st. the original vlist of a stream is locked as soon as it is attached to the stream.

* r3363: merged changes from branches/cdi_fileDrivenInput

* Also rename some functions to include cdi prefix.

* Also extend corresponding resource copy test.