[boinc] 01/05: New upstream version 7.9.3+dfsg
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Sat Mar 10 22:10:28 UTC 2018
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository boinc.
commit 22e162beb4e9ff195c17d66cb1e80b25cc5dfcc6
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sat Mar 10 23:03:50 2018 +0100
New upstream version 7.9.3+dfsg
---
COPYRIGHT | 2 +-
android/BOINC/app/src/main/res/values/strings.xml | 4 ++--
client/file_names.cpp | 25 +++++++++--------------
clientgui/DlgAbout.cpp | 2 +-
configure.ac | 2 +-
lib/parse.h | 10 ++++-----
version.log | 2 +-
7 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/COPYRIGHT b/COPYRIGHT
index 179f039..e38dea4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
// Berkeley Open Infrastructure for Network Computing
// http://boinc.berkeley.edu
-// Source: http://boinc.berkeley.edu/source_code.php
+// Source: https://github.com/BOINC/boinc/
// Copyright(C) 2002-2012 University of California
//
// This is free software; you can redistribute it and/or
diff --git a/android/BOINC/app/src/main/res/values/strings.xml b/android/BOINC/app/src/main/res/values/strings.xml
index df0f132..08eb157 100644
--- a/android/BOINC/app/src/main/res/values/strings.xml
+++ b/android/BOINC/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
<!--
This file is part of BOINC.
http://boinc.berkeley.edu
- Copyright (C) 2016 University of California
+ Copyright (C) 2018 University of California
BOINC is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License
@@ -367,7 +367,7 @@
<string name="about_name">BOINC</string>
<string name="about_version">Version</string>
<string name="about_name_long">Berkeley Open Infrastructure for Network Computing</string>
- <string name="about_copyright">\u00A9 2003–2017 University of California, Berkeley.</string>
+ <string name="about_copyright">\u00A9 2003–2018 University of California, Berkeley.</string>
<string name="about_copyright_reserved">All Rights Reserved.</string>
<string name="about_credits">Thanks to the Max Planck Institute for Gravitational Physics, IBM Corporation and HTC Corporation for their support.</string>
diff --git a/client/file_names.cpp b/client/file_names.cpp
index 2813aed..3909737 100644
--- a/client/file_names.cpp
+++ b/client/file_names.cpp
@@ -267,13 +267,8 @@ void get_account_filename(char* master_url, char* path, int len) {
snprintf(path, len, "account_%s.xml", buf);
}
-static bool bad_account_filename(const char* filename) {
- msg_printf(NULL, MSG_INTERNAL_ERROR, "Invalid account filename: %s", filename);
- return false;
-}
-
-// account filenames are of the form
-// account_URL.xml
+// Is this an account file?
+// Account filenames are of the form account_URL.xml
// where URL is master URL with slashes replaced by underscores
//
bool is_account_file(const char* filename) {
@@ -283,11 +278,11 @@ bool is_account_file(const char* filename) {
q = filename + strlen("account_");
p = strstr(q, ".xml");
- if (!p) return bad_account_filename(filename);
- if (p == q) return bad_account_filename(filename);
+ if (!p) return false;
+ if (p == q) return false;
q = p + strlen(".xml");
- if (strlen(q)) return bad_account_filename(filename);
+ if (strlen(q)) return false;
return true;
}
@@ -302,16 +297,16 @@ bool is_statistics_file(const char* filename) {
q = filename + strlen("statistics_");
p = strstr(q, ".");
- if (!p) return bad_account_filename(filename);
- if (p == q) return bad_account_filename(filename);
+ if (!p) return false;
+ if (p == q) return false;
q = p+1;
p = strstr(q, ".xml");
- if (!p) return bad_account_filename(filename);
- if (p == q) return bad_account_filename(filename);
+ if (!p) return false;
+ if (p == q) return false;
q = p + strlen(".xml");
- if (strlen(q)) return bad_account_filename(filename);
+ if (strlen(q)) return false;
return true;
}
diff --git a/clientgui/DlgAbout.cpp b/clientgui/DlgAbout.cpp
index 5fe11a4..5ce22b3 100644
--- a/clientgui/DlgAbout.cpp
+++ b/clientgui/DlgAbout.cpp
@@ -189,7 +189,7 @@ void CDlgAbout::CreateControls() {
itemFlexGridSizer7->Add(itemStaticText12, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
wxStaticText* itemStaticText13 = new wxStaticText;
- itemStaticText13->Create( itemDialog1, wxID_STATIC, _("(C) 2003-2017 University of California, Berkeley.\nAll Rights Reserved."), wxDefaultPosition, wxDefaultSize, 0 );
+ itemStaticText13->Create( itemDialog1, wxID_STATIC, _("(C) 2003-2018 University of California, Berkeley.\nAll Rights Reserved."), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer7->Add(itemStaticText13, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
wxStaticText* itemStaticText14 = new wxStaticText;
diff --git a/configure.ac b/configure.ac
index fe92b3f..9d6a18c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
AC_PREREQ(2.58)
dnl Set the BOINC version here. You can also use the set-version script.
-AC_INIT(BOINC, 7.9.2)
+AC_INIT(BOINC, 7.9.3)
AC_CONFIG_MACRO_DIR([m4])
LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
AC_SUBST([LIBBOINC_VERSION])
diff --git a/lib/parse.h b/lib/parse.h
index cef3eae..4f7a173 100644
--- a/lib/parse.h
+++ b/lib/parse.h
@@ -181,13 +181,13 @@ struct XML_PARSER {
if (isascii(c) && isspace(c)) {
if (found_space && attr_buf) {
if (--attr_len > 0) {
- *attr_buf++ = c;
+ *attr_buf++ = (char)c;
}
}
found_space = true;
} else if (c == '/') {
if (--tag_len > 0) {
- *buf++ = c;
+ *buf++ = (char)c;
} else {
return XML_PARSE_OVERFLOW;
}
@@ -195,12 +195,12 @@ struct XML_PARSER {
if (found_space) {
if (attr_buf) {
if (--attr_len > 0) {
- *attr_buf++ = c;
+ *attr_buf++ = (char)c;
}
}
} else {
if (--tag_len > 0) {
- *buf++ = c;
+ *buf++ = (char)c;
} else {
return XML_PARSE_OVERFLOW;
}
@@ -235,7 +235,7 @@ struct XML_PARSER {
retval = ERR_XML_PARSE;
break;
}
- buf[n++] = c;
+ buf[n++] = (char)c;
buf[n] = 0;
char* p = strstr(buf, end_tag);
if (p) {
diff --git a/version.log b/version.log
index 33d0030..eab095d 100644
--- a/version.log
+++ b/version.log
@@ -1 +1 @@
-7.9.2
+7.9.3
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list