Skip to content
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.

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

COMPILE: fix strlcat function definitions #23

Merged
merged 2 commits into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 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/qtv'
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -37,12 +37,12 @@ jobs:
ext: ".exe"
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Prepare Build Environemnt
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
6 changes: 3 additions & 3 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/qtv'
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -35,12 +35,12 @@ jobs:
ext: ".exe"
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Prepare Build Environemnt
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
6 changes: 3 additions & 3 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/qtv'
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -35,12 +35,12 @@ jobs:
ext: ".exe"
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Prepare Build Environemnt
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/qtv.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,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

#ifndef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion src/sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,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