Merge branch 'master' of git@gitorious.org:freerainbowtables-applications/freerainbow...

[freerainbowtables] / Common / rt api / RTI2Reader.h

diff --git a/Common/rt api/RTI2Reader.h b/Common/rt api/RTI2Reader.h
index 0b1f127471e2c7886f6c5742f1bc6844da1a12ea..db3d446a126ad8fd7ed222ed5e91ae781eadccbd 100644 (file)
--- a/Common/rt api/RTI2Reader.h
+++ b/Common/rt api/RTI2Reader.h
@@ -1,13 +1,39 @@
+/*
+ * freerainbowtables is a project for generating, distributing, and using
+ * perfect rainbow tables
+ *
+ * Copyright 2010 Martin Westergaard Jørgensen <martinwj2005@gmail.com>
+ * Copyright 2010 James Nobis <frt@quelrod.net>
+ *
+ * This file is part of freerainbowtables.
+ *
+ * freerainbowtables is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * freerainbowtables is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with freerainbowtables.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef __RTI2READER_H__
 #define __RTI2READER_H__
 
 #include "Public.h"
 #include <string>
-#ifdef WIN32
-#include <io.h>
+
+#if defined(_WIN32) && !defined(__GNUC__)
+       #include <io.h>
 #endif
+
 #include <vector>
 #include "BaseRTReader.h"
+
 using namespace std;
 
 typedef struct 
@@ -22,18 +48,18 @@ class RTI2Reader : BaseRTReader
 {
 private:
        FILE *m_pFile;
-       unsigned int m_chainPosition;
+       uint32 m_chainPosition;
        unsigned char *m_pPos, *m_pChainPos;
        static RTI2Header *m_pHeader;
        unsigned char *m_pIndex;
-       unsigned int m_chainsizebytes;
-       unsigned int m_indexrowsizebytes;
+       uint32 m_chainsizebytes;
+       uint32 m_indexrowsizebytes;
        
 
 public:
        RTI2Reader(string Filename);
        ~RTI2Reader(void);
-       int ReadChains(UINT4 &numChains, RainbowChain *pData);
+       int ReadChains(uint32 &numChains, RainbowChain *pData);
        unsigned int GetChainsLeft();
        static RTI2Header *GetHeader() { return m_pHeader; }
 };