z_stream zstream;
} z_enc_stream;
-void *StrBufNewStreamContext(eStreamType type)
+void *StrBufNewStreamContext(eStreamType type, const char **Err)
{
base64_decodestate *state;;
+ *Err = NULL;
switch (type)
{
err = inflateInit(&stream->zstream);
if (err != Z_OK) {
- StrBufDestroyStreamContext(type, (void**)&stream);
+ StrBufDestroyStreamContext(type, (void**)&stream, Err);
+ *Err = zError(err);
return NULL;
}
return stream;
DEF_MEM_LEVEL,
Z_DEFAULT_STRATEGY);
if (err != Z_OK) {
- StrBufDestroyStreamContext(type, (void**) &stream);
+ StrBufDestroyStreamContext(type, (void**) &stream, Err);
+ *Err = zError(err);
return NULL;
}
return stream;
return NULL;
}
-void StrBufDestroyStreamContext(eStreamType type, void **vStream)
+int StrBufDestroyStreamContext(eStreamType type, void **vStream, const char **Err)
{
+ int err;
+ int rc = 0;
+ *Err = NULL;
+
if ((vStream == NULL) || (*vStream==NULL)) {
- return;
+ *Err = strerror(EINVAL);
+ return EINVAL;
}
switch (type)
{
case eZLibEncode:
{
z_enc_stream *stream = (z_enc_stream *)*vStream;
+ err = deflateEnd(&stream->zstream);
+ if (err != Z_OK) {
+ *Err = zError(err);
+ rc = -1;
+ }
free(stream->OutBuf.buf);
free(stream);
-// todo more?
*vStream = NULL;
break;
}
case eEmtyCodec:
break; /// TODO
}
+ return rc;
}
-int StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, const char* pIn, long pInLen, void *vStream, int LastChunk)
+int StrBufStreamTranscode(eStreamType type, IOBuffer *Target, IOBuffer *In, const char* pIn, long pInLen, void *vStream, int LastChunk, const char **Err)
{
-
+ int rc = 0;
switch (type)
{
case eBase64Encode:
(In->Buf->BufUsed - stream->zstream.avail_in);
}
}
- return (LastChunk && (err != Z_FINISH));
+ rc = (LastChunk && (err != Z_FINISH));
+ if (!rc && (err != Z_OK)) {
+ *Err = zError(err);
+ }
}
break;
err = Z_DATA_ERROR; /* and fall through */
case Z_DATA_ERROR:
- fprintf(stderr, "sanoteuh\n");
+ *Err = zError(err);
case Z_MEM_ERROR:
(void)inflateEnd(&stream->zstream);
return err;
}
break; /// TODO
}
- return 0;
+ return rc;
}
/**