Commit a6250fbb96d69cded41521735d1e49da3fb7d9a5

Con Kolivas 2013-04-18T12:26:32

Rename scrypt regenhash function for consistency.

diff --git a/cgminer.c b/cgminer.c
index 507e7ff..664ca99 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -3249,7 +3249,7 @@ static void regen_hash(struct work *work)
 static void rebuild_hash(struct work *work)
 {
 	if (opt_scrypt)
-		scrypt_outputhash(work);
+		scrypt_regenhash(work);
 	else
 		regen_hash(work);
 
diff --git a/scrypt.c b/scrypt.c
index 128be6e..e0af4f0 100644
--- a/scrypt.c
+++ b/scrypt.c
@@ -405,7 +405,7 @@ static void scrypt_1024_1_1_256_sp(const uint32_t* input, char* scratchpad, uint
 /* 131583 rounded up to 4 byte alignment */
 #define SCRATCHBUF_SIZE	(131584)
 
-void scrypt_outputhash(struct work *work)
+void scrypt_regenhash(struct work *work)
 {
 	uint32_t data[20];
 	char *scratchbuf;
diff --git a/scrypt.h b/scrypt.h
index 775b50f..c7b8538 100644
--- a/scrypt.h
+++ b/scrypt.h
@@ -6,7 +6,7 @@
 #ifdef USE_SCRYPT
 extern bool scrypt_test(unsigned char *pdata, const unsigned char *ptarget,
 			uint32_t nonce);
-extern void scrypt_outputhash(struct work *work);
+extern void scrypt_regenhash(struct work *work);
 
 #else /* USE_SCRYPT */
 static inline bool scrypt_test(__maybe_unused unsigned char *pdata,
@@ -16,7 +16,7 @@ static inline bool scrypt_test(__maybe_unused unsigned char *pdata,
 	return false;
 }
 
-static inline void scrypt_outputhash(__maybe_unused struct work *work)
+static inline void scrypt_regenhash(__maybe_unused struct work *work)
 {
 }
 #endif /* USE_SCRYPT */