1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
--- cftypes.cpp.orig 1999-10-24 06:13:29 UTC
+++ cftypes.cpp
@@ -10,11 +10,20 @@
#ifndef __CFTYPES_CPP__
#define __CFTYPES_CPP__
-#include <values.h>
-#include <fstream.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <fstream>
#include "zlib.h"
#include "cftypes.h"
+#ifndef MAXSHORT
+#define BITSPERBYTE 8
+#define BITS(type) (BITSPERBYTE * (int)sizeof(type))
+#define SHORTBITS BITS(int16_t)
+#define MINSHORT ((int16_t)(1 << (SHORTBITS - 1)))
+#define MAXSHORT ((int16_t)~MINSHORT)
+#endif
+
/******************************************************************************/
int convert_z_error_code(int code)
@@ -138,15 +147,20 @@ const char* get_cabinet_error_string(int
int io_read(istream& in, byte* buf, word len)
{
- while(len > MAXINT)
+ // replaced MAXINT with MAXSHORT, since len is of type
+ // word == unsigned short int
+ //
+ // TODO: please review this, since IMO the while-loop is
+ // never entered
+ while (len > MAXSHORT)
{
- if(in.read(buf, MAXINT).bad())
+ if(in.read((char*)buf, MAXSHORT).bad())
return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF;
- len -= (word) MAXINT;
- buf += (word) MAXINT;
+ len -= (word) MAXSHORT;
+ buf += (word) MAXSHORT;
}
- return (in.read(buf, (int) len).bad())
+ return (in.read((char*)buf, (int) len).bad())
? (in.fail()) ? READ_ERROR : UNEXPECTED_EOF : OK;
}
@@ -154,14 +168,19 @@ int io_read(istream& in, byte* buf, word
int io_write(ostream& out, const byte* buf, word len)
{
- while(len > MAXINT)
+ // replaced MAXINT with MAXSHORT, since len is of type
+ // word == unsigned short int
+ //
+ // TODO: please review this, since IMO the while-loop is
+ // never entered
+ while(len > MAXSHORT)
{
- if(out.write(buf, MAXINT).fail()) return WRITE_ERROR;
- len -= (word) MAXINT;
- buf += (word) MAXINT;
+ if(out.write((char*)buf, MAXSHORT).fail()) return WRITE_ERROR;
+ len -= (word) MAXSHORT;
+ buf += (word) MAXSHORT;
}
- return (out.write(buf, (int) len).fail()) ? WRITE_ERROR : OK;
+ return (out.write((char*)buf, (int) len).fail()) ? WRITE_ERROR : OK;
}
//*****************************************************************************/
|
