xplanet-cxx11-eof.patch 6.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151
  1. diff --git a/src/libannotate/addArcs.cpp b/src/libannotate/addArcs.cpp
  2. index 2ee06c0..4fdb343 100644
  3. --- a/src/libannotate/addArcs.cpp
  4. +++ b/src/libannotate/addArcs.cpp
  5. @@ -258,7 +258,7 @@ addArcs(PlanetProperties *planetProperties, Planet *planet,
  6. {
  7. ifstream inFile(arcFile.c_str());
  8. char *line = new char[MAX_LINE_LENGTH];
  9. - while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
  10. + while (!inFile.getline (line, MAX_LINE_LENGTH, '\n').eof())
  11. readArcFile(line, planet, view, projection,
  12. planetProperties, annotationMap);
  13. @@ -292,7 +292,7 @@ addArcs(View *view, multimap<double, Annotation *> &annotationMap)
  14. {
  15. ifstream inFile(arcFile.c_str());
  16. char *line = new char[256];
  17. - while (inFile.getline (line, 256, '\n') != NULL)
  18. + while (!inFile.getline (line, 256, '\n').eof())
  19. readArcFile(line, NULL, view, NULL, NULL, annotationMap);
  20. inFile.close();
  21. diff --git a/src/libannotate/addMarkers.cpp b/src/libannotate/addMarkers.cpp
  22. index dde51c1..b641e6a 100644
  23. --- a/src/libannotate/addMarkers.cpp
  24. +++ b/src/libannotate/addMarkers.cpp
  25. @@ -429,7 +429,7 @@ addMarkers(PlanetProperties *planetProperties, Planet *planet,
  26. {
  27. ifstream inFile(markerFile.c_str());
  28. char *line = new char[MAX_LINE_LENGTH];
  29. - while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
  30. + while (!inFile.getline (line, MAX_LINE_LENGTH, '\n').eof())
  31. {
  32. unsigned char color[3];
  33. memcpy(color, planetProperties->MarkerColor(), 3);
  34. @@ -475,7 +475,7 @@ addMarkers(View *view, const int width, const int height,
  35. {
  36. ifstream inFile(markerFile.c_str());
  37. char *line = new char[MAX_LINE_LENGTH];
  38. - while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
  39. + while (!inFile.getline (line, MAX_LINE_LENGTH, '\n').eof())
  40. {
  41. unsigned char color[3];
  42. memcpy(color, options->Color(), 3);
  43. diff --git a/src/libannotate/addSatellites.cpp b/src/libannotate/addSatellites.cpp
  44. index 2634339..6d9d378 100644
  45. --- a/src/libannotate/addSatellites.cpp
  46. +++ b/src/libannotate/addSatellites.cpp
  47. @@ -488,10 +488,10 @@ loadSatelliteVector(PlanetProperties *planetProperties)
  48. {
  49. ifstream inFile(tleFile.c_str());
  50. char lines[3][80];
  51. - while (inFile.getline(lines[0], 80) != NULL)
  52. + while (!inFile.getline(lines[0], 80).eof())
  53. {
  54. - if ((inFile.getline(lines[1], 80) == NULL)
  55. - || (inFile.getline(lines[2], 80) == NULL))
  56. + if ((inFile.getline(lines[1], 80).eof())
  57. + || (inFile.getline(lines[2], 80).eof()))
  58. {
  59. ostringstream errStr;
  60. errStr << "Malformed TLE file (" << tleFile << ")?\n";
  61. @@ -542,7 +542,7 @@ addSatellites(PlanetProperties *planetProperties, Planet *planet,
  62. {
  63. ifstream inFile(satFile.c_str());
  64. char *line = new char[MAX_LINE_LENGTH];
  65. - while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
  66. + while (!inFile.getline (line, MAX_LINE_LENGTH, '\n').eof())
  67. readSatelliteFile(line, planet, view, projection,
  68. planetProperties, annotationMap);
  69. diff --git a/src/libannotate/addSpiceObjects.cpp b/src/libannotate/addSpiceObjects.cpp
  70. index 67b752c..eeadf6e 100644
  71. --- a/src/libannotate/addSpiceObjects.cpp
  72. +++ b/src/libannotate/addSpiceObjects.cpp
  73. @@ -524,7 +524,7 @@ processSpiceKernels(const bool load)
  74. {
  75. ifstream inFile(kernelFile.c_str());
  76. char *line = new char[MAX_LINE_LENGTH];
  77. - while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
  78. + while (!inFile.getline(line, MAX_LINE_LENGTH, '\n').eof())
  79. {
  80. int ii = 0;
  81. while (isDelimiter(line[ii]))
  82. @@ -576,7 +576,7 @@ addSpiceObjects(map<double, Planet *> &planetsFromSunMap,
  83. {
  84. ifstream inFile(spiceFile.c_str());
  85. char *line = new char[MAX_LINE_LENGTH];
  86. - while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
  87. + while (!inFile.getline(line, MAX_LINE_LENGTH, '\n').eof())
  88. readSpiceFile(line, planetsFromSunMap, view, projection,
  89. annotationMap);
  90. inFile.close();
  91. diff --git a/src/libmultiple/RayleighScattering.cpp b/src/libmultiple/RayleighScattering.cpp
  92. index d885173..1be8ece 100644
  93. --- a/src/libmultiple/RayleighScattering.cpp
  94. +++ b/src/libmultiple/RayleighScattering.cpp
  95. @@ -369,7 +369,7 @@ RayleighScattering::readConfigFile(string configFile)
  96. diskTemplate_.clear();
  97. limbTemplate_.clear();
  98. - while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
  99. + while (!inFile.getline(line, MAX_LINE_LENGTH, '\n').eof())
  100. {
  101. int i = 0;
  102. while (isDelimiter(line[i]))
  103. @@ -439,7 +439,7 @@ RayleighScattering::readBlock(ifstream &inFile,
  104. values.clear();
  105. char line[MAX_LINE_LENGTH];
  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. @@ -470,7 +470,7 @@ RayleighScattering::readValue(ifstream &inFile,
  112. double &value)
  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. diff --git a/src/libmultiple/drawStars.cpp b/src/libmultiple/drawStars.cpp
  121. index ff07c49..aabdfed 100644
  122. --- a/src/libmultiple/drawStars.cpp
  123. +++ b/src/libmultiple/drawStars.cpp
  124. @@ -41,7 +41,7 @@ drawStars(DisplayBase *display, View *view)
  125. ifstream inFile(starMap.c_str());
  126. char line[MAX_LINE_LENGTH];
  127. - while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
  128. + while (!inFile.getline(line, MAX_LINE_LENGTH, '\n').eof())
  129. {
  130. if (line[0] == '#') continue;
  131. diff --git a/src/readConfig.cpp b/src/readConfig.cpp
  132. index cc1964f..4650527 100644
  133. --- a/src/readConfig.cpp
  134. +++ b/src/readConfig.cpp
  135. @@ -550,7 +550,7 @@ readConfigFile(string configFile, PlanetProperties *planetProperties[])
  136. ifstream inFile(configFile.c_str());
  137. char *line = new char[256];
  138. - while (inFile.getline(line, 256, '\n') != NULL)
  139. + while (!inFile.getline(line, 256, '\n').eof())
  140. readConfig(line, planetProperties);
  141. // This condition will only be true if [default] is the only