From 36318291bf999e3a0542c1183d01b7d42875029d Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Tue, 21 Feb 2012 20:10:30 +0800 Subject: [PATCH 1/2] fix icarus.c compile warning --- icarus.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/icarus.c b/icarus.c index 5562e5ea..d4b53066 100644 --- a/icarus.c +++ b/icarus.c @@ -108,7 +108,7 @@ static int icarus_open(const char *devpath) #endif } -static void icarus_gets(char *buf, size_t bufLen, int fd) +static void icarus_gets(unsigned char *buf, size_t bufLen, int fd) { ssize_t ret = 0; @@ -134,7 +134,7 @@ static void icarus_gets(char *buf, size_t bufLen, int fd) static void icarus_write(int fd, const void *buf, size_t bufLen) { - ssize_t ret; + size_t ret; ret = write(fd, buf, bufLen); if (unlikely(ret != bufLen)) @@ -147,14 +147,14 @@ static bool icarus_detect_one(const char *devpath) { int fd; - const unsigned char golden_ob[] = + const char golden_ob[] = "2db907f9cb4eb938ded904f4832c4331" "0380e3aeb54364057e7fec5157bfc533" "00000000000000000000000080000000" "00000000a58e091ac342724e7c3dc346"; - const unsigned char golden_nonce[] = "063c5e01"; + const char golden_nonce[] = "063c5e01"; - char ob_bin[64], nonce_bin[4]; + unsigned char ob_bin[64], nonce_bin[4]; char *nonce_hex; if (total_devices == MAX_DEVICES) @@ -235,13 +235,13 @@ static bool icarus_prepare(struct thr_info *thr) } static uint64_t icarus_scanhash(struct thr_info *thr, struct work *work, - uint64_t max_nonce) + __maybe_unused uint64_t max_nonce) { struct cgpu_info *icarus; int fd; unsigned char ob_bin[64], nonce_bin[4]; - unsigned char *ob_hex, *nonce_hex; + char *ob_hex, *nonce_hex; uint32_t nonce; uint32_t hash_count; time_t t; @@ -307,7 +307,6 @@ static uint64_t icarus_scanhash(struct thr_info *thr, struct work *work, static void icarus_shutdown(struct thr_info *thr) { struct cgpu_info *icarus; - int fd; if (thr->cgpu) { icarus = thr->cgpu; From 07b0ed4a63785c053bf362b0ba181132bb70b3c1 Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Tue, 21 Feb 2012 20:15:08 +0800 Subject: [PATCH 2/2] fix the bitforce.c code style follow 1TBS --- bitforce.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/bitforce.c b/bitforce.c index 377169fd..87ad88e7 100644 --- a/bitforce.c +++ b/bitforce.c @@ -47,8 +47,7 @@ static int BFopen(const char *devpath) return _open_osfhandle((LONG)hSerial, 0); #else int fdDev = open(devpath, O_RDWR | O_CLOEXEC | O_NOCTTY); - if (likely(fdDev != -1)) - { + if (likely(fdDev != -1)) { struct termios pattr; tcgetattr(fdDev, &pattr); @@ -93,21 +92,18 @@ static bool bitforce_detect_one(const char *devpath) return false; int fdDev = BFopen(devpath); - if (unlikely(fdDev == -1)) - { + if (unlikely(fdDev == -1)) { applog(LOG_DEBUG, "BitForce Detect: Failed to open %s", devpath); return false; } BFwrite(fdDev, "ZGX", 3); BFgets(pdevbuf, sizeof(pdevbuf), fdDev); - if (unlikely(!pdevbuf[0])) - { + if (unlikely(!pdevbuf[0])) { applog(LOG_ERR, "Error reading from BitForce (ZGX)"); return 0; } BFclose(fdDev); - if (unlikely(!strstr(pdevbuf, "SHA256"))) - { + if (unlikely(!strstr(pdevbuf, "SHA256"))) { applog(LOG_DEBUG, "BitForce Detect: Didn't recognise BitForce on %s", devpath); return false; } @@ -158,9 +154,7 @@ static void bitforce_detect() list_for_each_entry_safe(iter, tmp, &scan_devices, list) { if (!strcmp(iter->string, "auto")) autoscan = true; - else - if (bitforce_detect_one(iter->string)) - { + else if (bitforce_detect_one(iter->string)) { string_elist_del(iter); found = true; } @@ -187,8 +181,7 @@ static bool bitforce_thread_prepare(struct thr_info *thr) struct timeval now; int fdDev = BFopen(bitforce->device_path); - if (unlikely(-1 == fdDev)) - { + if (unlikely(-1 == fdDev)) { applog(LOG_ERR, "Failed to open BitForce on %s", bitforce->device_path); return false; } @@ -219,8 +212,7 @@ static uint64_t bitforce_scanhash(struct thr_info *thr, struct work *work, uint6 applog(LOG_ERR, "Error reading from BitForce (ZDX)"); return 0; } - if (unlikely(pdevbuf[0] != 'O' || pdevbuf[1] != 'K')) - { + if (unlikely(pdevbuf[0] != 'O' || pdevbuf[1] != 'K')) { applog(LOG_ERR, "BitForce ZDX reports: %s", pdevbuf); return 0; } @@ -231,13 +223,11 @@ static uint64_t bitforce_scanhash(struct thr_info *thr, struct work *work, uint6 applog(LOG_DEBUG, "BitForce block data: %s", bin2hex(ob + 8, 44)); BFgets(pdevbuf, sizeof(pdevbuf), fdDev); - if (unlikely(!pdevbuf[0])) - { + if (unlikely(!pdevbuf[0])) { applog(LOG_ERR, "Error reading from BitForce (block data)"); return 0; } - if (unlikely(pdevbuf[0] != 'O' || pdevbuf[1] != 'K')) - { + if (unlikely(pdevbuf[0] != 'O' || pdevbuf[1] != 'K')) { applog(LOG_ERR, "BitForce block data reports: %s", pdevbuf); return 0; } @@ -264,8 +254,7 @@ static uint64_t bitforce_scanhash(struct thr_info *thr, struct work *work, uint6 while (1) { BFwrite(fdDev, "ZFX", 3); BFgets(pdevbuf, sizeof(pdevbuf), fdDev); - if (unlikely(!pdevbuf[0])) - { + if (unlikely(!pdevbuf[0])) { applog(LOG_ERR, "Error reading from BitForce (ZFX)"); return 0; } @@ -278,8 +267,7 @@ static uint64_t bitforce_scanhash(struct thr_info *thr, struct work *work, uint6 work->blk.nonce = 0xffffffff; if (pdevbuf[2] == '-') return 0xffffffff; - else - if (strncasecmp(pdevbuf, "NONCE-FOUND", 11)) { + else if (strncasecmp(pdevbuf, "NONCE-FOUND", 11)) { applog(LOG_ERR, "BitForce result reports: %s", pdevbuf); return 0; }