Re-format C function signatures

This commit is contained in:
Nigel Tao committed 2020-02-26 09:40:30 +11:00
1 parent 51b1258b61
commit 2914bae3b2
26 files changed
+833 -532

No files matched your search

+2 -1
View File
@@ -56,7 +56,8 @@ for a C++ compiler $CXX, such as clang++ or g++.
uint8_t src_buffer[SRC_BUFFER_SIZE];
int main(int argc, char** argv) {
int //
main(int argc, char** argv) {
wuffs_crc32__ieee_hasher h;
wuffs_base__status status = h.initialize(sizeof h, WUFFS_VERSION, 0);
if (!status.is_ok()) {
+22 -12
View File
@@ -44,7 +44,8 @@ support true color: https://gist.github.com/XVilka/8346728
bool started = false;
struct timespec start_time = {0};
int64_t micros_since_start(struct timespec* now) {
int64_t //
micros_since_start(struct timespec* now) {
if (!started) {
return 0;
}
@@ -105,7 +106,8 @@ wuffs_base__pixel_buffer pb = {0};
wuffs_base__flicks cumulative_delay_micros = 0;
const char* read_stdin() {
const char* //
read_stdin() {
while (src_len < SRC_BUFFER_SIZE) {
size_t n = fread(src_buffer + src_len, sizeof(uint8_t),
SRC_BUFFER_SIZE - src_len, stdin);
@@ -133,7 +135,8 @@ bool color_flag = false;
bool quirk_honor_background_color_flag = false;
const int stdout_fd = 1;
static inline uint32_t load_u32le(uint8_t* p) {
static inline uint32_t //
load_u32le(uint8_t* p) {
return ((uint32_t)(p[0]) << 0) | ((uint32_t)(p[1]) << 8) |
((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24);
}
@@ -146,9 +149,10 @@ store_u32le(uint8_t* p, uint32_t x) {
p[3] = (uint8_t)(x >> 24);
}
void restore_background(wuffs_base__pixel_buffer* pb,
wuffs_base__rect_ie_u32 bounds,
wuffs_base__color_u32_argb_premul background_color) {
void //
restore_background(wuffs_base__pixel_buffer* pb,
wuffs_base__rect_ie_u32 bounds,
wuffs_base__color_u32_argb_premul background_color) {
size_t width4 = (size_t)(wuffs_base__pixel_config__width(&pb->pixcfg)) * 4;
size_t y;
for (y = bounds.min_incl_y; y < bounds.max_excl_y; y++) {
@@ -161,7 +165,8 @@ void restore_background(wuffs_base__pixel_buffer* pb,
}
}
size_t print_ascii_art(wuffs_base__pixel_buffer* pb) {
size_t //
print_ascii_art(wuffs_base__pixel_buffer* pb) {
uint32_t width = wuffs_base__pixel_config__width(&pb->pixcfg);
uint32_t height = wuffs_base__pixel_config__height(&pb->pixcfg);
@@ -188,7 +193,8 @@ size_t print_ascii_art(wuffs_base__pixel_buffer* pb) {
return p - printbuf.ptr;
}
size_t print_color_art(wuffs_base__pixel_buffer* pb) {
size_t //
print_color_art(wuffs_base__pixel_buffer* pb) {
uint32_t width = wuffs_base__pixel_config__width(&pb->pixcfg);
uint32_t height = wuffs_base__pixel_config__height(&pb->pixcfg);
@@ -217,7 +223,8 @@ size_t print_color_art(wuffs_base__pixel_buffer* pb) {
// ----
const char* try_allocate(wuffs_gif__decoder* dec) {
const char* //
try_allocate(wuffs_gif__decoder* dec) {
uint32_t width = wuffs_base__pixel_config__width(&ic.pixcfg);
uint32_t height = wuffs_base__pixel_config__height(&ic.pixcfg);
uint64_t num_pixels = ((uint64_t)width) * ((uint64_t)height);
@@ -260,7 +267,8 @@ const char* try_allocate(wuffs_gif__decoder* dec) {
return NULL;
}
const char* allocate(wuffs_gif__decoder* dec) {
const char* //
allocate(wuffs_gif__decoder* dec) {
const char* status_msg = try_allocate(dec);
if (status_msg) {
free(printbuf.ptr);
@@ -276,7 +284,8 @@ const char* allocate(wuffs_gif__decoder* dec) {
return status_msg;
}
const char* play() {
const char* //
play() {
wuffs_gif__decoder dec;
wuffs_base__status status =
wuffs_gif__decoder__initialize(&dec, sizeof dec, WUFFS_VERSION, 0);
@@ -427,7 +436,8 @@ const char* play() {
return NULL;
}
int main(int argc, char** argv) {
int //
main(int argc, char** argv) {
int i;
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-color")) {
+26 -15
View File
@@ -96,14 +96,16 @@ union {
wuffs_wbmp__decoder wbmp;
} g_potential_decoders;
static inline void store_u32le(uint8_t* p, uint32_t x) {
static inline void //
store_u32le(uint8_t* p, uint32_t x) {
p[0] = (uint8_t)(x >> 0);
p[1] = (uint8_t)(x >> 8);
p[2] = (uint8_t)(x >> 16);
p[3] = (uint8_t)(x >> 24);
}
bool read_more_src() {
bool //
read_more_src() {
if (g_src.meta.closed) {
printf("%s: unexpected end of file\n", g_filename);
return false;
@@ -120,7 +122,8 @@ bool read_more_src() {
return true;
}
bool load_image_type() {
bool //
load_image_type() {
while (g_src.meta.wi == 0) {
if (!read_more_src()) {
return false;
@@ -175,7 +178,8 @@ bool load_image_type() {
return true;
}
bool load_image_config() {
bool //
load_image_config() {
// Decode the wuffs_base__image_config.
while (true) {
wuffs_base__status status = wuffs_base__image_decoder__decode_image_config(
@@ -262,7 +266,8 @@ bool load_image_config() {
// This function always returns true. If we get this far, we still display a
// partial image, even if we encounter an error.
bool load_image_frame() {
bool //
load_image_frame() {
while (true) {
wuffs_base__status status = wuffs_base__image_decoder__decode_frame(
g_image_decoder, &g_pixbuf, &g_src, WUFFS_BASE__PIXEL_BLEND__SRC_OVER,
@@ -286,7 +291,8 @@ bool load_image_frame() {
return true;
}
bool load_image(const char* filename) {
bool //
load_image(const char* filename) {
if (g_workbuf_slice.ptr != NULL) {
free(g_workbuf_slice.ptr);
g_workbuf_slice.ptr = NULL;
@@ -348,14 +354,16 @@ xcb_pixmap_t g_pixmap = XCB_NONE;
xcb_keysym_t* g_keysyms = NULL;
xcb_get_keyboard_mapping_reply_t* g_keyboard_mapping = NULL;
void init_keymap(xcb_connection_t* c, const xcb_setup_t* z) {
void //
init_keymap(xcb_connection_t* c, const xcb_setup_t* z) {
xcb_get_keyboard_mapping_cookie_t cookie = xcb_get_keyboard_mapping(
c, z->min_keycode, z->max_keycode - z->min_keycode + 1);
g_keyboard_mapping = xcb_get_keyboard_mapping_reply(c, cookie, NULL);
g_keysyms = (xcb_keysym_t*)(g_keyboard_mapping + 1);
}
xcb_window_t make_window(xcb_connection_t* c, xcb_screen_t* s) {
xcb_window_t //
make_window(xcb_connection_t* c, xcb_screen_t* s) {
xcb_window_t w = xcb_generate_id(c);
uint32_t value_mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK;
uint32_t value_list[2];
@@ -372,11 +380,12 @@ xcb_window_t make_window(xcb_connection_t* c, xcb_screen_t* s) {
return w;
}
bool load(xcb_connection_t* c,
xcb_screen_t* s,
xcb_window_t w,
xcb_gcontext_t g,
const char* filename) {
bool //
load(xcb_connection_t* c,
xcb_screen_t* s,
xcb_window_t w,
xcb_gcontext_t g,
const char* filename) {
if (g_pixmap != XCB_NONE) {
xcb_free_pixmap(c, g_pixmap);
}
@@ -394,7 +403,8 @@ bool load(xcb_connection_t* c,
return true;
}
int main(int argc, char** argv) {
int //
main(int argc, char** argv) {
xcb_connection_t* c = xcb_connect(NULL, NULL);
const xcb_setup_t* z = xcb_get_setup(c);
xcb_screen_t* s = xcb_setup_roots_iterator(z).data;
@@ -508,7 +518,8 @@ int main(int argc, char** argv) {
#if !defined(SUPPORTED_OPERATING_SYSTEM)
int main(int argc, char** argv) {
int //
main(int argc, char** argv) {
printf("unsupported operating system\n");
return 1;
}
+24 -14
View File
@@ -101,7 +101,8 @@ size_t indent;
// ----
const char* read_src() {
const char* //
read_src() {
if (src.meta.closed) {
return "main: internal error: read requested on a closed source";
}
@@ -119,7 +120,8 @@ const char* read_src() {
return nullptr;
}
const char* flush_dst() {
const char* //
flush_dst() {
size_t n = dst.meta.wi - dst.meta.ri;
if (n > 0) {
size_t i = fwrite(dst.data.ptr + dst.meta.ri, sizeof(uint8_t), n, stdout);
@@ -132,7 +134,8 @@ const char* flush_dst() {
return nullptr;
}
const char* write_dst(const void* s, size_t n) {
const char* //
write_dst(const void* s, size_t n) {
const uint8_t* p = static_cast<const uint8_t*>(s);
while (n > 0) {
size_t i = dst.writer_available();
@@ -181,7 +184,8 @@ typedef struct {
wuffs_base__slice_u8 data;
} parsed_token;
parsed_token make_pt_error(const char* error_msg) {
parsed_token //
make_pt_error(const char* error_msg) {
parsed_token p;
p.error_msg = error_msg;
p.token = wuffs_base__make_token(0);
@@ -189,9 +193,8 @@ parsed_token make_pt_error(const char* error_msg) {
return p;
}
parsed_token make_pt_token(uint64_t token_repr,
uint8_t* data_ptr,
size_t data_len) {
parsed_token //
make_pt_token(uint64_t token_repr, uint8_t* data_ptr, size_t data_len) {
parsed_token p;
p.error_msg = nullptr;
p.token = wuffs_base__make_token(token_repr);
@@ -199,7 +202,8 @@ parsed_token make_pt_token(uint64_t token_repr,
return p;
}
parsed_token parse_next_token() {
parsed_token //
parse_next_token() {
while (true) {
// Return a previously produced token, if one exists.
//
@@ -254,7 +258,8 @@ parsed_token parse_next_token() {
// ----
uint8_t hex_digit(uint8_t nibble) {
uint8_t //
hex_digit(uint8_t nibble) {
nibble &= 0x0F;
if (nibble <= 9) {
return '0' + nibble;
@@ -262,7 +267,8 @@ uint8_t hex_digit(uint8_t nibble) {
return ('A' - 10) + nibble;
}
const char* handle_string(parsed_token pt) {
const char* //
handle_string(parsed_token pt) {
TRY(write_dst("\"", 1));
while (true) {
uint64_t vbc = pt.token.value_base_category();
@@ -365,7 +371,8 @@ const char* handle_string(parsed_token pt) {
return nullptr;
}
const char* main2() {
const char* //
main2() {
dec_status = dec.initialize(sizeof__wuffs_json__decoder(), WUFFS_VERSION, 0);
if (!dec_status.is_ok()) {
return dec_status.message();
@@ -515,7 +522,8 @@ break_loop:
return nullptr;
}
const char* main1(int argc, char** argv) {
const char* //
main1(int argc, char** argv) {
dst = wuffs_base__make_io_buffer(
wuffs_base__make_slice_u8(dst_buffer, DST_BUFFER_SIZE),
wuffs_base__empty_io_buffer_meta());
@@ -535,7 +543,8 @@ const char* main1(int argc, char** argv) {
return nullptr;
}
int compute_exit_code(const char* status_msg) {
int //
compute_exit_code(const char* status_msg) {
if (!status_msg) {
return 0;
}
@@ -559,7 +568,8 @@ int compute_exit_code(const char* status_msg) {
return strstr(status_msg, "internal error:") ? 2 : 1;
}
int main(int argc, char** argv) {
int //
main(int argc, char** argv) {
const char* z0 = main1(argc, argv);
const char* z1 = flush_dst();
int exit_code = compute_exit_code(z0 ? z0 : z1);
+4 -2
View File
@@ -76,7 +76,8 @@ uint8_t work_buffer[WORK_BUFFER_SIZE];
uint8_t work_buffer[1];
#endif
static const char* decode() {
static const char* //
decode() {
wuffs_base__io_buffer dst;
dst.data.ptr = dst_buffer;
dst.data.len = DST_BUFFER_SIZE;
@@ -117,7 +118,8 @@ static const char* decode() {
return NULL;
}
int main(int argc, char** argv) {
int //
main(int argc, char** argv) {
const char* status_msg = decode();
if (status_msg) {
fprintf(stderr, "%s\n", status_msg);
+8 -4
View File
@@ -81,9 +81,11 @@ uint8_t work_buffer[1];
#endif
// ignore_return_value suppresses errors from -Wall -Werror.
static void ignore_return_value(int ignored) {}
static void //
ignore_return_value(int ignored) {}
static const char* decode() {
static const char* //
decode() {
wuffs_gzip__decoder dec;
wuffs_base__status status =
wuffs_gzip__decoder__initialize(&dec, sizeof dec, WUFFS_VERSION, 0);
@@ -151,7 +153,8 @@ static const char* decode() {
}
}
int compute_exit_code(const char* status_msg) {
int //
compute_exit_code(const char* status_msg) {
if (!status_msg) {
return 0;
}
@@ -177,7 +180,8 @@ int compute_exit_code(const char* status_msg) {
return strstr(status_msg, "internal error:") ? 2 : 1;
}
int main(int argc, char** argv) {
int //
main(int argc, char** argv) {
#if defined(WUFFS_EXAMPLE_USE_SECCOMP)
prctl(PR_SET_SECCOMP, SECCOMP_MODE_STRICT);
#endif