ICU-491.11.3.tar.gz

[apple/icu.git] / icuSources / common / udatamem.c

diff --git a/icuSources/common/udatamem.c b/icuSources/common/udatamem.c
index 6b39980cc3d1b8b49fa6ff156f2b6e8ddb7bbc7c..ec6175d985791739a75f7db71f01983e4fecc067 100644 (file)
--- a/icuSources/common/udatamem.c
+++ b/icuSources/common/udatamem.c
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 1999-2003, International Business Machines
+*   Copyright (C) 1999-2011, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************/
@@ -23,19 +23,20 @@
 
 #include "udatamem.h"
 
-void UDataMemory_init(UDataMemory *This) {
+U_CFUNC void UDataMemory_init(UDataMemory *This) {
     uprv_memset(This, 0, sizeof(UDataMemory));
+    This->length=-1;
 }
 
 
-void UDatamemory_assign(UDataMemory *dest, UDataMemory *source) {
+U_CFUNC void UDatamemory_assign(UDataMemory *dest, UDataMemory *source) {
     /* UDataMemory Assignment.  Destination UDataMemory must be initialized first.  */
     UBool mallocedFlag = dest->heapAllocated;
     uprv_memcpy(dest, source, sizeof(UDataMemory));
     dest->heapAllocated = mallocedFlag;
 }
 
-UDataMemory *UDataMemory_createNewInstance(UErrorCode *pErr) {
+U_CFUNC UDataMemory *UDataMemory_createNewInstance(UErrorCode *pErr) {
     UDataMemory *This;
 
     if (U_FAILURE(*pErr)) {
@@ -52,14 +53,14 @@ UDataMemory *UDataMemory_createNewInstance(UErrorCode *pErr) {
 }
 
 
-const DataHeader *
+U_CFUNC const DataHeader *
 UDataMemory_normalizeDataPointer(const void *p) {
     /* allow the data to be optionally prepended with an alignment-forcing double value */
     const DataHeader *pdh = (const DataHeader *)p;
     if(pdh==NULL || (pdh->dataHeader.magic1==0xda && pdh->dataHeader.magic2==0x27)) {
         return pdh;
     } else {
-#ifdef OS400
+#if U_PLATFORM == U_PF_OS400
         /*
         TODO: Fix this once the compiler implements this feature. Keep in sync with genccode.c
 
@@ -80,7 +81,7 @@ UDataMemory_normalizeDataPointer(const void *p) {
 }
 
 
-void UDataMemory_setData (UDataMemory *This, const void *dataAddr) {
+U_CFUNC void UDataMemory_setData (UDataMemory *This, const void *dataAddr) {
     This->pHeader = UDataMemory_normalizeDataPointer(dataAddr);
 }
 
@@ -100,14 +101,59 @@ udata_close(UDataMemory *pData) {
 U_CAPI const void * U_EXPORT2
 udata_getMemory(UDataMemory *pData) {
     if(pData!=NULL && pData->pHeader!=NULL) {
-        return (char *)(pData->pHeader)+pData->pHeader->dataHeader.headerSize;
+        return (char *)(pData->pHeader)+udata_getHeaderSize(pData->pHeader);
     } else {
         return NULL;
     }
 }
 
+/**
+ * Get the length of the data item if possible.
+ * The length may be up to 15 bytes larger than the actual data.
+ *
+ * TODO Consider making this function public.
+ * It would have to return the actual length in more cases.
+ * For example, the length of the last item in a .dat package could be
+ * computed from the size of the whole .dat package minus the offset of the
+ * last item.
+ * The size of a file that was directly memory-mapped could be determined
+ * using some system API.
+ *
+ * In order to get perfect values for all data items, we may have to add a
+ * length field to UDataInfo, but that complicates data generation
+ * and may be overkill.
+ *
+ * @param pData The data item.
+ * @return the length of the data item, or -1 if not known
+ * @internal Currently used only in cintltst/udatatst.c
+ */
+U_CAPI int32_t U_EXPORT2
+udata_getLength(const UDataMemory *pData) {
+    if(pData!=NULL && pData->pHeader!=NULL && pData->length>=0) {
+        /*
+         * subtract the header size,
+         * return only the size of the actual data starting at udata_getMemory()
+         */
+        return pData->length-udata_getHeaderSize(pData->pHeader);
+    } else {
+        return -1;
+    }
+}
 
-UBool  UDataMemory_isLoaded(UDataMemory *This) {
-    return This->pHeader != NULL;
+/**
+ * Get the memory including the data header.
+ * Used in cintltst/udatatst.c
+ * @internal
+ */
+U_CAPI const void * U_EXPORT2
+udata_getRawMemory(const UDataMemory *pData) {
+    if(pData!=NULL && pData->pHeader!=NULL) {
+        return pData->pHeader;
+    } else {
+        return NULL;
+    }
 }
 
+U_CFUNC UBool UDataMemory_isLoaded(const UDataMemory *This) {
+    return This->pHeader != NULL;
+}