fumiama/simple-dict
1
0
Fork 0
mirror of https://github.com/fumiama/simple-dict.git synced 2026-06-18 01:32:59 +08:00
Code Activity

skip null bytes

Browse Source
This commit is contained in:
fumiama
2022-02-06 15:14:46 +08:00
parent 14a9a02e31
commit d042193ef6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server.c
View File

@@ -170,11 +170,12 @@ static int send_all(THREADTIMER *timer) {
return re; return re;
} }
#define has_next(fp, ch) ((ch=getc(fp)),(feof(fp)?0:(ungetc(ch,fp),1))) #define has_next(fp, ch) ((ch=getc(fp)),(feof(fp)?0:(ch?ungetc(ch,fp):1)))
static void init_dict_pool(FILE *fp) { static void init_dict_pool(FILE *fp) {
int ch; int ch;
while(has_next(fp, ch)) { while(has_next(fp, ch)) {
if(!ch) continue; // skip null bytes
SIMPLE_PB* spb = get_pb(fp); SIMPLE_PB* spb = get_pb(fp);
DICT* d = (DICT*)spb->target; DICT* d = (DICT*)spb->target;
DICT* dnew = (DICT*)malloc(sizeof(DICT)); DICT* dnew = (DICT*)malloc(sizeof(DICT));
@@ -219,6 +220,7 @@ static int s1_get(THREADTIMER *timer) {
} }
while(has_next(fp, ch)) { while(has_next(fp, ch)) {
if(!ch) continue; // skip null bytes
SIMPLE_PB* spb = get_pb(fp); SIMPLE_PB* spb = get_pb(fp);
DICT* d = (DICT*)spb->target; DICT* d = (DICT*)spb->target;
if(!strcmp(timer->dat, d->key)) { if(!strcmp(timer->dat, d->key)) {
@@ -291,6 +293,7 @@ static int s3_set_data(THREADTIMER *timer) {
static void del(FILE *fp, char* key, int len, char ret[4]) { static void del(FILE *fp, char* key, int len, char ret[4]) {
int ch; int ch;
while(has_next(fp, ch)) { while(has_next(fp, ch)) {
if(!ch) continue; // skip null bytes
SIMPLE_PB* spb = get_pb(fp); SIMPLE_PB* spb = get_pb(fp);
DICT* d = (DICT*)spb->target; DICT* d = (DICT*)spb->target;
if(!memcmp(key, d->key, len)) { if(!memcmp(key, d->key, len)) {