Skip to content

Commit

Permalink
COMPILE: fix strlcat definition
Browse files Browse the repository at this point in the history
PIPELINE: use ubuntu-latest images for build, 18.04 no longer available
        remove arch specific pkg-config
        use checkout v4 as v2 is deprecated
  • Loading branch information
ciscon committed Feb 16, 2024
1 parent 1aad7b8 commit e0dc1f5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-deploy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
build:
if: github.repository == 'QW-Group/qwfwd'
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get -y install build-essential cmake gcc-i686-linux-gnu
sudo apt-get -y install gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross
sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross
sudo apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686
- name: Build
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-and-deploy-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [push]
jobs:
build:
if: github.repository == 'QW-Group/qwfwd'
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get -y install build-essential cmake gcc-i686-linux-gnu
sudo apt-get -y install gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross
sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross
sudo apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686
- name: Build
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-targets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [pull_request]
jobs:
build:
if: github.repository == 'QW-Group/qwfwd'
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get -y install build-essential cmake gcc-i686-linux-gnu
sudo apt-get -y install gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross
sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross
sudo apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686
- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion src/qwfwd.h
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ int qvsnprintf(char *buffer, size_t count, const char *format, va_list argptr)
#if defined(__linux__) || defined(_WIN32) || defined(__CYGWIN__)

size_t strlcpy (char *dst, const char *src, size_t siz);
size_t strlcat (char *dst, char *src, size_t siz);
size_t strlcat (char *dst, const char *src, size_t siz);

#endif

Expand Down
2 changes: 1 addition & 1 deletion src/sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ size_t strlcpy(char *dst, const char *src, size_t siz)
return(s - src - 1); /* count does not include NUL */
}

size_t strlcat(char *dst, char *src, size_t siz)
size_t strlcat(char *dst, const char *src, size_t siz)
{
register char *d = dst;
register const char *s = src;
Expand Down

0 comments on commit e0dc1f5

Please sign in to comment.