Merge branch '0.2.x'

Author: luke-jr

src/datum_api.c

@@ -444,8 +444,6 @@ bool datum_api_check_admin_password_httponly(struct MHD_Connection * const conne
 }
 
 bool datum_api_check_admin_password(struct MHD_Connection * const connection, const json_t * const j) {
-	int ret;
-	
 	const json_t * const j_password = json_object_get(j, "password");
 	if (json_is_string(j_password)) {
 		return datum_api_check_admin_password_only(connection, json_string_value(j_password));
@@ -604,7 +602,7 @@ int datum_api_cmd(struct MHD_Connection *connection, char *post, int len) {
 
 			param = json_object_get(root, "empty_thread");
 			if (param) {
-				const int tid = datum_atoi_strict(json_string_value(param), json_string_length(param));
+				tid = datum_atoi_strict(json_string_value(param), json_string_length(param));
 				if (tid != -1) {
 					datum_api_cmd_empty_thread(tid);
 					redirect = "/threads";

src/datum_blocktemplates.c

@@ -435,7 +435,7 @@ void *datum_gateway_template_thread(void *args) {
 
 				if (t) {
 					datum_blocktemplates_error = NULL;
-					DLOG_DEBUG("height: %d / value: %"PRIu64,t->height, t->coinbasevalue);
+					DLOG_DEBUG("height: %lu / value: %"PRIu64, (unsigned long)t->height, t->coinbasevalue);
 					DLOG_DEBUG("--- prevhash: %s", t->previousblockhash);
 					DLOG_DEBUG("--- txn_count: %u / sigops: %u / weight: %u / size: %u", t->txn_count, t->txn_total_sigops, t->txn_total_weight, t->txn_total_size);
 
@@ -445,7 +445,7 @@ void *datum_gateway_template_thread(void *args) {
 						update_stratum_job(t,true,JOB_STATE_EMPTY_PLUS);
 						strcpy(p1, t->previousblockhash);
 						was_notified = false;
-						DLOG_INFO("NEW NETWORK BLOCK: %s (%d)",t->previousblockhash,t->height);
+						DLOG_INFO("NEW NETWORK BLOCK: %s (%lu)", t->previousblockhash, (unsigned long)t->height);
 
 						// sleep for a milisecond
 						// this will let other threads churn for a moment.  we wont get all the empty jobs blasted out in a milisecond anyway
@@ -484,7 +484,7 @@ void *datum_gateway_template_thread(void *args) {
 							if (!was_notified) {
 								DLOG_DEBUG("Multi notified for block we knew details about. (%s)", new_notify_blockhash);
 							} else {
-								DLOG_DEBUG("Notified, however new = %s, t->previousblockhash = %s, t->height = %d, new_notify_height = %d", new_notify_blockhash, t->previousblockhash, t->height, new_notify_height);
+								DLOG_DEBUG("Notified, however new = %s, t->previousblockhash = %s, t->height = %lu, new_notify_height = %d", new_notify_blockhash, t->previousblockhash, (unsigned long)t->height, new_notify_height);
 
 								// Sometimes we call GBT before we get the signal from a blocknotify.  It's a bit of a race condition.
 								// Instead of freaking out, we'll just ignore things when we get a signal that results in the same block if it was

src/datum_gateway.h

@@ -53,6 +53,6 @@
 
 #define MAX_COINBASE_TXN_SIZE_BYTES (((STRATUM_COINBASE1_MAX_LEN+STRATUM_COINBASE2_MAX_LEN)>>1)+64)
 
-#define STRATUM_JOB_INDEX_XOR 0xC0DE
+#define STRATUM_JOB_INDEX_XOR ((uint16_t)0xC0DE)
 
 #endif

src/datum_stratum.c

@@ -121,7 +121,7 @@ void datum_stratum_v1_shutdown_all(void) {
 		pthread_mutex_unlock(&global_stratum_app->datum_threads[tid].thread_data_lock);
 	}
 
-	DLOG_INFO("Sent disconnect request for all stratum clients to %d threads.", shutdown_threads);
+	DLOG_INFO("Sent disconnect request for all stratum clients to %u threads.", shutdown_threads);
 	return;
 }
 
@@ -1431,7 +1431,7 @@ int send_mining_notify(T_DATUM_CLIENT_DATA *c, bool clean, bool quickdiff, bool
 	T_DATUM_MINER_DATA * const m = c->app_client_data;
 	T_DATUM_STRATUM_COINBASE *cb;
 	char cb1[STRATUM_COINBASE1_MAX_LEN+2];
-	int cbselect = 0;
+	unsigned int cbselect = 0;
 	bool full_coinbase = false;
 	char s[512];
 	unsigned char tdiff = 0xFF;