fumiama/simple-protobuf
1
0
Fork 0
mirror of https://github.com/fumiama/simple-protobuf.git synced 2026-06-25 05:20:23 +08:00
Code Activity

统一为32位

Browse Source
This commit is contained in:
fumiama
2021-05-18 22:42:44 +08:00
parent 2694f14433
commit 3c5ba54d40
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
protobuf.c
View File

@@ -6,9 +6,9 @@
//#define DEBUG //#define DEBUG
static uint64_t read_num(FILE* fp) { static uint32_t read_num(FILE* fp) {
uint8_t c; uint8_t c;
uint64_t n = 0; uint32_t n = 0;
uint8_t i = 0; uint8_t i = 0;
do { do {
c = fgetc(fp); c = fgetc(fp);
@@ -17,12 +17,12 @@ static uint64_t read_num(FILE* fp) {
return n; return n;
} }
static int write_num(FILE* fp, uint64_t n) { static int write_num(FILE* fp, uint32_t n) {
char* c = (char*)(&n); char* c = (char*)(&n);
int i = 0; int i = 0;
while(n > 0) { while(n > 0) {
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
int ch = c[7] & 0x7f; int ch = c[3] & 0x7f;
#else #else
int ch = *c & 0x7f; int ch = *c & 0x7f;
#endif #endif
@@ -35,11 +35,11 @@ static int write_num(FILE* fp, uint64_t n) {
} }
SIMPLE_PB* get_pb(FILE* fp) { SIMPLE_PB* get_pb(FILE* fp) {
uint64_t struct_len = read_num(fp); uint32_t struct_len = read_num(fp);
if(struct_len > 1) { if(struct_len > 1) {
SIMPLE_PB* spb = malloc(struct_len + sizeof(uint64_t)); SIMPLE_PB* spb = malloc(struct_len + sizeof(uint32_t));
#ifdef DEBUG #ifdef DEBUG
printf("Malloc %llu + %lu bytes.\n", struct_len, sizeof(uint64_t)); printf("Malloc %llu + %lu bytes.\n", struct_len, sizeof(uint32_t));
#endif #endif
if(spb) { if(spb) {
spb->len = struct_len; spb->len = struct_len;
@@ -47,8 +47,8 @@ SIMPLE_PB* get_pb(FILE* fp) {
char* end = p + struct_len; char* end = p + struct_len;
memset(p, 0, struct_len); memset(p, 0, struct_len);
while(p < end) { while(p < end) {
uint64_t offset = read_num(fp); uint32_t offset = read_num(fp);
uint64_t data_len = read_num(fp); uint32_t data_len = read_num(fp);
#ifdef DEBUG #ifdef DEBUG
printf("Offset: %llu, data_len: %llu.\n", offset, data_len); printf("Offset: %llu, data_len: %llu.\n", offset, data_len);
#endif #endif
@@ -61,8 +61,8 @@ SIMPLE_PB* get_pb(FILE* fp) {
return NULL; return NULL;
} }
int set_pb(FILE* fp, uint64_t* items_len, uint64_t struct_len, void* target) { int set_pb(FILE* fp, uint32_t* items_len, uint32_t struct_len, void* target) {
uint64_t offset = 0; uint32_t offset = 0;
uint32_t i = 0; uint32_t i = 0;
char* p = (char*)target; char* p = (char*)target;
write_num(fp, struct_len); write_num(fp, struct_len);
@@ -70,7 +70,7 @@ int set_pb(FILE* fp, uint64_t* items_len, uint64_t struct_len, void* target) {
printf("struct_len: %llu bytes.\n", struct_len); printf("struct_len: %llu bytes.\n", struct_len);
#endif #endif
while(offset < struct_len) { while(offset < struct_len) {
uint64_t data_len = items_len[i++]; uint32_t data_len = items_len[i++];
write_num(fp, data_len); write_num(fp, data_len);
char* this = p + offset; char* this = p + offset;
offset += data_len; offset += data_len;
@@ -81,11 +81,11 @@ int set_pb(FILE* fp, uint64_t* items_len, uint64_t struct_len, void* target) {
return i; return i;
} }
//uint64_t struct_size, uint32_t items_cnt, void* item_addr1, void* item_addr2... //uint32_t struct_size, uint32_t items_cnt, void* item_addr1, void* item_addr2...
uint64_t* align_struct(uint64_t struct_size, uint32_t items_cnt, ...) { uint32_t* align_struct(uint32_t struct_size, uint32_t items_cnt, ...) {
va_list list; va_list list;
va_start(list, items_cnt); va_start(list, items_cnt);
uint64_t* items_len = malloc(struct_size*sizeof(uint64_t)); uint32_t* items_len = malloc(struct_size*sizeof(uint32_t));
if(items_len) { if(items_len) {
void* this; void* this;
void* next = va_arg(list, void*); void* next = va_arg(list, void*);

8
simple_protobuf.h
View File

@@ -4,14 +4,14 @@
#include <stdint.h> #include <stdint.h>
struct SIMPLE_PB { struct SIMPLE_PB {
uint64_t len; uint32_t len;
char target[]; char target[];
}; };
typedef struct SIMPLE_PB SIMPLE_PB; typedef struct SIMPLE_PB SIMPLE_PB;
SIMPLE_PB* get_pb(FILE* fp); SIMPLE_PB* get_pb(FILE* fp);
int set_pb(FILE* fp, uint64_t* items_len, uint64_t struct_len, void* target); int set_pb(FILE* fp, uint32_t* items_len, uint32_t struct_len, void* target);
//uint64_t struct_size, uint32_t items_cnt, void* item_addr1, void* item_addr2... //uint32_t struct_size, uint32_t items_cnt, void* item_addr1, void* item_addr2...
uint64_t* align_struct(uint64_t struct_size, uint32_t items_cnt, ...); uint32_t* align_struct(uint32_t struct_size, uint32_t items_cnt, ...);
#endif #endif

4
test.c
View File

@@ -18,9 +18,9 @@ int main() {
t.c = 0xCCDDEE; t.c = 0xCCDDEE;
t.d = 0xABCDEF12345678; t.d = 0xABCDEF12345678;
strcpy(t.e, "Hello world! This is a message from simple protobuf."); strcpy(t.e, "Hello world! This is a message from simple protobuf.");
uint64_t* items_len = align_struct(sizeof(struct TEST), 5, &t.a, &t.b, &t.c, &t.d, &t.e); uint32_t* items_len = align_struct(sizeof(struct TEST), 5, &t.a, &t.b, &t.c, &t.d, &t.e);
for(int i = 0; i < 5; i++) { for(int i = 0; i < 5; i++) {
printf("Item %d has aligned size %llu\n", i, items_len[i]); printf("Item %d has aligned size %u\n", i, items_len[i]);
} }
FILE* fp = fopen("test.sp", "wb"); FILE* fp = fopen("test.sp", "wb");
if(fp) { if(fp) {