In visual studio, CRT crashes when strftime() is given an invalid format specifier...

[user/henk/code/inspircd.git] / src / modules / m_hash.h

diff --git a/src/modules/m_hash.h b/src/modules/m_hash.h
index 47176f26fdcb6ac04dea9c6ce4ad03e76ff8c28e..5686169dd2c514dd26bdf3373d3b612bd8ec01cf 100644 (file)
--- a/src/modules/m_hash.h
+++ b/src/modules/m_hash.h
@@ -54,9 +54,9 @@ class HashRequest : public Request
        }
 
        /** Get data to be hashed */
-       const char* GetHashData()
+       std::string& GetHashData()
        {
-               return tohash.c_str();
+               return tohash;
        }
 
        /** Get keys (IVs) to be used */
@@ -135,7 +135,7 @@ class HashSumRequest : public HashRequest
         * @param Target A pointer to the hashing module
         * @param data The data to be hashed
         */
-       HashSumRequest(Module* Me, Module* Target, const std::string &data) : HashRequest(Me, Target, data)
+       HashSumRequest(Module* Me, Module* Target, const std::string &sdata) : HashRequest(Me, Target, sdata)
        {
        }
 };
@@ -161,7 +161,7 @@ class HashKeyRequest : public HashRequest
         * @param data The new IV's. This should be an array of exactly four 32 bit values.
         * On 64-bit architectures, the upper 32 bits of the values will be discarded.
         */
-       HashKeyRequest(Module* Me, Module* Target, unsigned int* data) : HashRequest(Me, Target, data)
+       HashKeyRequest(Module* Me, Module* Target, unsigned int* sdata) : HashRequest(Me, Target, sdata)
        {
        }
 };
@@ -187,7 +187,7 @@ class HashHexRequest : public HashRequest
         * @param data The hex sequence to use. This should contain exactly 16 ASCII characters,
         * terminated by a NULL char.
         */
-       HashHexRequest(Module* Me, Module* Target, const char* data) : HashRequest(Me, Target, data)
+       HashHexRequest(Module* Me, Module* Target, const char* sdata) : HashRequest(Me, Target, sdata)
        {
        }
 };