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

client/app.cpp

@@ -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)",

client/cs_prefs.cpp

@@ -485,8 +485,10 @@ void CLIENT_STATE::check_suspend_network() {
 
 done:
     if (log_flags.suspend_debug) {
-        msg_printf(0, MSG_INFO, "[suspend] net_susp %d file_xfer_susp %d reason %d",
-            network_suspended, file_xfers_suspended, network_suspend_reason
+        msg_printf(0, MSG_INFO, "[suspend] net_susp: %s; file_xfer_susp: %s; reason: %s",
+            network_suspended?"yes":"no",
+            file_xfers_suspended?"yes":"no",
+            suspend_reason_string(network_suspend_reason)
         );
     }
 }

client/result.cpp

@@ -690,7 +690,7 @@ void print_old_results(MIOFILE& mf) {
             ores.completed_time,
             ores.create_time
         );
-        i++;
+        ++i;
     }
     mf.printf("</old_results>\n");
 }

clientgui/DlgAdvPreferencesBase.cpp

@@ -416,7 +416,7 @@ wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
 
     addNewRowToSizer(miscProcBoxSizer, ProcSwitchEveryTT, staticText18, m_txtProcSwitchEvery, staticText19);
 
-    wxString DiskWriteToDiskTT(_("This controls how often tasks save their state to disk, so that they can be restarted later."));
+    wxString DiskWriteToDiskTT(_("This controls how often tasks save their state to disk, so that they later can be continued from that point."));
     wxStaticText* staticText46 = new wxStaticText(
         miscProcStaticBox, ID_DEFAULT,
         // context: Request tasks to checkpoint at most every ___ seconds

clientgui/DlgEventLog.cpp

@@ -111,8 +111,8 @@ CDlgEventLog::CDlgEventLog( wxWindow* parent, wxWindowID id, const wxString& cap
 CDlgEventLog::~CDlgEventLog() {
     wxLogTrace(wxT("Function Start/End"), wxT("CDlgEventLog::CDlgEventLog - Destructor Function Begin"));
 
-#ifdef __WXGTK__   
-    m_pList->PopEventHandler(true);
+#ifdef __WXGTK__
+    (m_pList->GetMainWin())->PopEventHandler(true);
 #endif
 
     if (m_pMessageInfoAttr) {

clientgui/browser.cpp

@@ -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",

configure.ac

@@ -14,7 +14,7 @@ AC_SUBST([LIBBOINC_VERSION])
 WRAPPER_RELEASE=26015
 AC_SUBST([WRAPPER_RELEASE])
 
-VBOXWRAPPER_RELEASE=26171
+VBOXWRAPPER_RELEASE=26175
 AC_SUBST([VBOXWRAPPER_RELEASE])
 
 AC_CANONICAL_TARGET

dcapi/condor/condor_utils.c

@@ -173,7 +173,7 @@ _DC_get_file(char *fn)
 	if ((f= fopen(fn, "r")) != NULL)
 	{
 		int bs= 100, i;
-		char c;
+		int c;
 
 		buf= malloc(bs);
 		i= 0;
@@ -185,10 +185,10 @@ _DC_get_file(char *fn)
 				bs+= 100;
 				buf= realloc(buf, bs);
 			}
-			buf[i]= c;
+			buf[i]= (char)c;
 			i++;
-			buf[i]= '\0';
 		}
+		buf[i]= '\0';
 		fclose(f);
 	}
 	return(buf);
@@ -363,7 +363,7 @@ _DC_read_message(char *box, char *name, int del_msg)
 	if ((f= fopen(fn, "r")) != NULL)
 	{
 		int bs= 100, i;
-		char c;
+		int c;
 
 		buf= malloc(bs);
 		i= 0;
@@ -375,10 +375,10 @@ _DC_read_message(char *box, char *name, int del_msg)
 				bs+= 100;
 				buf= realloc(buf, bs);
 			}
-			buf[i]= c;
+			buf[i]= (char)c;
 			i++;
-			buf[i]= '\0';
 		}
+		buf[i]= '\0';
 		fclose(f);
 		if (del_msg)
 			unlink(fn);

dcapi/condor/tc.c

@@ -32,7 +32,7 @@ get_file(char *fn)
 	if ((f= fopen(fn, "r")) != NULL)
 	{
 		int bs= 100, i;
-		char c;
+		int c;
 
 		buf= malloc(bs);
 		i= 0;
@@ -44,10 +44,10 @@ get_file(char *fn)
 				bs+= 100;
 				buf= realloc(buf, bs);
 			}
-			buf[i]= c;
+			buf[i]= (char)c;
 			i++;
-			buf[i]= '\0';
 		}
+		buf[i]= '\0';
 		fclose(f);
 	}
 	return(buf);

dcapi/local/local_utils.c

@@ -177,7 +177,7 @@ _DC_get_file(char *fn)
 	if ((f= fopen(fn, "r")) != NULL)
 	{
 		int bs= 100, i;
-		char c;
+		int c;
 
 		buf= malloc(bs);
 		i= 0;
@@ -189,10 +189,10 @@ _DC_get_file(char *fn)
 				bs+= 100;
 				buf= realloc(buf, bs);
 			}
-			buf[i]= c;
+			buf[i]= (char)c;
 			i++;
-			buf[i]= '\0';
 		}
+		buf[i]= '\0';
 		fclose(f);
 	}
 	return(buf);
@@ -367,7 +367,7 @@ _DC_read_message(char *box, char *name, int del_msg)
 	if ((f= fopen(fn, "r")) != NULL)
 	{
 		int bs= 100, i;
-		char c;
+		int c;
 
 		buf= malloc(bs);
 		i= 0;
@@ -379,10 +379,10 @@ _DC_read_message(char *box, char *name, int del_msg)
 				bs+= 100;
 				buf= realloc(buf, bs);
 			}
-			buf[i]= c;
+			buf[i]= (char)c;
 			i++;
-			buf[i]= '\0';
 		}
+		buf[i]= '\0';
 		fclose(f);
 		if (del_msg)
 			unlink(fn);

doc/projects.inc

@@ -741,6 +741,16 @@ $math = array(
             "",
             "",
         ),
+        array(
+            "SRBase",
+            "http://srbase.myfirewall.org/sr5/",
+            "Private",
+            "Mathematics",
+            "SRBase is a mathematical research project that uses Internet-connected computers trying to solve Sierpinski / Riesel Bases up to 1030.",
+            "",
+            "",
+            ""
+        ),
     ),
 );