| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173 |
- --- htlib/HtRegexReplace.cc.orig 2001-02-23 01:31:32.000000000 +0100
- +++ htlib/HtRegexReplace.cc 2002-12-13 14:33:07.000000000 +0100
- @@ -20,7 +20,7 @@
- {
- }
-
- -HtRegexReplace::HtRegexReplace(const char *from, const char *to, int case_sensitive = 0)
- +HtRegexReplace::HtRegexReplace(const char *from, const char *to, int case_sensitive)
- : HtRegex(from, case_sensitive)
- {
- memset(®s, 0, sizeof(regs));
- --- htlib/HtRegexReplaceList.cc.orig 2001-02-23 01:31:32.000000000 +0100
- +++ htlib/HtRegexReplaceList.cc 2002-12-13 14:36:42.000000000 +0100
- @@ -18,7 +18,7 @@
- #include "HtRegexReplaceList.h"
- #include <stream.h>
-
- -HtRegexReplaceList::HtRegexReplaceList(StringList &list, int case_sensitive = 0)
- +HtRegexReplaceList::HtRegexReplaceList(StringList &list, int case_sensitive)
- {
- if (list.Count() & 1)
- {
- @@ -49,7 +49,7 @@
- // replacers gets chucked away
- }
-
- -int HtRegexReplaceList::replace(String &str, int nullpattern = 0, int nullstr = 0)
- +int HtRegexReplaceList::replace(String &str, int nullpattern, int nullstr)
- {
- int repCount = replacers.Count();
- int doneCount = 0;
- --- htcommon/DocumentDB.cc.orig 2001-02-23 01:31:29.000000000 +0100
- +++ htcommon/DocumentDB.cc 2002-12-13 14:37:01.000000000 +0100
- @@ -120,7 +120,7 @@
- // We will attempt to open up an existing document database,
- // and accompanying index database and excerpt database
- //
- -int DocumentDB::Read(const String& filename, const String& indexfilename = 0, const String& headfilename = 0)
- +int DocumentDB::Read(const String& filename, const String& indexfilename, const String& headfilename)
- {
- // If the database is already open, we'll close it
- // We might be opening this object with a new filename, so we'll be safe
- --- htcommon/HtConfiguration.cc.orig 2001-02-23 01:31:29.000000000 +0100
- +++ htcommon/HtConfiguration.cc 2002-12-16 09:29:32.000000000 +0100
- @@ -150,7 +150,7 @@
-
- //*********************************************************************
- int HtConfiguration::Value(const char *blockName, const char *name,
- - const char *value, int default_value = 0) {
- + const char *value, int default_value) {
- int retValue=default_value;
- String tmpStr=Find(blockName,name,value);
- if (tmpStr[0]!=0) {
- @@ -161,7 +161,7 @@
-
- //*********************************************************************
- double HtConfiguration::Double(const char *blockName, const char *name,
- - const char *value, double default_value = 0) {
- + const char *value, double default_value) {
- double retValue=default_value;
- String tmpStr=Find(blockName,name,value);
- if (tmpStr[0]!=0) {
- @@ -172,7 +172,7 @@
-
- //*********************************************************************
- int HtConfiguration::Boolean(const char *blockName, const char *name,
- - const char *value, int default_value = 0) {
- + const char *value, int default_value) {
- int retValue=default_value;
- String tmpStr=Find(blockName,name,value);
- if (tmpStr[0]!=0) {
- @@ -192,7 +192,7 @@
- //*********************************************************************
- //*********************************************************************
- int HtConfiguration::Value(URL *aUrl, const char *value,
- - int default_value = 0) {
- + int default_value) {
- int retValue=default_value;
- String tmpStr=Find(aUrl,value);
- if (tmpStr[0]!=0) {
- @@ -203,7 +203,7 @@
-
- //*********************************************************************
- double HtConfiguration::Double(URL *aUrl,const char *value,
- - double default_value = 0) {
- + double default_value) {
- double retValue=default_value;
- String tmpStr=Find(aUrl,value);
- if (tmpStr[0]!=0) {
- @@ -214,7 +214,7 @@
-
- //*********************************************************************
- int HtConfiguration::Boolean(URL *aUrl,const char *value,
- - int default_value = 0) {
- + int default_value) {
- int retValue=default_value;
- String tmpStr=Find(aUrl,value);
- if (tmpStr[0]!=0) {
- @@ -249,7 +249,6 @@
-
- //********************************************************************
- //
- -inline
- String HtConfiguration::ParseString(const char *str) const {
- return ParsedString(str).get(dcGlobalVars);
- }
- --- htcommon/HtConfiguration.h.orig 2001-02-23 01:31:29.000000000 +0100
- +++ htcommon/HtConfiguration.h 2002-12-16 09:52:42.000000000 +0100
- @@ -50,7 +50,6 @@
- int Value(URL *aUrl,const char *value,int default_value = 0);
- double Double(URL *aUrl,const char *value,double default_value = 0);
- int Boolean(URL *aUrl,const char *value,int default_value = 0);
- - inline
- String ParseString(const char*) const; // parse ${var} string
- String getFileName() const { return FileName; }
-
- --- htlib/HtDateTime.h.orig 2001-02-23 01:31:32.000000000 +0100
- +++ htlib/HtDateTime.h 2002-12-16 10:00:25.000000000 +0100
- @@ -182,8 +182,8 @@
- void SetDateTime(const time_t *t) { Ht_t = *t; } // by pointer
-
- // Set object time_t value from a struct tm
- - inline void SetDateTime(struct tm *); // by pointer
- - inline void SetDateTime(struct tm &t) { SetDateTime(&t);} // by reference
- + void SetDateTime(struct tm *); // by pointer
- + void SetDateTime(struct tm &t) { SetDateTime(&t);} // by reference
-
- // Set GM Time from single values input
- // Return true if it all went good, false else
- @@ -311,8 +311,8 @@
-
- // For comparisons - between objects of the same class
-
- - inline bool operator==(const HtDateTime &right) const;
- - inline bool operator<(const HtDateTime &right) const;
- + bool operator==(const HtDateTime &right) const;
- + bool operator<(const HtDateTime &right) const;
-
- bool operator!=(const HtDateTime &right) const
- {return !( *this == right );}
- @@ -350,8 +350,8 @@
-
- // For Copy
-
- - inline HtDateTime &operator=(const HtDateTime &right);
- - inline HtDateTime &operator=(const int right);
- + HtDateTime &operator=(const HtDateTime &right);
- + HtDateTime &operator=(const int right);
-
-
-
- --- htdig/ExternalTransport.h.orig 2001-02-23 01:31:30.000000000 +0100
- +++ htdig/ExternalTransport.h 2002-12-16 10:11:01.000000000 +0100
- @@ -26,7 +26,7 @@
- class ExternalTransport;
- class ExternalTransport_Response : public Transport_Response
- {
- - friend ExternalTransport;
- + friend class ExternalTransport;
-
- // Nothing else... We just want it so we can access the protected fields
- };
- --- htsearch/Display.cc.orig 2001-02-23 01:31:34.000000000 +0100
- +++ htsearch/Display.cc 2002-12-16 10:37:22.000000000 +0100
- @@ -36,6 +36,7 @@
- #include <syslog.h>
- #include <locale.h>
- #include <math.h>
- +#include <values.h>
-
- #if !defined(DBL_MAX) && defined(MAXFLOAT)
- # define DBL_MAX MAXFLOAT
|