- revert modifications to MaxDB library and sync with version 7.6.00.37

- bump version to 1.0.1

Author: dberlin

SAP-Report-Source-Decompressor/lib/hpa105CsObjInt.h

@@ -186,7 +186,7 @@ typedef struct CSH
 
 	TREE_DESC d_desc;
 
-	TREE_DESC bl_desc;
+	TREE_DESC bl_desc; 
 
 	SAP_BYTE window[(BUF_SIZE1)];
 	SAP_BYTE InterBuf[(BUF_SIZE2)];
@@ -364,7 +364,7 @@ typedef struct CSC
 
  BYTE_TYP * in_ptr;             /* global input ptr ............*/
  BYTE_TYP * end_inbuf;          /* end of input buffer .........*/
- BYTE_TYP *stack_end;
+ BYTE_TYP *stack_end;  
 
  int hshift;
  CODE_INT ent;
@@ -402,8 +402,7 @@ class CsObjectInt
                SAP_INT    outlen,        /* len output ......*/
                SAP_INT    option,        /* decompr. option  */
                SAP_INT *  bytes_read,    /* bytes read ......*/
-               SAP_INT *  bytes_decompressed,  /* bytes decompr.  */
-               int        show_algo);
+               SAP_INT *  bytes_decompressed); /* bytes decompr.  */
 
 	int CsGetAlgorithm (SAP_BYTE * data);
 

SAP-Report-Source-Decompressor/lib/vpa105CsObjInt.cpp

@@ -133,8 +133,7 @@ int CsObjectInt::CsDecompr (SAP_BYTE * inbuf,         /* ptr input .......*/
                SAP_INT    outlen,        /* len output ......*/
                SAP_INT    option,        /* decompr. option  */
                SAP_INT *  bytes_read,    /* bytes read ......*/
-               SAP_INT *  bytes_decompressed, /* bytes decompr.  */
-               int        show_algo)
+               SAP_INT *  bytes_decompressed) /* bytes decompr.  */
 /*--------------------------------------------------------------------*/
 /*     Decompress                                                     */
 /*                                                                    */
@@ -178,8 +177,6 @@ int CsObjectInt::CsDecompr (SAP_BYTE * inbuf,         /* ptr input .......*/
   {
     if (inlen < CS_HEAD_SIZE) return CS_E_IN_BUFFER_LEN;
     algorithm = CsGetAlgorithm (inbuf);
-    if (show_algo > 0)
-      printf("%s: %u (1 = LZC, 2 = LZH)\n", "Algorithm", algorithm);
   }
 
   switch (algorithm)
@@ -335,7 +332,7 @@ int CsObjectInt::CsInitDecompr (SAP_BYTE * inbuf)
 
   rc = CsDecompr (inbuf, CS_HEAD_SIZE,
                   outbuf, 0, CS_INIT_DECOMPRESS,
-                  &bytes_read, &bytes_written, 0);
+                  &bytes_read, &bytes_written);
 
   if (rc < 0) return rc;
   return 0;

SAP-Report-Source-Decompressor/sap-reposrc-decompressor.cpp

@@ -16,9 +16,10 @@
 //--------------------------------------------------------------------------------------------------
 // Changes:
 //   2012-06-23 - 1.0.0 - Initial version
+//   2012-06-24 - 1.0.1 - Revert modifications to MaxDB library
 //--------------------------------------------------------------------------------------------------
 
-#define VERSION "1.0.0"
+#define VERSION "1.0.1"
 
 // Silence MS Visual C++ ("... consider using fopen_s instead ...")
 #ifdef _MSC_VER
@@ -86,7 +87,11 @@ int main(int argc, char *argv[]) {
 		return 2;
 	}
 
-	printf("Compressed source read from file '%s'\n", argv[1]);
+	printf("Compressed source read from '%s'\n", argv[1]);
+
+	// Determine compression algorithm
+	ret = o.CsGetAlgorithm(bin + 1);
+	printf("Algorithm: %u (1 = LZC, 2 = LZH)\n", ret);
 
 	for (;;) {
 		// Create output buffer with an initial size factor of 10 x input buffer
@@ -101,7 +106,6 @@ int main(int argc, char *argv[]) {
 			, CS_INIT_DECOMPRESS	// Decompression
 			, &byte_read			// Bytes read from input buffer
 			, &byte_decomp			// Bytes decompressed to output buffer
-			, factor > 10 ? 0 : 1	// Print algorithm information only once
 		);
 
 		// Output buffer too small -> increase size factor and retry
@@ -152,7 +156,7 @@ int main(int argc, char *argv[]) {
 	fwrite("\n", 1, 1, fout);
 	fclose(fout);
 
-	printf("Plain source code written to file '%s'\nHave a nice day\n\n", argv[2]);
+	printf("Plain source code written to '%s'\nHave a nice day\n\n", argv[2]);
 
 	free(bout);
 	return 0;