mirror of
https://github.com/zap-proto/c.git
synced 2026-10-30 15:05:52 +00:00
zeekay
a84cf7189d
Finish the capnp->ZAP rebrand for the shared runtime and make the build
configure and pass on a clean checkout.
Runtime file rename (history-preserving git mv) + every reference updated
in one pass:
lib/capn.c -> lib/zap.c
lib/capn-malloc.c -> lib/zap-malloc.c
lib/capn-stream.c -> lib/zap-stream.c
lib/capn-list.inc -> lib/zap-list.inc
tests/capn-test.cpp -> tests/zap-test.cpp
tests/capn-stream-test.cpp -> tests/zap-stream-test.cpp
Updated #include directives (zap.c's 4 SZ-templated zap-list.inc includes,
the two unity-build test includes), file banner comments, and the
meson/autotools targets (test target capn-test -> zap-test, with the
matching automake zap_test_* variables and the libzap source list).
The upstream `capn_`/`CAPN_` C ABI (struct capn, capn_get, ...) is left
intact: it is the original MIT library's neutral symbol prefix, not a
capnp/Cap'n Proto brand token, and renaming it would break the generated
*.zap.c/*.zap.h and the runtime shared into the lua binding.
Build fixes:
- example-test.cpp wrote to a fixed relative path ("tests/...out"), which
fails under `meson test` (cwd is the build dir). Use tmpfile() so the
test is cwd-independent and leaves no artifact.
- CI workflow: trigger on main (default branch was renamed master->main),
run the renamed zap-test binary, drop EOL ubuntu-20.04, pin checkout@v4.
Dependency bump (in-major): gtest wrap 1.13.0-1 -> 1.17.0-4. gtest >=1.14
requires C++17, so bump the test C++ standard c++14 -> c++17 in meson.build
and Makefile.am (the runtime stays c99; C++ is test-only).
Verified: meson setup build && ninja builds libzap + zapc-c + zap-test
clean; zap-test passes 24/24; `meson test` green (1/1). autoreconf
generates configure and automake accepts the renamed targets.
62 lines
1.2 KiB
C
62 lines
1.2 KiB
C
/* vim: set sw=8 ts=8 sts=8 noet: */
|
|
/* str.h
|
|
*
|
|
* Copyright (C) 2013 James McKaskill
|
|
*
|
|
* This software may be modified and distributed under the terms
|
|
* of the MIT license. See the LICENSE file for details.
|
|
*/
|
|
|
|
#include <zap_c.h>
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
|
|
struct str {
|
|
char *str;
|
|
int len, cap;
|
|
};
|
|
|
|
extern char str_static[];
|
|
#define STR_INIT {str_static, 0, 0}
|
|
|
|
void str_reserve(struct str *v, int sz);
|
|
|
|
static inline void str_init(struct str *v, int sz) {
|
|
v->str = str_static;
|
|
v->len = v->cap = 0;
|
|
if (sz)
|
|
str_reserve(v, sz);
|
|
}
|
|
|
|
static inline void str_release(struct str *v) {
|
|
if (v->cap) {
|
|
free(v->str);
|
|
}
|
|
}
|
|
|
|
static inline void str_reset(struct str *v) {
|
|
if (v->len) {
|
|
v->len = 0;
|
|
v->str[0] = '\0';
|
|
}
|
|
}
|
|
|
|
static inline void str_setlen(struct str *v, int sz) {
|
|
str_reserve(v, sz);
|
|
v->str[sz] = '\0';
|
|
v->len = sz;
|
|
}
|
|
|
|
#ifdef __GNUC__
|
|
#define ATTR(FMT, ARGS) __attribute__((format(printf,FMT,ARGS)))
|
|
#else
|
|
#define ATTR(FMT, ARGS)
|
|
#endif
|
|
|
|
void str_add(struct str *v, const char *str, int sz);
|
|
int str_vaddf(struct str *v, const char *format, va_list ap) ATTR(2,0);
|
|
int str_addf(struct str *v, const char *format, ...) ATTR(2,3);
|
|
char *strf(struct str *v, const char *format, ...) ATTR(2,3);
|
|
|
|
|