[aaf-commits] AAF/ref-impl/src/impl ImplAAFModule.cpp, 1.40, 1.41 aafErr.cpp, 1.13, 1.14 aafErr.h, 1.11, 1.12

[Tim B. <tbi...@us...>]

Update of /cvsroot/aaf/AAF/ref-impl/src/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15545/ref-impl/src/impl

Modified Files:
	ImplAAFModule.cpp aafErr.cpp aafErr.h 
Log Message:
Stubbed implementation of AAFResultToText() and AAFResultToTextBufLen() in the dynamic library.

Index: aafErr.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/aafErr.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** aafErr.cpp	3 Jun 2006 03:13:04 -0000	1.13
--- aafErr.cpp	8 Jun 2006 20:31:36 -0000	1.14
***************
*** 25,31 ****
  
  #include <string.h>
- 
  #include "aafErr.h"
! //#include "omPvt.h"
  
  static char    *localErrorStrings[300];
--- 25,44 ----
  
  #include <string.h>
  #include "aafErr.h"
! 
! AAFRESULT ResultToTextBufLen (
!     AAFRESULT  /* result */,
!     aafUInt32 *   /* pResultTextSize */)
! {
!   return AAFRESULT_NOT_IMPLEMENTED;
! }
! 
! AAFRESULT ResultToText (
!     AAFRESULT  /* result */,
!     aafCharacter *  /* pResultText */,
!     aafUInt32  /* resultTextSize */)
! {
!   return AAFRESULT_NOT_IMPLEMENTED;
! }
  
  static char    *localErrorStrings[300];

Index: aafErr.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/aafErr.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** aafErr.h	27 Feb 2004 14:26:50 -0000	1.11
--- aafErr.h	8 Jun 2006 20:31:36 -0000	1.12
***************
*** 43,46 ****
--- 43,56 ----
   *
   *************************************************************/
+ 
+ AAFRESULT ResultToTextBufLen (
+     AAFRESULT  result,
+     aafUInt32 *   pResultTextSize);
+ 
+ AAFRESULT ResultToText (
+     AAFRESULT  result,
+     aafCharacter *  pResultText,
+     aafUInt32  resultTextSize);
+ 
  char    *aafGetErrorString(aafErr_t code);
  char		*aafGetExpandedErrorString(AAFFile * file,

Index: ImplAAFModule.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFModule.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** ImplAAFModule.cpp	8 Jun 2006 17:51:30 -0000	1.40
--- ImplAAFModule.cpp	8 Jun 2006 20:31:36 -0000	1.41
***************
*** 65,68 ****
--- 65,69 ----
  #include "ImplAAFSmartPointer.h"
  #include "AAFUtils.h"
+ #include "aafErr.h"
  
  typedef ImplAAFSmartPointer<ImplAAFFile> ImplAAFFileSP;
***************
*** 1516,1530 ****
  
  STDAPI ImplAAFResultToTextBufLen (
!     AAFRESULT  /* result */,
!     aafUInt32 *   /* pResultTextSize */)
  {
!   return AAFRESULT_NOT_IMPLEMENTED;
  }
  
  STDAPI ImplAAFResultToText (
!     AAFRESULT  /* result */,
!     aafCharacter *  /* pResultText */,
!     aafUInt32  /* resultTextSize */)
  {
!   return AAFRESULT_NOT_IMPLEMENTED;
  }
--- 1517,1537 ----
  
  STDAPI ImplAAFResultToTextBufLen (
!     AAFRESULT  result,
!     aafUInt32 *   pResultTextSize)
  {
!   if (pResultTextSize == 0)
!     return  AAFRESULT_NULL_PARAM;
! 
!   return ResultToTextBufLen(result, pResultTextSize);
  }
  
  STDAPI ImplAAFResultToText (
!     AAFRESULT  result,
!     aafCharacter *  pResultText,
!     aafUInt32  resultTextSize)
  {
!   if (pResultText == 0)
!     return  AAFRESULT_NULL_PARAM;
! 
!   return ResultToText(result, pResultText, resultTextSize);
  }