Commit 4fe3c94e authored by Rom Walton's avatar Rom Walton
Browse files

Merge branch 'master' of https://github.com/BOINC/boinc

parents fbb8e0dc bd725a50
......@@ -310,7 +310,7 @@ void procinfo_show(PROC_MAP& pm) {
PROCINFO pi;
pi.clear();
PROC_MAP::iterator i;
for (i=pm.begin(); i!=pm.end(); i++) {
for (i=pm.begin(); i!=pm.end(); ++i) {
PROCINFO& p = i->second;
msg_printf(NULL, MSG_INFO, "%d %s: boinc? %d low_pri %d (u%f k%f)",
......
......@@ -690,7 +690,7 @@ void print_old_results(MIOFILE& mf) {
ores.completed_time,
ores.create_time
);
i++;
++i;
}
mf.printf("</old_results>\n");
}
......
......@@ -372,7 +372,7 @@ static int find_site_cookie_mozilla_v3(
sscanf( argv[0], "%255s", host );
sscanf( argv[1], "%255s", cookie_name );
sscanf( argv[2], "%4096s", cookie_value );
sscanf( argv[2], "%4095s", cookie_value );
sscanf( argv[3],
#ifdef _WIN32
"%I64d",
......@@ -572,7 +572,7 @@ static int find_site_cookie_chrome(
sscanf( argv[0], "%255s", host );
sscanf( argv[1], "%255s", cookie_name );
sscanf( argv[2], "%4096s", cookie_value );
sscanf( argv[2], "%4095s", cookie_value );
sscanf( argv[3],
#ifdef _WIN32
"%I64d",
......
......@@ -129,7 +129,7 @@ $cpu_prefs = array(
),
new PREF_NUM(
tra("Request tasks to checkpoint at most every"),
tra("This controls how often tasks save their state to disk, so that they can be restarted later."),
tra("This controls how often tasks save their state to disk, so that later they can be continued from that point."),
"disk_interval",
new NUM_SPEC(tra("seconds"), 0, 9999999, 60)
),
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment