react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/CWrappers.cpp

@@ -1,4 +1,4 @@
-// CWrappers.c
+// CWrappers.h
 
 #include "StdAfx.h"
 
@@ -18,7 +18,6 @@ SRes HRESULT_To_SRes(HRESULT res, SRes defaultRes) throw()
     case E_ABORT: return SZ_ERROR_PROGRESS;
     case S_FALSE: return SZ_ERROR_DATA;
     case E_NOTIMPL: return SZ_ERROR_UNSUPPORTED;
-    default: break;
   }
   return defaultRes;
 }
@@ -33,8 +32,6 @@ HRESULT SResToHRESULT(SRes res) throw()
     case SZ_ERROR_DATA:
     case SZ_ERROR_CRC:
     case SZ_ERROR_INPUT_EOF:
-    case SZ_ERROR_ARCHIVE:
-    case SZ_ERROR_NO_ARCHIVE:
       return S_FALSE;
     
     case SZ_ERROR_MEM: return E_OUTOFMEMORY;
@@ -48,7 +45,6 @@ HRESULT SResToHRESULT(SRes res) throw()
     // case SZ_ERROR_ARCHIVE:
     // case SZ_ERROR_NO_ARCHIVE:
     // return E_FAIL;
-    default: break;
   }
   if (res < 0)
     return res;
@@ -61,9 +57,9 @@ HRESULT SResToHRESULT(SRes res) throw()
 #define CONVERT_PR_VAL(x) (x == PROGRESS_UNKNOWN_VALUE ? NULL : &x)
 
 
-static SRes CompressProgress(ICompressProgressPtr pp, UInt64 inSize, UInt64 outSize) throw()
+static SRes CompressProgress(const ICompressProgress *pp, UInt64 inSize, UInt64 outSize) throw()
 {
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CCompressProgressWrap)
+  CCompressProgressWrap *p = CONTAINER_FROM_VTBL(pp, CCompressProgressWrap, vt);
   p->Res = p->Progress->SetRatioInfo(CONVERT_PR_VAL(inSize), CONVERT_PR_VAL(outSize));
   return HRESULT_To_SRes(p->Res, SZ_ERROR_PROGRESS);
 }
@@ -77,9 +73,9 @@ void CCompressProgressWrap::Init(ICompressProgressInfo *progress) throw()
 
 static const UInt32 kStreamStepSize = (UInt32)1 << 31;
 
-static SRes MyRead(ISeqInStreamPtr pp, void *data, size_t *size) throw()
+static SRes MyRead(const ISeqInStream *pp, void *data, size_t *size) throw()
 {
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CSeqInStreamWrap)
+  CSeqInStreamWrap *p = CONTAINER_FROM_VTBL(pp, CSeqInStreamWrap, vt);
   UInt32 curSize = ((*size < kStreamStepSize) ? (UInt32)*size : kStreamStepSize);
   p->Res = (p->Stream->Read(data, curSize, &curSize));
   *size = curSize;
@@ -89,9 +85,9 @@ static SRes MyRead(ISeqInStreamPtr pp, void *data, size_t *size) throw()
   return HRESULT_To_SRes(p->Res, SZ_ERROR_READ);
 }
 
-static size_t MyWrite(ISeqOutStreamPtr pp, const void *data, size_t size) throw()
+static size_t MyWrite(const ISeqOutStream *pp, const void *data, size_t size) throw()
 {
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CSeqOutStreamWrap)
+  CSeqOutStreamWrap *p = CONTAINER_FROM_VTBL(pp, CSeqOutStreamWrap, vt);
   if (p->Stream)
   {
     p->Res = WriteStream(p->Stream, data, size);
@@ -122,23 +118,20 @@ void CSeqOutStreamWrap::Init(ISequentialOutStream *stream) throw()
 }
 
 
-static SRes InStreamWrap_Read(ISeekInStreamPtr pp, void *data, size_t *size) throw()
+static SRes InStreamWrap_Read(const ISeekInStream *pp, void *data, size_t *size) throw()
 {
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CSeekInStreamWrap)
+  CSeekInStreamWrap *p = CONTAINER_FROM_VTBL(pp, CSeekInStreamWrap, vt);
   UInt32 curSize = ((*size < kStreamStepSize) ? (UInt32)*size : kStreamStepSize);
   p->Res = p->Stream->Read(data, curSize, &curSize);
   *size = curSize;
   return (p->Res == S_OK) ? SZ_OK : SZ_ERROR_READ;
 }
 
-static SRes InStreamWrap_Seek(ISeekInStreamPtr pp, Int64 *offset, ESzSeek origin) throw()
+static SRes InStreamWrap_Seek(const ISeekInStream *pp, Int64 *offset, ESzSeek origin) throw()
 {
-  Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CSeekInStreamWrap)
+  CSeekInStreamWrap *p = CONTAINER_FROM_VTBL(pp, CSeekInStreamWrap, vt);
   UInt32 moveMethod;
-  /* we need (int)origin to eliminate the clang warning:
-     default label in switch which covers all enumeration values
-     [-Wcovered-switch-default */
-  switch ((int)origin)
+  switch (origin)
   {
     case SZ_SEEK_SET: moveMethod = STREAM_SEEK_SET; break;
     case SZ_SEEK_CUR: moveMethod = STREAM_SEEK_CUR; break;
@@ -165,27 +158,27 @@ void CSeekInStreamWrap::Init(IInStream *stream) throw()
 void CByteInBufWrap::Free() throw()
 {
   ::MidFree(Buf);
-  Buf = NULL;
+  Buf = 0;
 }
 
 bool CByteInBufWrap::Alloc(UInt32 size) throw()
 {
-  if (!Buf || size != Size)
+  if (Buf == 0 || size != Size)
   {
     Free();
     Lim = Cur = Buf = (Byte *)::MidAlloc((size_t)size);
     Size = size;
   }
-  return (Buf != NULL);
+  return (Buf != 0);
 }
 
 Byte CByteInBufWrap::ReadByteFromNewBlock() throw()
 {
-  if (!Extra && Res == S_OK)
+  if (Res == S_OK)
   {
     UInt32 avail;
+    Processed += (Cur - Buf);
     Res = Stream->Read(Buf, Size, &avail);
-    Processed += (size_t)(Cur - Buf);
     Cur = Buf;
     Lim = Buf + avail;
     if (avail != 0)
@@ -195,106 +188,55 @@ Byte CByteInBufWrap::ReadByteFromNewBlock() throw()
   return 0;
 }
 
-// #pragma GCC diagnostic ignored "-Winvalid-offsetof"
-
-static Byte Wrap_ReadByte(IByteInPtr pp) throw()
+static Byte Wrap_ReadByte(const IByteIn *pp) throw()
 {
-  CByteInBufWrap *p = Z7_CONTAINER_FROM_VTBL_CLS(pp, CByteInBufWrap, vt);
-  // Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CByteInBufWrap)
+  CByteInBufWrap *p = CONTAINER_FROM_VTBL_CLS(pp, CByteInBufWrap, vt);
   if (p->Cur != p->Lim)
     return *p->Cur++;
   return p->ReadByteFromNewBlock();
 }
 
-CByteInBufWrap::CByteInBufWrap() throw(): Buf(NULL)
+CByteInBufWrap::CByteInBufWrap(): Buf(0)
 {
   vt.Read = Wrap_ReadByte;
 }
 
 
-
-/* ---------- CByteOutBufWrap ---------- */
-
-/*
-void CLookToSequentialWrap::Free() throw()
-{
-  ::MidFree(BufBase);
-  BufBase = NULL;
-}
-
-bool CLookToSequentialWrap::Alloc(UInt32 size) throw()
-{
-  if (!BufBase || size != Size)
-  {
-    Free();
-    BufBase = (Byte *)::MidAlloc((size_t)size);
-    Size = size;
-  }
-  return (BufBase != NULL);
-}
-*/
-
-/*
-EXTERN_C_BEGIN
-
-void CLookToSequentialWrap_Look(ILookInSeqStreamPtr pp)
-{
-  CLookToSequentialWrap *p = (CLookToSequentialWrap *)pp->Obj;
-
-  if (p->Extra || p->Res != S_OK)
-    return;
-  {
-    UInt32 avail;
-    p->Res = p->Stream->Read(p->BufBase, p->Size, &avail);
-    p->Processed += avail;
-    pp->Buf = p->BufBase;
-    pp->Limit = pp->Buf + avail;
-    if (avail == 0)
-      p->Extra = true;
-  }
-}
-
-EXTERN_C_END
-*/
-
-
 /* ---------- CByteOutBufWrap ---------- */
 
 void CByteOutBufWrap::Free() throw()
 {
   ::MidFree(Buf);
-  Buf = NULL;
+  Buf = 0;
 }
 
 bool CByteOutBufWrap::Alloc(size_t size) throw()
 {
-  if (!Buf || size != Size)
+  if (Buf == 0 || size != Size)
   {
     Free();
     Buf = (Byte *)::MidAlloc(size);
     Size = size;
   }
-  return (Buf != NULL);
+  return (Buf != 0);
 }
 
 HRESULT CByteOutBufWrap::Flush() throw()
 {
   if (Res == S_OK)
   {
-    const size_t size = (size_t)(Cur - Buf);
+    size_t size = (Cur - Buf);
     Res = WriteStream(Stream, Buf, size);
     if (Res == S_OK)
       Processed += size;
-    // else throw 11;
+    Cur = Buf;
   }
-  Cur = Buf; // reset pointer for later Wrap_WriteByte()
   return Res;
 }
 
-static void Wrap_WriteByte(IByteOutPtr pp, Byte b) throw()
+static void Wrap_WriteByte(const IByteOut *pp, Byte b) throw()
 {
-  CByteOutBufWrap *p = Z7_CONTAINER_FROM_VTBL_CLS(pp, CByteOutBufWrap, vt);
-  // Z7_CONTAINER_FROM_VTBL_TO_DECL_VAR_pp_vt_p(CByteOutBufWrap)
+  CByteOutBufWrap *p = CONTAINER_FROM_VTBL_CLS(pp, CByteOutBufWrap, vt);
   Byte *dest = p->Cur;
   *dest = b;
   p->Cur = ++dest;
@@ -302,57 +244,7 @@ static void Wrap_WriteByte(IByteOutPtr pp, Byte b) throw()
     p->Flush();
 }
 
-CByteOutBufWrap::CByteOutBufWrap() throw(): Buf(NULL), Size(0)
+CByteOutBufWrap::CByteOutBufWrap() throw(): Buf(0)
 {
   vt.Write = Wrap_WriteByte;
 }
-
-
-/* ---------- CLookOutWrap ---------- */
-
-/*
-void CLookOutWrap::Free() throw()
-{
-  ::MidFree(Buf);
-  Buf = NULL;
-}
-
-bool CLookOutWrap::Alloc(size_t size) throw()
-{
-  if (!Buf || size != Size)
-  {
-    Free();
-    Buf = (Byte *)::MidAlloc(size);
-    Size = size;
-  }
-  return (Buf != NULL);
-}
-
-static size_t LookOutWrap_GetOutBuf(ILookOutStreamPtr pp, void **buf) throw()
-{
-  CLookOutWrap *p = Z7_CONTAINER_FROM_VTBL_CLS(pp, CLookOutWrap, vt);
-  *buf = p->Buf;
-  return p->Size;
-}
-
-static size_t LookOutWrap_Write(ILookOutStreamPtr pp, size_t size) throw()
-{
-  CLookOutWrap *p = Z7_CONTAINER_FROM_VTBL_CLS(pp, CLookOutWrap, vt);
-  if (p->Res == S_OK && size != 0)
-  {
-    p->Res = WriteStream(p->Stream, p->Buf, size);
-    if (p->Res == S_OK)
-    {
-      p->Processed += size;
-      return size;
-    }
-  }
-  return 0;
-}
-
-CLookOutWrap::CLookOutWrap() throw(): Buf(NULL), Size(0)
-{
-  vt.GetOutBuf = LookOutWrap_GetOutBuf;
-  vt.Write = LookOutWrap_Write;
-}
-*/

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Common/CWrappers.h

@@ -1,7 +1,7 @@
 // CWrappers.h
 
-#ifndef ZIP7_INC_C_WRAPPERS_H
-#define ZIP7_INC_C_WRAPPERS_H
+#ifndef __C_WRAPPERS_H
+#define __C_WRAPPERS_H
 
 #include "../ICoder.h"
 #include "../../Common/MyCom.h"
@@ -63,7 +63,7 @@ struct CByteInBufWrap
   bool Extra;
   HRESULT Res;
   
-  CByteInBufWrap() throw();
+  CByteInBufWrap();
   ~CByteInBufWrap() { Free(); }
   void Free() throw();
   bool Alloc(UInt32 size) throw();
@@ -74,7 +74,7 @@ struct CByteInBufWrap
     Extra = false;
     Res = S_OK;
   }
-  UInt64 GetProcessed() const { return Processed + (size_t)(Cur - Buf); }
+  UInt64 GetProcessed() const { return Processed + (Cur - Buf); }
   Byte ReadByteFromNewBlock() throw();
   Byte ReadByte()
   {
@@ -85,45 +85,6 @@ struct CByteInBufWrap
 };
 
 
-/*
-struct CLookToSequentialWrap
-{
-  Byte *BufBase;
-  UInt32 Size;
-  ISequentialInStream *Stream;
-  UInt64 Processed;
-  bool Extra;
-  HRESULT Res;
-  
-  CLookToSequentialWrap(): BufBase(NULL) {}
-  ~CLookToSequentialWrap() { Free(); }
-  void Free() throw();
-  bool Alloc(UInt32 size) throw();
-  void Init()
-  {
-    // Lim = Cur = Buf;
-    Processed = 0;
-    Extra = false;
-    Res = S_OK;
-  }
-  // UInt64 GetProcessed() const { return Processed + (Cur - Buf); }
-
-  Byte ReadByteFromNewBlock() throw();
-  Byte ReadByte()
-  {
-    if (Cur != Lim)
-      return *Cur++;
-    return ReadByteFromNewBlock();
-  }
-};
-
-EXTERN_C_BEGIN
-// void CLookToSequentialWrap_Look(ILookInSeqStream *pp);
-EXTERN_C_END
-*/
-
-
-
 struct CByteOutBufWrap
 {
   IByteOut vt;
@@ -146,7 +107,7 @@ struct CByteOutBufWrap
     Processed = 0;
     Res = S_OK;
   }
-  UInt64 GetProcessed() const { return Processed + (size_t)(Cur - Buf); }
+  UInt64 GetProcessed() const { return Processed + (Cur - Buf); }
   HRESULT Flush() throw();
   void WriteByte(Byte b)
   {
@@ -156,27 +117,4 @@ struct CByteOutBufWrap
   }
 };
 
-
-/*
-struct CLookOutWrap
-{
-  ILookOutStream vt;
-  Byte *Buf;
-  size_t Size;
-  ISequentialOutStream *Stream;
-  UInt64 Processed;
-  HRESULT Res;
-  
-  CLookOutWrap() throw();
-  ~CLookOutWrap() { Free(); }
-  void Free() throw();
-  bool Alloc(size_t size) throw();
-  void Init()
-  {
-    Processed = 0;
-    Res = S_OK;
-  }
-};
-*/
-
 #endif