Skip to content

Wrap assignment inside if in parentheses for clarity #3167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 26, 2025
Merged

Wrap assignment inside if in parentheses for clarity #3167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d49393a
Wrap assignment inside if in parentheses for clarity
eldering Oct 26, 2025
001ee3d
Turn off innodb-snapshot-isolation.
meisterT Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/jobs/baseinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ password=${MYSQL_ROOT_PASSWORD}
EOF
cat ~/.my.cnf

# TODO: Remove after fixing https://github.com/DOMjudge/domjudge/issues/2848
mysql_root "SET GLOBAL innodb_snapshot_isolation = OFF;"

mysql_root "CREATE DATABASE IF NOT EXISTS \`$DATABASE_NAME\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
mysql_root "CREATE USER IF NOT EXISTS \`domjudge\`@'%' IDENTIFIED BY 'domjudge';"
mysql_root "GRANT SELECT, INSERT, UPDATE, DELETE ON \`$DATABASE_NAME\`.* TO 'domjudge'@'%';"
Expand All @@ -79,6 +82,7 @@ mysql_root "SELECT USER();"
mysql_root "SELECT user,host FROM mysql.user"
mysql_root "SET GLOBAL max_allowed_packet=1073741824"
mysql_root "SHOW GLOBAL STATUS LIKE 'Connection_errors_%'"
mysql_root "SHOW VARIABLES LIKE 'innodb_snapshot_isolation'"
mysql_root "SHOW VARIABLES LIKE '%_timeout'"
echo "unused:sqlserver:$DATABASE_NAME:domjudge:domjudge:3306" > /opt/domjudge/domserver/etc/dbpasswords.secret
mysql_user "SELECT CURRENT_USER();"
Expand Down
2 changes: 1 addition & 1 deletion judge/runguard.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,7 @@ int main(int argc, char **argv)
* exceeded, when running via SSH. */
FILE *fp = nullptr;
const char *oom_score_path = "/proc/self/oom_score_adj";
if ( fp = fopen(oom_score_path, "r+") ) {
if ( (fp = fopen(oom_score_path, "r+"))!=nullptr ) {
if ( fscanf(fp,"%d", &ret)!=1 ) error(errno,"cannot read from `%s'", oom_score_path);
if ( ret<0 ) {
int oom_reset_value = 0;
Expand Down
Loading