HCoop / jackhill / guix / guix.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
gnu: Add kafs-client
[jackhill/guix/guix.git] / gnu / packages / patches / xplanet-1.3.1-cxx11-eof.patch
CommitLineData
77704cb1
VK		 1Author: Eric Bavier Date: 2020-01-13
2Url: https://notabug.org/bavier/guix-bavier/raw/master/bavier/patches/
3+xplanet-cxx11-eof.patch
4
5diff --git a/src/libannotate/addArcs.cpp b/src/libannotate/addArcs.cpp
6index 2ee06c0..4fdb343 100644
7--- a/src/libannotate/addArcs.cpp
8+++ b/src/libannotate/addArcs.cpp
9@@ -258,7 +258,7 @@ addArcs(PlanetProperties *planetProperties, Planet *planet,
10 {
11 ifstream inFile(arcFile.c_str());
12 char *line = new char[MAX_LINE_LENGTH];
13- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
14+ while (!inFile.getline (line, MAX_LINE_LENGTH, '\n').eof())
15 readArcFile(line, planet, view, projection,
16 planetProperties, annotationMap);
17
18@@ -292,7 +292,7 @@ addArcs(View *view, multimap<double, Annotation *> &annotationMap)
19 {
20 ifstream inFile(arcFile.c_str());
21 char *line = new char[256];
22- while (inFile.getline (line, 256, '\n') != NULL)
23+ while (!inFile.getline (line, 256, '\n').eof())
24 readArcFile(line, NULL, view, NULL, NULL, annotationMap);
25
26 inFile.close();
27diff --git a/src/libannotate/addMarkers.cpp b/src/libannotate/addMarkers.cpp
28index dde51c1..b641e6a 100644
29--- a/src/libannotate/addMarkers.cpp
30+++ b/src/libannotate/addMarkers.cpp
31@@ -429,7 +429,7 @@ addMarkers(PlanetProperties *planetProperties, Planet *planet,
32 {
33 ifstream inFile(markerFile.c_str());
34 char *line = new char[MAX_LINE_LENGTH];
35- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
36+ while (!inFile.getline (line, MAX_LINE_LENGTH, '\n').eof())
37 {
38 unsigned char color[3];
39 memcpy(color, planetProperties->MarkerColor(), 3);
40@@ -475,7 +475,7 @@ addMarkers(View *view, const int width, const int height,
41 {
42 ifstream inFile(markerFile.c_str());
43 char *line = new char[MAX_LINE_LENGTH];
44- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
45+ while (!inFile.getline (line, MAX_LINE_LENGTH, '\n').eof())
46 {
47 unsigned char color[3];
48 memcpy(color, options->Color(), 3);
49diff --git a/src/libannotate/addSatellites.cpp b/src/libannotate/addSatellites.cpp
50index 2634339..6d9d378 100644
51--- a/src/libannotate/addSatellites.cpp
52+++ b/src/libannotate/addSatellites.cpp
53@@ -488,10 +488,10 @@ loadSatelliteVector(PlanetProperties *planetProperties)
54 {
55 ifstream inFile(tleFile.c_str());
56 char lines[3][80];
57- while (inFile.getline(lines[0], 80) != NULL)
58+ while (!inFile.getline(lines[0], 80).eof())
59 {
60- if ((inFile.getline(lines[1], 80) == NULL)
61- || (inFile.getline(lines[2], 80) == NULL))
62+ if ((inFile.getline(lines[1], 80).eof())
63+ || (inFile.getline(lines[2], 80).eof()))
64 {
65 ostringstream errStr;
66 errStr << "Malformed TLE file (" << tleFile << ")?\n";
67@@ -542,7 +542,7 @@ addSatellites(PlanetProperties *planetProperties, Planet *planet,
68 {
69 ifstream inFile(satFile.c_str());
70 char *line = new char[MAX_LINE_LENGTH];
71- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
72+ while (!inFile.getline (line, MAX_LINE_LENGTH, '\n').eof())
73 readSatelliteFile(line, planet, view, projection,
74 planetProperties, annotationMap);
75
76diff --git a/src/libannotate/addSpiceObjects.cpp b/src/libannotate/addSpiceObjects.cpp
77index 67b752c..eeadf6e 100644
78--- a/src/libannotate/addSpiceObjects.cpp
79+++ b/src/libannotate/addSpiceObjects.cpp
80@@ -524,7 +524,7 @@ processSpiceKernels(const bool load)
81 {
82 ifstream inFile(kernelFile.c_str());
83 char *line = new char[MAX_LINE_LENGTH];
84- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
85+ while (!inFile.getline(line, MAX_LINE_LENGTH, '\n').eof())
86 {
87 int ii = 0;
88 while (isDelimiter(line[ii]))
89@@ -576,7 +576,7 @@ addSpiceObjects(map<double, Planet *> &planetsFromSunMap,
90 {
91 ifstream inFile(spiceFile.c_str());
92 char *line = new char[MAX_LINE_LENGTH];
93- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
94+ while (!inFile.getline(line, MAX_LINE_LENGTH, '\n').eof())
95 readSpiceFile(line, planetsFromSunMap, view, projection,
96 annotationMap);
97 inFile.close();
98diff --git a/src/libmultiple/RayleighScattering.cpp b/src/libmultiple/RayleighScattering.cpp
99index d885173..1be8ece 100644
100--- a/src/libmultiple/RayleighScattering.cpp
101+++ b/src/libmultiple/RayleighScattering.cpp
102@@ -369,7 +369,7 @@ RayleighScattering::readConfigFile(string configFile)
103
104 diskTemplate_.clear();
105 limbTemplate_.clear();
106- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
107+ while (!inFile.getline(line, MAX_LINE_LENGTH, '\n').eof())
108 {
109 int i = 0;
110 while (isDelimiter(line[i]))
111@@ -439,7 +439,7 @@ RayleighScattering::readBlock(ifstream &inFile,
112 values.clear();
113
114 char line[MAX_LINE_LENGTH];
115- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
116+ while (!inFile.getline(line, MAX_LINE_LENGTH, '\n').eof())
117 {
118 int i = 0;
119 while (isDelimiter(line[i]))
120@@ -470,7 +470,7 @@ RayleighScattering::readValue(ifstream &inFile,
121 double &value)
122 {
123 char line[MAX_LINE_LENGTH];
124- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
125+ while (!inFile.getline(line, MAX_LINE_LENGTH, '\n').eof())
126 {
127 int i = 0;
128 while (isDelimiter(line[i]))
129diff --git a/src/libmultiple/drawStars.cpp b/src/libmultiple/drawStars.cpp
130index ff07c49..aabdfed 100644
131--- a/src/libmultiple/drawStars.cpp
132+++ b/src/libmultiple/drawStars.cpp
133@@ -41,7 +41,7 @@ drawStars(DisplayBase *display, View *view)
134 ifstream inFile(starMap.c_str());
135
136 char line[MAX_LINE_LENGTH];
137- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
138+ while (!inFile.getline(line, MAX_LINE_LENGTH, '\n').eof())
139 {
140 if (line[0] == '#') continue;
141
142diff --git a/src/readConfig.cpp b/src/readConfig.cpp
143index cc1964f..4650527 100644
144--- a/src/readConfig.cpp
145+++ b/src/readConfig.cpp
146@@ -550,7 +550,7 @@ readConfigFile(string configFile, PlanetProperties *planetProperties[])
147
148 ifstream inFile(configFile.c_str());
149 char *line = new char[256];
150- while (inFile.getline(line, 256, '\n') != NULL)
151+ while (!inFile.getline(line, 256, '\n').eof())
152 readConfig(line, planetProperties);
153
154 // This condition will only be true if [default] is the only
jackhill's copy of GNU Guix: https://guix.gnu.org/