rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

whitespace fixes

Browse source
This commit is contained in:
David Lamparter 2016-06-22 13:44:56 +02:00
parent 1c0652db2d
commit 48535d02bd
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/capnpc-c.c
View file

@ -576,7 +576,7 @@ static void get_member(struct str *func, struct field *f, const char *ptr, const
str_addf(func, "%s = (int32_t) ((int32_t)capn_read32(%s, %d))%s;\n", var, ptr, 4*f->f.slot.offset, xor); str_addf(func, "%s = (int32_t) ((int32_t)capn_read32(%s, %d))%s;\n", var, ptr, 4*f->f.slot.offset, xor);
return; return;
case Type_int64: case Type_int64:
str_addf(func, "%s = (int64_t)((int64_t)(capn_read64(%s, %d))%s);\n", var, ptr, 8*f->f.slot.offset, xor); str_addf(func, "%s = (int64_t) ((int64_t)(capn_read64(%s, %d))%s);\n", var, ptr, 8*f->f.slot.offset, xor);
return; return;
case Type_uint8: case Type_uint8:
str_addf(func, "%s = capn_read8(%s, %d)%s;\n", var, ptr, f->f.slot.offset, xor); str_addf(func, "%s = capn_read8(%s, %d)%s;\n", var, ptr, f->f.slot.offset, xor);

2
lib/capn-malloc.c
View file

@ -17,7 +17,7 @@
/* Visual Studio notes: /* Visual Studio notes:
* Unless capn_segment is defined with __declspec(align(64)), check_segment_alignment * Unless capn_segment is defined with __declspec(align(64)), check_segment_alignment
* Fails to compile in x86 mode, as (sizeof(struct capn_segment)&7) -> (44 & 7) evaluates to 4 * Fails to compile in x86 mode, as (sizeof(struct capn_segment)&7) -> (44 & 7) evaluates to 4
* Compiles in x64 mode, as (sizeof(struct capn_segment)&7) -> (80 & 7) evaluates to 0 * Compiles in x64 mode, as (sizeof(struct capn_segment)&7) -> (80 & 7) evaluates to 0
*/ */
struct check_segment_alignment { struct check_segment_alignment {
unsigned int foo : (sizeof(struct capn_segment)&7) ? -1 : 1; unsigned int foo : (sizeof(struct capn_segment)&7) ? -1 : 1;

10
lib/capnp_c.h
View file

@ -15,7 +15,7 @@
#include <stdio.h> #include <stdio.h>
#include <endian.h> #include <endian.h>
// ssize_t is not defined in stdint.h in MSVC. // ssize_t is not defined in stdint.h in MSVC.
#ifdef _MSC_VER #ifdef _MSC_VER
typedef intmax_t ssize_t; typedef intmax_t ssize_t;
#endif #endif
@ -356,12 +356,12 @@ CAPN_INLINE int capn_write1(capn_ptr p, int off, int val) {
if (off >= p.datasz*8) { if (off >= p.datasz*8) {
return -1; return -1;
} else if (val) { } else if (val) {
uint8_t tmp = (uint8_t)(1 << ( off & 7)); uint8_t tmp = (uint8_t)(1 << (off & 7));
( (uint8_t*)p.data )[off>>3] |= tmp; ((uint8_t*) p.data)[off >> 3] |= tmp;
return 0; return 0;
} else { } else {
uint8_t tmp = (uint8_t)(~(1 << ( off & 7))); uint8_t tmp = (uint8_t)(~(1 << (off & 7)));
((uint8_t*)p.data)[off>>3] &= tmp; ((uint8_t*) p.data)[off >> 3] &= tmp;
return 0; return 0;
} }
} }