--- a/khronosfws/openmax_al/src/common/xametadataextractionitf.c	Fri Jun 25 17:36:03 2010 -0500
+++ b/khronosfws/openmax_al/src/common/xametadataextractionitf.c	Fri Jul 09 16:43:35 2010 -0500
@@ -150,7 +150,8 @@
     impl = GetImpl(self);
     if (!impl || !pKeySize)
         {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-XAMetadataExtractionItfImpl_GetKeySize");
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XAMetadataExtractionItfImpl_GetKeySize");
         return XA_RESULT_PARAMETER_INVALID;
         }
     *pKeySize = 0;
@@ -173,7 +174,8 @@
         /* check index and return unfiltered index */
         if (CheckAndUnfilterIndex(impl, index, &newidx) != XA_RESULT_SUCCESS)
             {
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-XAMetadataExtractionItfImpl_GetKeySize");
+            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+            DEBUG_API("<-XAMetadataExtractionItfImpl_GetKeySize");
             return XA_RESULT_PARAMETER_INVALID;
             }
 
@@ -210,7 +212,8 @@
     impl = GetImpl(self);
     if (!impl || !pKey)
         {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-XAMetadataExtractionItfImpl_GetKey");
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XAMetadataExtractionItfImpl_GetKey");
         return XA_RESULT_PARAMETER_INVALID;
         }
 
@@ -235,7 +238,8 @@
         /* check index and return unfiltered index */
         if (CheckAndUnfilterIndex(impl, index, &newidx) != XA_RESULT_SUCCESS)
             {
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-XAMetadataExtractionItfImpl_GetKey");
+            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+            DEBUG_API("<-XAMetadataExtractionItfImpl_GetKey");
             return XA_RESULT_PARAMETER_INVALID;
             }
 
@@ -284,7 +288,8 @@
     impl = GetImpl(self);
     if (!impl || !pValueSize)
         {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-XAMetadataExtractionItfImpl_GetValueSize");
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XAMetadataExtractionItfImpl_GetValueSize");
         return XA_RESULT_PARAMETER_INVALID;
         }
     *pValueSize = 0;
@@ -307,7 +312,8 @@
         /* check index and return unfiltered index */
         if (CheckAndUnfilterIndex(impl, index, &newidx) != XA_RESULT_SUCCESS)
             {
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-XAMetadataExtractionItfImpl_GetValueSize");
+            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+            DEBUG_API("<-XAMetadataExtractionItfImpl_GetValueSize");
             return XA_RESULT_PARAMETER_INVALID;
             }
 
@@ -344,7 +350,8 @@
     impl = GetImpl(self);
     if (!impl || !pValue)
         {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-XAMetadataExtractionItfImpl_GetValue");
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XAMetadataExtractionItfImpl_GetValue");
         return XA_RESULT_PARAMETER_INVALID;
         }
 
@@ -368,7 +375,8 @@
         /* check index and return unfiltered index */
         if (CheckAndUnfilterIndex(impl, index, &newidx) != XA_RESULT_SUCCESS)
             {
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-XAMetadataExtractionItfImpl_GetValue");
+            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+            DEBUG_API("<-XAMetadataExtractionItfImpl_GetValue");
             return XA_RESULT_PARAMETER_INVALID;
             }
 
@@ -433,7 +441,8 @@
 
     if (!impl)
         {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-XAMetadataExtractionItfImpl_AddKeyFilter");
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XAMetadataExtractionItfImpl_AddKeyFilter");
         return XA_RESULT_PARAMETER_INVALID;
         }
     else
@@ -495,7 +504,8 @@
                 matchMask = 0;
                 }
             }
-        }DEBUG_API_A1("<-XAMetadataExtractionItfImpl_AddKeyFilter (%d)", (int)res);
+        }
+    DEBUG_API_A1("<-XAMetadataExtractionItfImpl_AddKeyFilter (%d)", (int)res);
     return res;
     }
 
@@ -627,7 +637,8 @@
     impl = (XAMetadataExtractionItfImpl*) pHandlerCtx;
     if (!impl)
         {
-        DEBUG_ERR("XAMetadataExtractionItfImp_AdaptCb, invalid context pointer!");DEBUG_API("<-XAMetadataExtractionItfImp_AdaptCb");
+        DEBUG_ERR("XAMetadataExtractionItfImp_AdaptCb, invalid context pointer!");
+        DEBUG_API("<-XAMetadataExtractionItfImp_AdaptCb");
         return;
         }
     if (event && event->eventid == XA_ADAPT_MDE_TAGS_AVAILABLE)
@@ -646,7 +657,8 @@
     else
         {
         DEBUG_INFO("unhandled");
-        }DEBUG_API("<-XAMetadataExtractionItfImp_AdaptCb");
+        }
+    DEBUG_API("<-XAMetadataExtractionItfImp_AdaptCb");
     }
 
 /* For given index over filtered array, return index over whole array
@@ -661,7 +673,8 @@
         XAint16 i = -1;
         if (oldidx >= impl->filteredcount)
             {
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-CheckAndUnfilterIndex");
+            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+            DEBUG_API("<-CheckAndUnfilterIndex");
             return XA_RESULT_PARAMETER_INVALID;
             }
         *newidx = 0;
@@ -678,7 +691,8 @@
             {
             /* should not end up here */
             *newidx = 0;
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-CheckAndUnfilterIndex");
+            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+            DEBUG_API("<-CheckAndUnfilterIndex");
             return XA_RESULT_PARAMETER_INVALID;
             }
         }
@@ -686,7 +700,8 @@
         {
         if (oldidx >= impl->currentTags.itemcount)
             {
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");DEBUG_API("<-CheckAndUnfilterIndex");
+            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+            DEBUG_API("<-CheckAndUnfilterIndex");
             return XA_RESULT_PARAMETER_INVALID;
             }
         *newidx = oldidx;