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
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
$NetBSD: patch-doctype_sgmltag.cxx,v 1.1 2012/12/21 10:29:47 dholland Exp $
Chase after the C++ standard:
- use the newfangled names for C++ headers
- use "std" qualification
--- doctype/sgmltag.cxx~ 2000-02-04 22:50:50.000000000 +0000
+++ doctype/sgmltag.cxx
@@ -51,11 +51,11 @@ Changes: 1.02
- Misc Error checking
@@@*/
-#include <iostream.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <iostream>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
#include "isearch.hxx"
#include "sgmltag.hxx"
@@ -101,7 +101,7 @@ SGMLTAG::ParseFields(PRECORD NewRecord)
file = fn.NewCString();
fp = fopen(fn, "rb");
if (!fp) {
- cout << "SGMLTAG::ParseRecords(): Failed to open file\n\t";
+ std::cout << "SGMLTAG::ParseRecords(): Failed to open file\n\t";
perror(file);
return;
}
@@ -111,16 +111,16 @@ SGMLTAG::ParseFields(PRECORD NewRecord)
RecEnd = NewRecord->GetRecordEnd();
if (RecEnd == 0) {
if(fseek(fp, 0L, SEEK_END) == -1) {
- cout << "SGMLTAG::ParseRecords(): Seek failed - ";
- cout << fn << "\n";
+ std::cout << "SGMLTAG::ParseRecords(): Seek failed - ";
+ std::cout << fn << "\n";
fclose(fp);
return;
}
RecStart = 0;
RecEnd = ftell(fp);
if(RecEnd == 0) {
- cout << "SGMLTAG::ParseRecords(): Skipping ";
- cout << " zero-length record -" << fn << "...\n";
+ std::cout << "SGMLTAG::ParseRecords(): Skipping ";
+ std::cout << " zero-length record -" << fn << "...\n";
fclose(fp);
return;
}
@@ -129,7 +129,7 @@ SGMLTAG::ParseFields(PRECORD NewRecord)
// Make two copies of the record in memory
if(fseek(fp, (long)RecStart, SEEK_SET) == -1) {
- cout << "SGMLTAG::ParseRecords(): Seek failed - " << fn << "\n";
+ std::cout << "SGMLTAG::ParseRecords(): Seek failed - " << fn << "\n";
fclose(fp);
return;
}
@@ -137,15 +137,15 @@ SGMLTAG::ParseFields(PRECORD NewRecord)
RecBuffer = new CHR[RecLength + 1];
if(!RecBuffer) {
- cout << "SGMLTAG::ParseRecords(): Failed to allocate ";
- cout << RecLength + 1 << " bytes - " << fn << "\n";
+ std::cout << "SGMLTAG::ParseRecords(): Failed to allocate ";
+ std::cout << RecLength + 1 << " bytes - " << fn << "\n";
fclose(fp);
return;
}
OrigRecBuffer = new CHR[RecLength + 1];
if(!OrigRecBuffer) {
- cout << "SGMLTAG::ParseRecords(): Failed to allocate ";
- cout << RecLength + 1 << " bytes - " << fn << "\n";
+ std::cout << "SGMLTAG::ParseRecords(): Failed to allocate ";
+ std::cout << RecLength + 1 << " bytes - " << fn << "\n";
delete [] RecBuffer;
fclose(fp);
return;
@@ -153,7 +153,7 @@ SGMLTAG::ParseFields(PRECORD NewRecord)
ActualLength = (GPTYPE)fread(RecBuffer, 1, RecLength, fp);
if(ActualLength == 0) {
- cout << "SGMLTAG::ParseRecords(): Failed to fread\n\t";
+ std::cout << "SGMLTAG::ParseRecords(): Failed to fread\n\t";
perror(file);
delete [] RecBuffer;
delete [] OrigRecBuffer;
@@ -162,9 +162,9 @@ SGMLTAG::ParseFields(PRECORD NewRecord)
}
fclose(fp);
if(ActualLength != RecLength) {
- cout << "SGMLTAG::ParseRecords(): Failed to fread ";
- cout << RecLength << " bytes. Actually read " << ActualLength;
- cout << " bytes - " << fn << "\n";
+ std::cout << "SGMLTAG::ParseRecords(): Failed to fread ";
+ std::cout << RecLength << " bytes. Actually read " << ActualLength;
+ std::cout << " bytes - " << fn << "\n";
delete [] RecBuffer;
delete [] OrigRecBuffer;
return;
@@ -189,8 +189,8 @@ SGMLTAG::ParseFields(PRECORD NewRecord)
pdft = new DFT();
if(!pdft) {
- cout << "SGMLTAG::ParseRecords(): Failed to allocate DFT - ";
- cout << fn << "\n";
+ std::cout << "SGMLTAG::ParseRecords(): Failed to allocate DFT - ";
+ std::cout << fn << "\n";
delete [] RecBuffer;
delete [] OrigRecBuffer;
return;
@@ -198,7 +198,7 @@ SGMLTAG::ParseFields(PRECORD NewRecord)
// tags = sgml_parse_tags(RecBuffer, RecLength);
tags = sgml_parse_tags(RecBuffer, RecLength, &numtags);
if(tags == NULL) {
- cout << "Unable to parse SGML file " << fn << "\n";
+ std::cout << "Unable to parse SGML file " << fn << "\n";
delete pdft;
delete [] RecBuffer;
delete [] OrigRecBuffer;
@@ -272,7 +272,7 @@ SGMLTAG::sgml_parse_tags(char *b, int le
t = new CHR*[128];
if(!t) {
- cout << "SGMLTAG::sgml_parse_tags(): Out of memory\n";
+ std::cout << "SGMLTAG::sgml_parse_tags(): Out of memory\n";
return NULL;
}
max_num_tags = TAG_GROW_SIZE;
|
