0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make checksums work on AMD64

Browse source
This commit is contained in:
Jon Daniel 2005-08-12 10:32:12 +00:00
parent 9072d72276
commit a17d1ab9f6
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/checksum.cpp
View file

@ -18,7 +18,7 @@ checksumstreambuf::checksumstreambuf() : csuma(0), csumb(0)
setp((char*)buffer, (char*)buffer+BUFFERSIZE);
}
unsigned long checksumstreambuf::checksum()
unsigned int checksumstreambuf::checksum()
{
sum((unsigned char*)pbase(), (unsigned char*)pptr());
@ -51,8 +51,8 @@ void checksumstreambuf::sum(unsigned char* begin, unsigned char* end)
x = (unsigned short)(*p) + ((unsigned short)(*(p+1)) << 8);
}
sa = 0xffff & ((unsigned long)(sa) + (unsigned long)(sb));
sb = 0xffff & ((unsigned long)(x) + (unsigned long)(sb));
sa = 0xffff & ((unsigned int)(sa) + (unsigned int)(sb));
sb = 0xffff & ((unsigned int)(x) + (unsigned int)(sb));
}
}
@ -61,7 +61,7 @@ checksumstream::checksumstream() : std::basic_ostream<char>(this), sbuf(*this)
{
}
unsigned long checksumstream::checksum()
unsigned int checksumstream::checksum()
{
return sbuf.checksum();
}

4
src/checksum.hpp
View file

@ -21,7 +21,7 @@ class checksumstreambuf : public std::basic_streambuf<char>
{
public:
checksumstreambuf();
unsigned long checksum();
unsigned int checksum();
protected:
virtual int overflow(int c);
@ -43,7 +43,7 @@ class checksumstream : private checksumstreambuf, public std::basic_ostream<char
{
public:
checksumstream();
unsigned long checksum();
unsigned int checksum();
private:
checksumstreambuf& sbuf;
};