htdig.patch 6.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173
  1. --- htlib/HtRegexReplace.cc.orig 2001-02-23 01:31:32.000000000 +0100
  2. +++ htlib/HtRegexReplace.cc 2002-12-13 14:33:07.000000000 +0100
  3. @@ -20,7 +20,7 @@
  4. {
  5. }
  6. -HtRegexReplace::HtRegexReplace(const char *from, const char *to, int case_sensitive = 0)
  7. +HtRegexReplace::HtRegexReplace(const char *from, const char *to, int case_sensitive)
  8. : HtRegex(from, case_sensitive)
  9. {
  10. memset(&regs, 0, sizeof(regs));
  11. --- htlib/HtRegexReplaceList.cc.orig 2001-02-23 01:31:32.000000000 +0100
  12. +++ htlib/HtRegexReplaceList.cc 2002-12-13 14:36:42.000000000 +0100
  13. @@ -18,7 +18,7 @@
  14. #include "HtRegexReplaceList.h"
  15. #include <stream.h>
  16. -HtRegexReplaceList::HtRegexReplaceList(StringList &list, int case_sensitive = 0)
  17. +HtRegexReplaceList::HtRegexReplaceList(StringList &list, int case_sensitive)
  18. {
  19. if (list.Count() & 1)
  20. {
  21. @@ -49,7 +49,7 @@
  22. // replacers gets chucked away
  23. }
  24. -int HtRegexReplaceList::replace(String &str, int nullpattern = 0, int nullstr = 0)
  25. +int HtRegexReplaceList::replace(String &str, int nullpattern, int nullstr)
  26. {
  27. int repCount = replacers.Count();
  28. int doneCount = 0;
  29. --- htcommon/DocumentDB.cc.orig 2001-02-23 01:31:29.000000000 +0100
  30. +++ htcommon/DocumentDB.cc 2002-12-13 14:37:01.000000000 +0100
  31. @@ -120,7 +120,7 @@
  32. // We will attempt to open up an existing document database,
  33. // and accompanying index database and excerpt database
  34. //
  35. -int DocumentDB::Read(const String& filename, const String& indexfilename = 0, const String& headfilename = 0)
  36. +int DocumentDB::Read(const String& filename, const String& indexfilename, const String& headfilename)
  37. {
  38. // If the database is already open, we'll close it
  39. // We might be opening this object with a new filename, so we'll be safe
  40. --- htcommon/HtConfiguration.cc.orig 2001-02-23 01:31:29.000000000 +0100
  41. +++ htcommon/HtConfiguration.cc 2002-12-16 09:29:32.000000000 +0100
  42. @@ -150,7 +150,7 @@
  43. //*********************************************************************
  44. int HtConfiguration::Value(const char *blockName, const char *name,
  45. - const char *value, int default_value = 0) {
  46. + const char *value, int default_value) {
  47. int retValue=default_value;
  48. String tmpStr=Find(blockName,name,value);
  49. if (tmpStr[0]!=0) {
  50. @@ -161,7 +161,7 @@
  51. //*********************************************************************
  52. double HtConfiguration::Double(const char *blockName, const char *name,
  53. - const char *value, double default_value = 0) {
  54. + const char *value, double default_value) {
  55. double retValue=default_value;
  56. String tmpStr=Find(blockName,name,value);
  57. if (tmpStr[0]!=0) {
  58. @@ -172,7 +172,7 @@
  59. //*********************************************************************
  60. int HtConfiguration::Boolean(const char *blockName, const char *name,
  61. - const char *value, int default_value = 0) {
  62. + const char *value, int default_value) {
  63. int retValue=default_value;
  64. String tmpStr=Find(blockName,name,value);
  65. if (tmpStr[0]!=0) {
  66. @@ -192,7 +192,7 @@
  67. //*********************************************************************
  68. //*********************************************************************
  69. int HtConfiguration::Value(URL *aUrl, const char *value,
  70. - int default_value = 0) {
  71. + int default_value) {
  72. int retValue=default_value;
  73. String tmpStr=Find(aUrl,value);
  74. if (tmpStr[0]!=0) {
  75. @@ -203,7 +203,7 @@
  76. //*********************************************************************
  77. double HtConfiguration::Double(URL *aUrl,const char *value,
  78. - double default_value = 0) {
  79. + double default_value) {
  80. double retValue=default_value;
  81. String tmpStr=Find(aUrl,value);
  82. if (tmpStr[0]!=0) {
  83. @@ -214,7 +214,7 @@
  84. //*********************************************************************
  85. int HtConfiguration::Boolean(URL *aUrl,const char *value,
  86. - int default_value = 0) {
  87. + int default_value) {
  88. int retValue=default_value;
  89. String tmpStr=Find(aUrl,value);
  90. if (tmpStr[0]!=0) {
  91. @@ -249,7 +249,6 @@
  92. //********************************************************************
  93. //
  94. -inline
  95. String HtConfiguration::ParseString(const char *str) const {
  96. return ParsedString(str).get(dcGlobalVars);
  97. }
  98. --- htcommon/HtConfiguration.h.orig 2001-02-23 01:31:29.000000000 +0100
  99. +++ htcommon/HtConfiguration.h 2002-12-16 09:52:42.000000000 +0100
  100. @@ -50,7 +50,6 @@
  101. int Value(URL *aUrl,const char *value,int default_value = 0);
  102. double Double(URL *aUrl,const char *value,double default_value = 0);
  103. int Boolean(URL *aUrl,const char *value,int default_value = 0);
  104. - inline
  105. String ParseString(const char*) const; // parse ${var} string
  106. String getFileName() const { return FileName; }
  107. --- htlib/HtDateTime.h.orig 2001-02-23 01:31:32.000000000 +0100
  108. +++ htlib/HtDateTime.h 2002-12-16 10:00:25.000000000 +0100
  109. @@ -182,8 +182,8 @@
  110. void SetDateTime(const time_t *t) { Ht_t = *t; } // by pointer
  111. // Set object time_t value from a struct tm
  112. - inline void SetDateTime(struct tm *); // by pointer
  113. - inline void SetDateTime(struct tm &t) { SetDateTime(&t);} // by reference
  114. + void SetDateTime(struct tm *); // by pointer
  115. + void SetDateTime(struct tm &t) { SetDateTime(&t);} // by reference
  116. // Set GM Time from single values input
  117. // Return true if it all went good, false else
  118. @@ -311,8 +311,8 @@
  119. // For comparisons - between objects of the same class
  120. - inline bool operator==(const HtDateTime &right) const;
  121. - inline bool operator<(const HtDateTime &right) const;
  122. + bool operator==(const HtDateTime &right) const;
  123. + bool operator<(const HtDateTime &right) const;
  124. bool operator!=(const HtDateTime &right) const
  125. {return !( *this == right );}
  126. @@ -350,8 +350,8 @@
  127. // For Copy
  128. - inline HtDateTime &operator=(const HtDateTime &right);
  129. - inline HtDateTime &operator=(const int right);
  130. + HtDateTime &operator=(const HtDateTime &right);
  131. + HtDateTime &operator=(const int right);
  132. --- htdig/ExternalTransport.h.orig 2001-02-23 01:31:30.000000000 +0100
  133. +++ htdig/ExternalTransport.h 2002-12-16 10:11:01.000000000 +0100
  134. @@ -26,7 +26,7 @@
  135. class ExternalTransport;
  136. class ExternalTransport_Response : public Transport_Response
  137. {
  138. - friend ExternalTransport;
  139. + friend class ExternalTransport;
  140. // Nothing else... We just want it so we can access the protected fields
  141. };
  142. --- htsearch/Display.cc.orig 2001-02-23 01:31:34.000000000 +0100
  143. +++ htsearch/Display.cc 2002-12-16 10:37:22.000000000 +0100
  144. @@ -36,6 +36,7 @@
  145. #include <syslog.h>
  146. #include <locale.h>
  147. #include <math.h>
  148. +#include <values.h>
  149. #if !defined(DBL_MAX) && defined(MAXFLOAT)
  150. # define DBL_MAX MAXFLOAT