Skip to content

Update VA_COPY macro to use va_copy function #3

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

Open
programmer-1101 wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −6
Open

Update VA_COPY macro to use va_copy function #3

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
0138793
Update VA_COPY macro to use va_copy function
programmer-1101 Apr 25, 2026
f6db732
Use long instead of C99 long long
programmer-1101 Apr 25, 2026
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
2 changes: 1 addition & 1 deletion .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
freebsd_instance:
image_family: freebsd-13-0
image_family: freebsd-14

task:
install_script: pkg install -y cmake
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
EOF

- name: Compile Test Amalgamation
run: gcc -Wall -Wextra -Werror -o test_amalg test_amalg.c
run: gcc -std=c89 -Wpedantic -Wall -Wextra -Werror -o test_amalg test_amalg.c

- name: Run Test Amalgamation
run: ./test_amalg
10 changes: 7 additions & 3 deletions c89stringutils/c89stringutils_string_extras.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,11 @@ char *strnstr(const char *buffer, const char *target, size_t bufferLength) {
character of the first occurrence of little is returned.

[this doc (c) FreeBSD <3 clause BSD license> from their manpage] */
const size_t targetLength = strlen(target);
size_t targetLength;
const char *start;

/* Fix assignment of targetLength. C89 requires variables to be defined at beginning of a scope */
targetLength = strlen(target);
if (targetLength == 0)
return (char *)buffer;
for (start = buffer; *start && start + targetLength <= buffer + bufferLength;
Expand All @@ -125,7 +128,8 @@ char *strnstr(const char *buffer, const char *target, size_t bufferLength) {
/* `strcasestr` from MUSL */

char *strcasestr(const char *h, const char *n) {
const size_t l = strlen(n);
size_t l;
l = strlen(n);
for (; *h; h++)
if (!strncasecmp(h, n, l))
return (char *)h;
Expand Down Expand Up @@ -192,7 +196,7 @@ size_t strerrorlen_s(errno_t errnum) {
#ifdef HAVE___VA_COPY
#define VA_COPY(dest, src) __va_copy(dest, src)
#else
#define VA_COPY(dest, src) (dest) = (src)
#define VA_COPY(dest, src) memcpy(&(dest), &(src), sizeof(va_list))
#endif
#endif
#endif /* ! VA_COPY */
Expand Down
3 changes: 2 additions & 1 deletion c89stringutils/c89stringutils_string_extras.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ extern "C" {
#if defined(_MSC_VER)
#define NUM_FORMAT "%I64d"
#else
#define NUM_FORMAT "%lld"
/* Fix:- Change from C99 long long to long */
#define NUM_FORMAT "%ld"
#endif

#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
Expand Down