mirror of
https://github.com/zap-proto/c.git
synced 2026-10-30 15:05:52 +00:00
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.
63 lines
1.5 KiB
C
63 lines
1.5 KiB
C
/* vim: set sw=8 ts=8 sts=8 noet: */
|
|
/* zap_c.h
|
|
*
|
|
* Copyright (C) 2013 James McKaskill
|
|
* Copyright (C) 2014 Steve Dee
|
|
*
|
|
* This software may be modified and distributed under the terms
|
|
* of the MIT license. See the LICENSE file for details.
|
|
*/
|
|
|
|
/*
|
|
* functions / structures in this header are private to the zap-c
|
|
* library; applications should not call or use them.
|
|
*/
|
|
|
|
#ifndef ZAP_PRIV_H
|
|
#define ZAP_PRIV_H
|
|
|
|
#include "zap_c.h"
|
|
|
|
#if defined(__GNUC__) && __GNUC__ >= 4
|
|
# define intern __attribute__((visibility ("internal")))
|
|
#else
|
|
# define intern /**/
|
|
#endif
|
|
|
|
/* capn_stream encapsulates the needed fields for capn_(deflate|inflate) in a
|
|
* similar manner to z_stream from zlib
|
|
*
|
|
* The user should set next_in, avail_in, next_out, avail_out to the
|
|
* available in/out buffers before calling capn_(deflate|inflate).
|
|
*
|
|
* Other fields should be zero initialized.
|
|
*/
|
|
struct capn_stream {
|
|
const uint8_t *next_in;
|
|
size_t avail_in;
|
|
uint8_t *next_out;
|
|
size_t avail_out;
|
|
unsigned zeros, raw;
|
|
|
|
uint8_t inflate_buf[8];
|
|
size_t avail_buf;
|
|
};
|
|
|
|
#define CAPN_MISALIGNED -1
|
|
#define CAPN_NEED_MORE -2
|
|
|
|
/* capn_deflate deflates a stream to the packed format
|
|
* capn_inflate inflates a stream from the packed format
|
|
*
|
|
* Returns:
|
|
* CAPN_MISALIGNED - if the unpacked data is not 8 byte aligned
|
|
* CAPN_NEED_MORE - more packed data/room is required (out for inflate, in for
|
|
* deflate)
|
|
* 0 - success, all output for inflate, all input for deflate processed
|
|
*/
|
|
intern int capn_deflate(struct capn_stream*);
|
|
intern int capn_inflate(struct capn_stream*);
|
|
|
|
|
|
#endif /* ZAP_PRIV_H */
|