Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
2433fd2a1a

+ 1 - 1
panda/src/downloader/downloader.cxx

@@ -576,7 +576,7 @@ bool Downloader::
 parse_http_response(const string &resp) {
 parse_http_response(const string &resp) {
   size_t ws = resp.find(" ", 0);
   size_t ws = resp.find(" ", 0);
   string httpstr = resp.substr(0, ws);
   string httpstr = resp.substr(0, ws);
-  if (httpstr != "HTTP/1.1") {
+  if (!(httpstr == "HTTP/1.1")) {
     downloader_cat.error()
     downloader_cat.error()
       << "Downloader::parse_http_response() - not HTTP/1.1 - got: " 
       << "Downloader::parse_http_response() - not HTTP/1.1 - got: " 
       << httpstr << endl;
       << httpstr << endl;

+ 62 - 62
panda/src/downloader/hashVal.I

@@ -1,62 +1,62 @@
-// Filename: hashVal.I
-// Created by:  drose (14Nov00)
-//
-////////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: HashVal::Constructor
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE HashVal::
-HashVal(void) {
-  hv[0] = hv[1] = hv[2] = hv[3] = 0;
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: HashVal::operator ==
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE bool HashVal::
-operator == (const HashVal &other) const {
-  return (hv[0] == other.hv[0] && 
-	  hv[1] == other.hv[1] &&
-	  hv[2] == other.hv[2] &&
-	  hv[3] == other.hv[3]);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: HashVal::get_value
-//       Access: Public
-//  Description: Returns the integer value of the indicated component.
-////////////////////////////////////////////////////////////////////
-INLINE uint HashVal::
-get_value(int val) const {
-  nassertr(val >= 0 && val < 4, 0);
-  return hv[val];
-}
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: HashVal::set_value
-//       Access: Public
-//  Description: Sets the hash value at index val
-////////////////////////////////////////////////////////////////////
-INLINE void HashVal::
-set_value(int val, uint hash) {
-  nassertv(val >= 0 && val < 4);
-  hv[val] = hash;
-}
-
-
-////////////////////////////////////////////////////////////////////
-//     Function: HashVal::output
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE void HashVal::
-output(ostream &out) const {
-  out << "[" << hv[0] << " " << hv[1] << " " << hv[2] << " " << hv[3] << "]";
-}
+// Filename: hashVal.I
+// Created by:  drose (14Nov00)
+//
+////////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////////
+//     Function: HashVal::Constructor
+//       Access: Public
+//  Description: 
+////////////////////////////////////////////////////////////////////
+INLINE HashVal::
+HashVal(void) {
+  hv[0] = hv[1] = hv[2] = hv[3] = 0;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: HashVal::operator ==
+//       Access: Public
+//  Description: 
+////////////////////////////////////////////////////////////////////
+INLINE bool HashVal::
+operator == (const HashVal &other) const {
+  return (hv[0] == other.hv[0] && 
+	  hv[1] == other.hv[1] &&
+	  hv[2] == other.hv[2] &&
+	  hv[3] == other.hv[3]);
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: HashVal::get_value
+//       Access: Public
+//  Description: Returns the integer value of the indicated component.
+////////////////////////////////////////////////////////////////////
+INLINE uint HashVal::
+get_value(int val) const {
+  nassertr(val >= 0 && val < 4, 0);
+  return hv[val];
+}
+
+
+////////////////////////////////////////////////////////////////////
+//     Function: HashVal::set_value
+//       Access: Public
+//  Description: Sets the hash value at index val
+////////////////////////////////////////////////////////////////////
+INLINE void HashVal::
+set_value(int val, uint hash) {
+  nassertv(val >= 0 && val < 4);
+  hv[val] = hash;
+}
+
+
+////////////////////////////////////////////////////////////////////
+//     Function: HashVal::output
+//       Access: Public
+//  Description: 
+////////////////////////////////////////////////////////////////////
+INLINE void HashVal::
+output(ostream &out) const {
+  out << "[" << hv[0] << " " << hv[1] << " " << hv[2] << " " << hv[3] << "]";
+}

+ 7 - 7
panda/src/downloader/hashVal.cxx

@@ -1,7 +1,7 @@
-// Filename: hashVal.cxx
-// Created by:  drose (14Nov00)
-//
-////////////////////////////////////////////////////////////////////
-
-#include "hashVal.h"
-
+// Filename: hashVal.cxx
+// Created by:  drose (14Nov00)
+//
+////////////////////////////////////////////////////////////////////
+
+#include "hashVal.h"
+

+ 34 - 34
panda/src/downloader/hashVal.h

@@ -1,34 +1,34 @@
-// Filename: hashVal.h
-// Created by:  drose (14Nov00)
-//
-////////////////////////////////////////////////////////////////////
-
-#ifndef HASHVAL_H
-#define HASHVAL_H
-
-#include <pandabase.h>
-#include <typedef.h>
-#include <notify.h>
-
-////////////////////////////////////////////////////////////////////
-// 	 Class : HashVal
-// Description : A sixteen-byte hash value sent to the crypt library.
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDAEXPRESS HashVal {
-public:
-  INLINE HashVal();
-  INLINE bool operator == (const HashVal &other) const;
-  INLINE uint get_value(int val) const;
-  INLINE void set_value(int val, uint hash);
-  INLINE void output(ostream &out) const;
-  uint hv[4];
-};
-
-INLINE ostream &operator << (ostream &out, const HashVal &hv) {
-  hv.output(out);
-  return out;
-}
-
-#include "hashVal.I"
-
-#endif
+// Filename: hashVal.h
+// Created by:  drose (14Nov00)
+//
+////////////////////////////////////////////////////////////////////
+
+#ifndef HASHVAL_H
+#define HASHVAL_H
+
+#include <pandabase.h>
+#include <typedef.h>
+#include <notify.h>
+
+////////////////////////////////////////////////////////////////////
+// 	 Class : HashVal
+// Description : A sixteen-byte hash value sent to the crypt library.
+////////////////////////////////////////////////////////////////////
+class EXPCL_PANDAEXPRESS HashVal {
+public:
+  INLINE HashVal();
+  INLINE bool operator == (const HashVal &other) const;
+  INLINE uint get_value(int val) const;
+  INLINE void set_value(int val, uint hash);
+  INLINE void output(ostream &out) const;
+  uint hv[4];
+};
+
+INLINE ostream &operator << (ostream &out, const HashVal &hv) {
+  hv.output(out);
+  return out;
+}
+
+#include "hashVal.I"
+
+#endif