Browse Source

Round some more static string arrays to 4 byte boundaries.

nfactor-troky
Con Kolivas 12 years ago
parent
commit
7993095ec3
  1. 18
      cgminer.c

18
cgminer.c

@ -82,7 +82,7 @@ struct strategies strategies[] = {
{ "Balance" }, { "Balance" },
}; };
static char packagename[255]; static char packagename[256];
bool opt_protocol; bool opt_protocol;
static bool opt_benchmark; static bool opt_benchmark;
@ -218,7 +218,7 @@ static char current_block[40];
static char *current_hash; static char *current_hash;
char *current_fullhash; char *current_fullhash;
static char datestamp[40]; static char datestamp[40];
static char blocktime[30]; static char blocktime[32];
struct timeval block_timeval; struct timeval block_timeval;
static char best_share[8] = "0"; static char best_share[8] = "0";
static uint64_t best_diff = 0; static uint64_t best_diff = 0;
@ -1801,7 +1801,7 @@ static void get_statline(char *buf, struct cgpu_info *cgpu)
static void text_print_status(int thr_id) static void text_print_status(int thr_id)
{ {
struct cgpu_info *cgpu = thr_info[thr_id].cgpu; struct cgpu_info *cgpu = thr_info[thr_id].cgpu;
char logline[255]; char logline[256];
if (cgpu) { if (cgpu) {
get_statline(logline, cgpu); get_statline(logline, cgpu);
@ -1862,7 +1862,7 @@ static void curses_print_devstatus(int thr_id)
{ {
static int awidth = 1, rwidth = 1, hwwidth = 1, uwidth = 1; static int awidth = 1, rwidth = 1, hwwidth = 1, uwidth = 1;
struct cgpu_info *cgpu = thr_info[thr_id].cgpu; struct cgpu_info *cgpu = thr_info[thr_id].cgpu;
char logline[255]; char logline[256];
char displayed_hashes[16], displayed_rolling[16]; char displayed_hashes[16], displayed_rolling[16];
uint64_t dh64, dr64; uint64_t dh64, dr64;
@ -2173,7 +2173,7 @@ share_result(json_t *val, json_t *res, json_t *err, const struct work *work,
pool->seq_rejects++; pool->seq_rejects++;
applog(LOG_DEBUG, "PROOF OF WORK RESULT: false (booooo)"); applog(LOG_DEBUG, "PROOF OF WORK RESULT: false (booooo)");
if (!QUIET) { if (!QUIET) {
char where[17]; char where[20];
char disposition[36] = "reject"; char disposition[36] = "reject";
char reason[32]; char reason[32];
@ -2237,7 +2237,7 @@ static const uint64_t diffone = 0xFFFF000000000000ull;
static uint64_t share_diff(const struct work *work) static uint64_t share_diff(const struct work *work)
{ {
uint64_t *data64, d64; uint64_t *data64, d64;
char rhash[36]; char rhash[32];
uint64_t ret; uint64_t ret;
swab256(rhash, work->hash); swab256(rhash, work->hash);
@ -2280,7 +2280,7 @@ static bool submit_upstream_work(struct work *work, CURL *curl, bool resubmit)
int rolltime; int rolltime;
uint32_t *hash32; uint32_t *hash32;
struct timeval tv_submit, tv_submit_reply; struct timeval tv_submit, tv_submit_reply;
char hashshow[64 + 1] = ""; char hashshow[64 + 4] = "";
char worktime[200] = ""; char worktime[200] = "";
#ifdef __BIG_ENDIAN__ #ifdef __BIG_ENDIAN__
@ -2417,7 +2417,7 @@ static bool submit_upstream_work(struct work *work, CURL *curl, bool resubmit)
if (!opt_realquiet) if (!opt_realquiet)
print_status(thr_id); print_status(thr_id);
if (!want_per_device_stats) { if (!want_per_device_stats) {
char logline[255]; char logline[256];
get_statline(logline, cgpu); get_statline(logline, cgpu);
applog(LOG_INFO, "%s", logline); applog(LOG_INFO, "%s", logline);
@ -2495,7 +2495,7 @@ static void calc_diff(struct work *work, int known)
if (opt_scrypt) { if (opt_scrypt) {
uint64_t *data64, d64; uint64_t *data64, d64;
char rtarget[36]; char rtarget[32];
swab256(rtarget, work->target); swab256(rtarget, work->target);
data64 = (uint64_t *)(rtarget + 2); data64 = (uint64_t *)(rtarget + 2);

Loading…
Cancel
Save