Skip to content

Commit a45f22b

Browse files
committed
Update dependencies and fix warnings
1 parent 8e05e29 commit a45f22b

35 files changed

+251
-230
lines changed

.github/workflows/check.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99
- 'main'
1010

1111
env:
12-
NODE_VERSION: 22
13-
PYTHON_VERSION: 3.12
12+
NODE_VERSION: '22'
13+
PYTHON_VERSION: '3.13'
1414

1515
permissions:
1616
contents: read
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: checkout repository
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424
- name: install dependencies
2525
run: sudo apt install -y lcov astyle
2626
- name: set RELEASE number
@@ -37,9 +37,9 @@ jobs:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- name: checkout repository
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v5
4141
- name: setup go build environment
42-
uses: actions/setup-go@v5
42+
uses: actions/setup-go@v6
4343
with:
4444
go-version-file: 'go.mod'
4545
check-latest: true
@@ -52,9 +52,9 @@ jobs:
5252
runs-on: ubuntu-latest
5353
steps:
5454
- name: checkout repository
55-
uses: actions/checkout@v4
55+
uses: actions/checkout@v5
5656
- name: setup node build environment
57-
uses: actions/setup-node@v4
57+
uses: actions/setup-node@v5
5858
with:
5959
node-version: ${{ env.NODE_VERSION }}
6060
- name: install dependencies
@@ -68,9 +68,9 @@ jobs:
6868
runs-on: ubuntu-latest
6969
steps:
7070
- name: checkout repository
71-
uses: actions/checkout@v4
71+
uses: actions/checkout@v5
7272
- name: setup python build environment
73-
uses: actions/setup-python@v5
73+
uses: actions/setup-python@v6
7474
with:
7575
python-version: ${{ env.PYTHON_VERSION }}
7676
- name: Install dependencies
@@ -86,9 +86,9 @@ jobs:
8686
runs-on: ubuntu-latest
8787
steps:
8888
- name: checkout repository
89-
uses: actions/checkout@v4
89+
uses: actions/checkout@v5
9090
- name: setup python build environment
91-
uses: actions/setup-python@v5
91+
uses: actions/setup-python@v6
9292
with:
9393
python-version: ${{ env.PYTHON_VERSION }}
9494
- name: Install dependencies
@@ -104,7 +104,7 @@ jobs:
104104
runs-on: ubuntu-latest
105105
steps:
106106
- name: checkout repository
107-
uses: actions/checkout@v4
107+
uses: actions/checkout@v5
108108
- name: setup R build environment
109109
uses: r-lib/actions/setup-r@v2
110110
- name: Install dependencies

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.7.9
1+
5.7.10

c/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ option(BUILD_SHARED_LIB "Build a shared library" ON)
2929
if(CMAKE_COMPILER_IS_GNUCC)
3030
message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
3131
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
32-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D VERSION='\"${PROJECT_VERSION}\"' -s -pedantic -std=c17 -Wall -Wextra -Wno-strict-prototypes -Wcast-align -Wundef -Wformat -Wformat-security")
32+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D VERSION='\"${PROJECT_VERSION}\"' -s -pedantic -std=c2x -Wall -Wextra -Wno-strict-prototypes -Wcast-align -Wundef -Wformat -Wformat-security")
3333

3434
if (GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
3535
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")

c/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ help:
5858
@echo "$(PROJECT) Makefile."
5959
@echo "The following commands are available:"
6060
@echo ""
61-
@echo " make qa : Run all the tests and static analysis reports"
6261
@echo " make test : Run the unit tests"
6362
@echo " make tidy : Check the code using clang-tidy"
6463
@echo " make build : Build the library"
@@ -77,7 +76,7 @@ all: clean version format test tidy build rpm deb package_vk doc
7776
# Test C code compatibility with C++
7877
.PHONY: testcpp
7978
testcpp:
80-
find ./src/variantkey -type f -name '*.h' -exec gcc -c -pedantic -Werror -Wall -Wextra -Wcast-align -Wundef -Wformat-security -std=c++17 -x c++ -o /dev/null {} \;
79+
find ./src/variantkey -type f -name '*.h' -exec gcc -c -pedantic -Werror -Wall -Wextra -Wcast-align -Wundef -Wformat-security -std=c++23 -x c++ -o /dev/null {} \;
8180

8281
# Build and run the unit tests
8382
.PHONY: test

c/doc/Doxyfile

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ PROJECT_NAME = "VariantKey"
3232
# This could be handy for archiving the generated documentation or
3333
# if some version control system is used.
3434

35-
PROJECT_NUMBER = 5.7.9
35+
PROJECT_NUMBER = 5.7.10
3636

3737
# Using the PROJECT_BRIEF tag one can provide an optional one line description
3838
# for a project that appears at the top of each page and should give viewer
@@ -922,12 +922,6 @@ HTML_COLORSTYLE_SAT = 100
922922

923923
HTML_COLORSTYLE_GAMMA = 80
924924

925-
# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
926-
# page will contain the date and time when the page was generated. Setting
927-
# this to NO can help when comparing the output of multiple runs.
928-
929-
HTML_TIMESTAMP = NO
930-
931925
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
932926
# documentation will contain sections that can be hidden and shown after the
933927
# page has loaded.
@@ -1142,14 +1136,6 @@ EXT_LINKS_IN_WINDOW = NO
11421136

11431137
FORMULA_FONTSIZE = 10
11441138

1145-
# Use the FORMULA_TRANPARENT tag to determine whether or not the images
1146-
# generated for formulas are transparent PNGs. Transparent PNGs are
1147-
# not supported properly for IE 6.0, but are supported on all modern browsers.
1148-
# Note that when changing this option you need to delete any form_*.png files
1149-
# in the HTML output before the changes have effect.
1150-
1151-
FORMULA_TRANSPARENT = YES
1152-
11531139
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
11541140
# (see http://www.mathjax.org) which uses client side Javascript for the
11551141
# rendering instead of using prerendered bitmaps. Use this if you do not
@@ -1567,20 +1553,6 @@ HAVE_DOT = NO
15671553

15681554
DOT_NUM_THREADS = 0
15691555

1570-
# By default doxygen will use the Helvetica font for all dot files that
1571-
# doxygen generates. When you want a differently looking font you can specify
1572-
# the font name using DOT_FONTNAME. You need to make sure dot is able to find
1573-
# the font, which can be done by putting it in a standard location or by setting
1574-
# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
1575-
# directory containing the font.
1576-
1577-
DOT_FONTNAME = Helvetica
1578-
1579-
# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
1580-
# The default size is 10pt.
1581-
1582-
DOT_FONTSIZE = 10
1583-
15841556
# By default doxygen will tell dot to use the Helvetica font.
15851557
# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
15861558
# set the path where dot can find it.
@@ -1722,14 +1694,6 @@ DOT_GRAPH_MAX_NODES = 50
17221694

17231695
MAX_DOT_GRAPH_DEPTH = 0
17241696

1725-
# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
1726-
# background. This is disabled by default, because dot on Windows does not
1727-
# seem to support this out of the box. Warning: Depending on the platform used,
1728-
# enabling this option may lead to badly anti-aliased labels on the edges of
1729-
# a graph (i.e. they become hard to read).
1730-
1731-
DOT_TRANSPARENT = NO
1732-
17331697
# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
17341698
# files in one run (i.e. multiple -o and -T options on the command line). This
17351699
# makes dot run faster, but since only newer versions of dot (>1.8.10)

c/src/variantkey/binsearch.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include <inttypes.h>
4545
#include <fcntl.h>
4646
#include <stdbool.h>
47+
#include <stdint.h>
4748
#include <unistd.h>
4849
#include <sys/mman.h>
4950
#include <sys/stat.h>
@@ -989,7 +990,8 @@ static inline void mmap_binfile(const char *file, mmfile_t *mf)
989990
mf->dlength = 0;
990991
mf->nrows = 0;
991992
struct stat statbuf;
992-
if (((mf->fd = open(file, O_RDONLY)) < 0) || (fstat(mf->fd, &statbuf) < 0))
993+
mf->fd = open(file, O_RDONLY);
994+
if ((mf->fd < 0) || (fstat(mf->fd, &statbuf) < 0))
993995
{
994996
return;
995997
}

c/src/variantkey/esid.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define VARIANTKEY_ESID_H
1919

2020
#include <inttypes.h>
21+
#include <stdint.h>
2122
#include <stdio.h>
2223

2324
#define ESID_MAXLEN 10 //!< Maximum number of characters that can be encoded
@@ -333,6 +334,9 @@ static inline uint64_t hash_string_id(const char *str, size_t size)
333334
// fall through
334335
case 1:
335336
v ^= (uint64_t)tail[0];
337+
break;
338+
default:
339+
break;
336340
}
337341
if (v > 0)
338342
{

c/src/variantkey/genoref.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#ifndef VARIANTKEY_GENOREF_H
2222
#define VARIANTKEY_GENOREF_H
2323

24+
#include <inttypes.h>
25+
#include <stdint.h>
2426
#include <stdio.h>
2527
#include <string.h>
2628
#include "binsearch.h"

c/src/variantkey/hex.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define VARIANTKEY_HEX_H
1919

2020
#include <inttypes.h>
21+
#include <stdint.h>
2122
#include <stdio.h>
2223

2324
/** @brief Returns uint64_t hexadecimal string (16 characters).

c/src/variantkey/nrvk.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
#ifndef VARIANTKEY_NRVK_H
3131
#define VARIANTKEY_NRVK_H
3232

33+
#include <inttypes.h>
34+
#include <stdint.h>
3335
#include <stdio.h>
3436
#include <string.h>
3537
#include "binsearch.h"

0 commit comments

Comments
 (0)