ziggi/helmetc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

indent

Browse Source
This commit is contained in:
Олег Бородин
2025-10-16 00:08:17 +02:00
parent 5dca71f775
commit fc578f6e48
26 changed files with 994 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libxtools/bstream.c
+14 -6
View File
@@ -14,7 +14,7 @@
#define STREAM_INITCAPA 128
bstream_t* bstream_init(bstream_t* stream) {
bstream_t* bstream_init(bstream_t * stream) {
stream->data = malloc(STREAM_INITCAPA);
stream->wpos = 0;
stream->rpos = 0;
@@ -24,7 +24,9 @@ bstream_t* bstream_init(bstream_t* stream) {
bstream_t* new_bstream() {
bstream_t* stream = malloc(sizeof(bstream_t));
if (stream == NULL) return NULL;
if (stream == NULL)
return NULL;
stream->data = malloc(STREAM_INITCAPA);
stream->wpos = 0;
stream->rpos = 0;
@@ -43,6 +45,7 @@ size_t bstream_dump(bstream_t * stream) {
ssize_t bstream_write(bstream_t * stream, void* buf, size_t size) {
if ((stream->wpos + size) > stream->capa) {
size_t newcapa = stream->capa * 2;
stream->data = realloc(stream->data, (size_t)newcapa);
stream->capa = newcapa;
}
@@ -50,11 +53,12 @@ ssize_t bstream_write(bstream_t * stream, void* buf, size_t size) {
memcpy(&(stream->data[stream->wpos]), buf, (size_t)size);
}
stream->wpos += size;
return (ssize_t)size;
return (ssize_t) size;
}
ssize_t bstream_read(bstream_t * stream, void* buf, size_t size) {
size_t unread = stream->wpos - stream->rpos;
if (size > unread) {
size = unread;
}
@@ -62,7 +66,7 @@ ssize_t bstream_read(bstream_t * stream, void* buf, size_t size) {
memcpy(buf, &(stream->data[stream->rpos]), size);
}
stream->rpos += size;
return (ssize_t)size;
return (ssize_t) size;
}
#define RBUF_SIZE 64
@@ -70,14 +74,18 @@ ssize_t bstream_read(bstream_t * stream, void* buf, size_t size) {
ssize_t bstream_fread(bstream_t * stream, char* filename) {
int fd = open(filename, O_RDONLY);
if (fd < 0) return (ssize_t)-1;
if (fd < 0)
return (ssize_t) - 1;
char buf[RBUF_SIZE];
size_t size = 0;
size_t rsize = 0;
while ((size = (size_t)read(fd, buf, RBUF_SIZE)) > 0) {
if ((stream->wpos + size) > stream->capa) {
size_t newcapa = stream->capa * 2;
stream->data = realloc(stream->data, (size_t)newcapa);
stream->capa = newcapa;
}
@@ -86,7 +94,7 @@ ssize_t bstream_fread(bstream_t * stream, char* filename) {
rsize += size;
}
close(fd);
return (ssize_t)rsize;
return (ssize_t) rsize;
}
char bstream_getc(bstream_t * stream) {
libxtools/bstream_test.c
+7 -3
View File
@@ -11,35 +11,39 @@
void test_rwrite(void) {
bstream_t stream;
bstream_init(&stream);
char* data = "_123456789";
size_t dsize = strlen(data);
ssize_t wsize = 0;
size_t count = 3;
for (size_t i = 0; i < count; i++) {
wsize += bstream_write(&stream, data, dsize);
}
printf("wsize = %ld, data = [%s]\n", wsize, stream.data);
MASSERT(stream.wpos == dsize * count);
MASSERT(wsize == (ssize_t)(dsize * count));
MASSERT(wsize == (ssize_t) (dsize * count));
size_t bsize = bstream_wpos(&stream);
char* buf = malloc((size_t)bsize + (size_t)1);
memset(buf, 0, (size_t)bsize + (size_t)1);
ssize_t rsize = bstream_read(&stream, buf, bsize);
printf("rsize = %lu, buf = [%s]\n", rsize, buf);
MASSERT(wsize == (ssize_t)(dsize * count));
MASSERT(wsize == (ssize_t) (dsize * count));
MASSERT(rsize == wsize);
bstream_destroy(&stream);
}
int main(int argc, char **argv) {
int main(int argc, char** argv) {
(void)argc;
(void)argv;
test_rwrite();
libxtools/clcomp.c
+12 -9
View File
@@ -15,12 +15,13 @@
static char* strcopy(char* src) {
size_t srcsize = strlen(src) + 1;
char* dst = malloc(srcsize);
memset(dst, '\0', srcsize);
strcpy(dst, src);
return dst;
}
void clcomp_init(clcomp_t* comp, vmapper_t* vmapper, char** argv, int argc) {
void clcomp_init(clcomp_t * comp, vmapper_t * vmapper, char** argv, int argc) {
comp->argv = argv;
comp->argc = argc;
comp->argn = 1;
@@ -32,17 +33,18 @@ void clcomp_init(clcomp_t* comp, vmapper_t* vmapper, char** argv, int argc) {
}
}
char* clcomp_geterr(clcomp_t* comp) {
char* clcomp_geterr(clcomp_t * comp) {
return comp->errstr;
}
int clcomp_gettok(clcomp_t* comp, char* token) {
int clcomp_gettok(clcomp_t * comp, char* token) {
if (comp->argn > comp->argc) {
strcpy(token, "EOF");
return TOKEN_ENDF;
}
int toktype = cllexer_gettok(&(comp->lexer), token);
if (toktype == TOKEN_ENDF && comp->argn != comp->argc) {
comp->argn++;
cllexer_init(&(comp->lexer), comp->argv[comp->argn]);
@@ -52,26 +54,27 @@ int clcomp_gettok(clcomp_t* comp, char* token) {
return toktype;
}
int clcomp_parse(clcomp_t* comp) {
int clcomp_parse(clcomp_t * comp) {
char token[1024];
int toktype = TOKEN_NULL;
int i = 0;
char* key = NULL;
char* val = NULL;
while (toktype != TOKEN_ENDF) {
toktype = clcomp_gettok(comp, token);
i++;
printf("cllexer_parse res: %d: %d [%s]\n", i, toktype, token);
switch (comp->pos) {
case 0: {
case 0:{
if (toktype == TOKEN_PREF) {
comp->pos = 1;
printf("pos %d: TOKEN_PREF %s\n", comp->pos, token);
}
continue;
}
case 1: {
case 1:{
if (toktype == TOKEN_WORD) {
comp->pos = 2;
key = strcopy(token);
@@ -82,7 +85,7 @@ int clcomp_parse(clcomp_t* comp) {
goto error;
}
}
case 2: {
case 2:{
if (toktype == TOKEN_DELIM || toktype == TOKEN_SPACE) {
comp->pos = 3;
printf("pos %d: TOKEN_DELIM %s\n", comp->pos, token);
@@ -92,7 +95,7 @@ int clcomp_parse(clcomp_t* comp) {
goto error;
}
}
case 3: {
case 3:{
if (toktype == TOKEN_WORD) {
comp->pos = 0;
printf("pos %d: TOKEN_WORD %s\n", comp->pos, token);
@@ -119,6 +122,6 @@ int clcomp_parse(clcomp_t* comp) {
}
void clcomp_destroy(clcomp_t* clcomp) {
void clcomp_destroy(clcomp_t * clcomp) {
(void)clcomp;
}
libxtools/clcomp.h
+5 -5
View File
@@ -20,9 +20,9 @@ typedef struct {
char* errstr;
} clcomp_t;
void clcomp_init(clcomp_t* clcomp, vmapper_t* vmapper, char** argv, int argc);
int clcomp_gettok(clcomp_t* clcomp, char* token);
int clcomp_parse(clcomp_t* clcomp);
char* clcomp_geterr(clcomp_t* clcomp);
void clcomp_destroy(clcomp_t* clcomp);
void clcomp_init(clcomp_t * clcomp, vmapper_t * vmapper, char** argv, int argc);
int clcomp_gettok(clcomp_t * clcomp, char* token);
int clcomp_parse(clcomp_t * clcomp);
char* clcomp_geterr(clcomp_t * clcomp);
void clcomp_destroy(clcomp_t * clcomp);
#endif
libxtools/clcomp_test.c
+4 -2
View File
@@ -12,17 +12,19 @@
#include <clcomp.h>
#include <vmapper.h>
int main(int argc, char **argv) {
int main(int argc, char** argv) {
(void)argc;
(void)argv;
char*_argv[] = { argv[0], "--qwerty=12345", "--foo=bar" };
char* _argv[] = { argv[0], "--qwerty=12345", "--foo=bar" };
int _argc = 2;
vmapper_t vmapper;
vmapper_init(&vmapper);
clcomp_t clcomp;
clcomp_init(&clcomp, &vmapper, _argv, _argc);
clcomp_parse(&clcomp);
libxtools/clconfig.c
+7 -6
View File
@@ -10,19 +10,21 @@
#include <vmapper.h>
#include <clconfig.h>
void clconfig_init(clconfig_t* clconfig, int argc, char **argv) {
void clconfig_init(clconfig_t * clconfig, int argc, char** argv) {
clconfig->errstr = NULL;
vmapper_init(&(clconfig->vmapper));
clcomp_init(&(clconfig->comp), &(clconfig->vmapper), argv, argc);
}
int clconfig_bind(clconfig_t* clconfig, int type, char* name, void* ptr) {
int clconfig_bind(clconfig_t * clconfig, int type, char* name, void* ptr) {
vmapper_t* vmapper = &(clconfig->vmapper);
return vmapper_bind(vmapper, type, name, ptr);
}
int clconfig_parse(clconfig_t* clconfig) {
int clconfig_parse(clconfig_t * clconfig) {
int res = clcomp_parse(&(clconfig->comp));
if (res < 0) {
if ((clconfig->errstr = clcomp_geterr(&(clconfig->comp))) == NULL) {
clconfig->errstr = "Undefined command line error";
@@ -31,12 +33,11 @@ int clconfig_parse(clconfig_t* clconfig) {
return res;
}
char* clconfig_geterr(clconfig_t* clconfig) {
char* clconfig_geterr(clconfig_t * clconfig) {
return clconfig->errstr;
}
void clconfig_destroy(clconfig_t* clconfig) {
void clconfig_destroy(clconfig_t * clconfig) {
clcomp_destroy(&(clconfig->comp));
vmapper_destroy(&(clconfig->vmapper));
}
libxtools/clconfig.h
+6 -6
View File
@@ -14,7 +14,7 @@ typedef struct {
clcomp_t comp;
vmapper_t vmapper;
int argc;
char ** argv;
char** argv;
char* errstr;
} clconfig_t;
@@ -22,10 +22,10 @@ typedef struct {
#define GCONF_INT MAPPER_INT
#define GCONF_BOOL MAPPER_BOOL
void clconfig_init(clconfig_t* clconfig, int argc, char **argv);
int clconfig_bind(clconfig_t* clconfig, int type, char* name, void* ptr);
int clconfig_parse(clconfig_t* clconfig);
char* clconfig_geterr(clconfig_t* clconfig);
void clconfig_destroy(clconfig_t* clconfig);
void clconfig_init(clconfig_t * clconfig, int argc, char** argv);
int clconfig_bind(clconfig_t * clconfig, int type, char* name, void* ptr);
int clconfig_parse(clconfig_t * clconfig);
char* clconfig_geterr(clconfig_t * clconfig);
void clconfig_destroy(clconfig_t * clconfig);
#endif
libxtools/clconfig_test.c
+4 -2
View File
@@ -9,14 +9,15 @@
#include <clconfig.h>
#include <massert.h>
int main(int argc, char **argv) {
int main(int argc, char** argv) {
(void)argc;
(void)argv;
char*_argv[] = { argv[0], "--strkey=num5678", "--intkey=12345" };
char* _argv[] = { argv[0], "--strkey=num5678", "--intkey=12345" };
int _argc = 2;
clconfig_t clconfig;
clconfig_init(&clconfig, _argc, _argv);
int intkey = 0;
@@ -26,6 +27,7 @@ int main(int argc, char **argv) {
clconfig_bind(&clconfig, GCONF_STR, "strkey", &strkey);
int res = clconfig_parse(&clconfig);
if (res < 0) {
printf("error: %s\n", clconfig_geterr(&clconfig));
}
libxtools/cllexer.c
+22 -18
View File
@@ -34,7 +34,7 @@ static int get_ltype(char newletter) {
return LTYPE_LETTER;
}
void cllexer_init(cllexer_t* lexer, char* arg) {
void cllexer_init(cllexer_t * lexer, char* arg) {
lexer->arg = arg;
lexer->rpos = 0;
lexer->tpos = 0;
@@ -42,14 +42,14 @@ void cllexer_init(cllexer_t* lexer, char* arg) {
lexer->newletter = '\0';
}
static void cllexer_getletter(cllexer_t* lexer, char* arg, int size) {
static void cllexer_getletter(cllexer_t * lexer, char* arg, int size) {
lexer->newletter = EOF;
if (lexer->rpos < size) {
lexer->newletter = arg[lexer->rpos++];
}
}
int cllexer_gettok(cllexer_t* lexer, char* token) {
int cllexer_gettok(cllexer_t * lexer, char* token) {
char* arg = lexer->arg;
size_t size = strlen(arg);
@@ -58,20 +58,21 @@ int cllexer_gettok(cllexer_t* lexer, char* token) {
lexer->newletter = arg[lexer->rpos++];
int ltype = get_ltype(lexer->newletter);
int newcontext = LCONTEXT_ENDFL;
switch (ltype) {
case LTYPE_PREFIX: {
case LTYPE_PREFIX:{
newcontext = LCONTEXT_PREFIX;
break;
}
case LTYPE_DELIM: {
case LTYPE_DELIM:{
newcontext = LCONTEXT_DELIM;
break;
}
case LTYPE_LETTER: {
case LTYPE_LETTER:{
newcontext = LCONTEXT_WORD;
break;
}
case LTYPE_EOF: {
case LTYPE_EOF:{
newcontext = LCONTEXT_ENDFL;
break;
}
@@ -84,19 +85,20 @@ int cllexer_gettok(cllexer_t* lexer, char* token) {
int ltype = get_ltype(lexer->newletter);
switch (lexer->currcontext) {
case LCONTEXT_ENDFL: {
case LCONTEXT_ENDFL:{
lexer->currcontext = LCONTEXT_ENDFL;
break;
}
case LCONTEXT_DELIM: {
case LCONTEXT_DELIM:{
int newcontext = lexer->currcontext;
switch (ltype) {
case LTYPE_PREFIX:
case LTYPE_LETTER: {
case LTYPE_LETTER:{
newcontext = LCONTEXT_WORD;
break;
}
case LTYPE_EOF: {
case LTYPE_EOF:{
newcontext = LCONTEXT_ENDFL;
break;
}
@@ -109,18 +111,19 @@ int cllexer_gettok(cllexer_t* lexer, char* token) {
}
break;
}
case LCONTEXT_PREFIX: {
case LCONTEXT_PREFIX:{
int newcontext = lexer->currcontext;
switch (ltype) {
case LTYPE_DELIM: {
case LTYPE_DELIM:{
newcontext = LCONTEXT_DELIM;
break;
}
case LTYPE_LETTER: {
case LTYPE_LETTER:{
newcontext = LCONTEXT_WORD;
break;
}
case LTYPE_EOF: {
case LTYPE_EOF:{
newcontext = LCONTEXT_ENDFL;
break;
}
@@ -133,14 +136,15 @@ int cllexer_gettok(cllexer_t* lexer, char* token) {
}
break;
}
case LCONTEXT_WORD: {
case LCONTEXT_WORD:{
int newcontext = lexer->currcontext;
switch (ltype) {
case LTYPE_DELIM: {
case LTYPE_DELIM:{
newcontext = LCONTEXT_DELIM;
break;
}
case LTYPE_EOF: {
case LTYPE_EOF:{
newcontext = LCONTEXT_ENDFL;
break;
}
libxtools/cllexer.h
+2 -2
View File
@@ -24,7 +24,7 @@ typedef struct {
char newletter;
} cllexer_t;
void cllexer_init(cllexer_t* lexer, char* arg);
int cllexer_gettok(cllexer_t* lexer, char* token);
void cllexer_init(cllexer_t * lexer, char* arg);
int cllexer_gettok(cllexer_t * lexer, char* token);
#endif
libxtools/cllexer_test.c
+3 -1
View File
@@ -10,18 +10,20 @@
#include <cllexer.h>
int main(int argc, char **argv) {
int main(int argc, char** argv) {
(void)argc;
(void)argv;
char* arg = "--qwerty=-num-12345";
cllexer_t lex;
cllexer_init(&lex, arg);
char token[1024];
int toktype = TOKEN_NULL;
int i = 0;
while (toktype != TOKEN_ENDF) {
toktype = cllexer_gettok(&lex, token);
printf("cllexer_gettok res: %d: %d [%s]\n", i, toktype, token);
libxtools/massert.c
+1 -1
View File
@@ -8,7 +8,7 @@
#include <massert.h>
void x__assert (char* path, int line, const char* func) {
void x__assert(char* path, int line, const char* func) {
printf("%s:%d: assert error in %s\n", path, line, func);
exit(1);
}
libxtools/massert.h
+1 -1
View File
@@ -12,5 +12,5 @@
#define MASSERT(expr) if (!(expr)) \
{ x__assert(__FILE__, __LINE__, (const char*)__func__); }
void x__assert (char* path, int line, const char* func);
void x__assert(char* path, int line, const char* func);
#endif
libxtools/tccomp.c
+15 -11
View File
@@ -27,14 +27,17 @@
static char* strcopy(char* src) {
size_t srcsize = strlen(src) + 1;
char* dst = malloc(srcsize);
memset(dst, '\0', srcsize);
strcpy(dst, src);
return dst;
}
tccomp_t * new_tccomp(tclexer_t * lexer, vmapper_t* vmapper) {
tccomp_t *comp = malloc(sizeof(tccomp_t));
if (comp == NULL) return NULL;
tccomp_t* new_tccomp(tclexer_t * lexer, vmapper_t * vmapper) {
tccomp_t* comp = malloc(sizeof(tccomp_t));
if (comp == NULL)
return NULL;
comp->lexer = lexer;
comp->vmapper = vmapper;
comp->pos = 0;
@@ -43,7 +46,7 @@ tccomp_t * new_tccomp(tclexer_t * lexer, vmapper_t* vmapper) {
}
void tccomp_init(tccomp_t * comp, tclexer_t * lexer, vmapper_t* vmapper) {
void tccomp_init(tccomp_t * comp, tclexer_t * lexer, vmapper_t * vmapper) {
comp->lexer = lexer;
comp->vmapper = vmapper;
comp->pos = 0;
@@ -72,7 +75,7 @@ int tccomp_parse(tccomp_t * comp) {
}
switch (comp->pos) {
case 0: {
case 0:{
if (toktype == TOKEN_NEWLN) {
comp->pos = 0;
break;
@@ -84,14 +87,14 @@ int tccomp_parse(tccomp_t * comp) {
key = strcopy(token);
break;
}
case 1: {
case 1:{
if (toktype != TOKEN_OPER) {
return -1;
}
comp->pos++;
break;
}
case 2: {
case 2:{
if (toktype != TOKEN_WORD) {
return -1;
}
@@ -99,7 +102,7 @@ int tccomp_parse(tccomp_t * comp) {
val = strcopy(token);
break;
}
case 3: {
case 3:{
if (toktype != TOKEN_NEWLN && toktype != TOKEN_ENDFL) {
return -1;
}
@@ -111,15 +114,16 @@ int tccomp_parse(tccomp_t * comp) {
break;
}
}
if (toktype == TOKEN_ENDFL) break;
if (toktype == TOKEN_ENDFL)
break;
}
return 0;
}
void tccomp_destroy(tccomp_t* comp) {
void tccomp_destroy(tccomp_t * comp) {
(void)comp;
}
void tccomp_free(tccomp_t* comp) {
void tccomp_free(tccomp_t * comp) {
free(comp);
}
libxtools/tccomp.h
+5 -5
View File
@@ -15,10 +15,10 @@ typedef struct {
int lnum;
} tccomp_t;
tccomp_t * new_tccomp(tclexer_t * lexer, vmapper_t* vmapper);
void tccomp_init(tccomp_t* comp, tclexer_t* lexer, vmapper_t* vmapper);
int tccomp_parse(tccomp_t* comp);
void tccomp_destroy(tccomp_t* comp);
void tccomp_free(tccomp_t* comp);
tccomp_t* new_tccomp(tclexer_t * lexer, vmapper_t * vmapper);
void tccomp_init(tccomp_t * comp, tclexer_t * lexer, vmapper_t * vmapper);
int tccomp_parse(tccomp_t * comp);
void tccomp_destroy(tccomp_t * comp);
void tccomp_free(tccomp_t * comp);
#endif
libxtools/tccomp_test.c
+3
View File
@@ -25,12 +25,15 @@ int main(void) {
bstream_init(&stream);
tclexer_t lexer;
tclexer_init(&lexer, &stream);
vmapper_t vmapper;
vmapper_init(&vmapper);
tccomp_t comp;
tccomp_init(&comp, &lexer, &vmapper);
bstream_write(&stream, src, strlen(src));
libxtools/tclexer.c
+6 -3
View File
@@ -47,7 +47,9 @@ static int get_ltype(char letter) {
tclexer_t* new_tclexer(bstream_t * stream) {
tclexer_t* lexer = malloc(sizeof(tclexer_t));
if (lexer == NULL) return NULL;
if (lexer == NULL)
return NULL;
lexer->stream = stream;
lexer->context = LEXCONT_UNDEF;
return lexer;
@@ -231,6 +233,7 @@ int tclexer_get_token(tclexer_t * lexer, char* token, int maxsize) {
case LEXCONT_UNDEF:
default:{
int newcontext = LEXCONT_UNDEF;
switch (ltype) {
case LTYPE_SPACE:{
newcontext = LEXCONT_SPACE;
@@ -267,10 +270,10 @@ int tclexer_get_token(tclexer_t * lexer, char* token, int maxsize) {
return TOKEN_ENDFL;
}
void tclexer_destroy(tclexer_t* lexer) {
void tclexer_destroy(tclexer_t * lexer) {
(void)lexer;
}
void tclexer_free(tclexer_t* lexer) {
void tclexer_free(tclexer_t * lexer) {
free(lexer);
}
libxtools/tclexer.h
+2 -2
View File
@@ -27,6 +27,6 @@ typedef struct {
tclexer_t* new_tclexer(bstream_t * stream);
void tclexer_init(tclexer_t * tclexer, bstream_t * stream);
int tclexer_get_token(tclexer_t * tclexer, char* token, int maxsize);
void tclexer_destroy(tclexer_t* lexer);
void tclexer_free(tclexer_t* lexer);
void tclexer_destroy(tclexer_t * lexer);
void tclexer_free(tclexer_t * lexer);
#endif
libxtools/tclexer_test.c
+3
View File
@@ -17,15 +17,18 @@ int main(void) {
char* src = " key1 = var1 # comment 1\nkey2 = var2 # comment 2 and 3\n# comment 4\nkey3 = var3";
bstream_t stream;
bstream_init(&stream);
bstream_write(&stream, src, strlen(src));
tclexer_t lexer;
tclexer_init(&lexer, &stream);
int token_typ = TOKEN_NULL;
char token[MAX_TOK_SIZE];
while ((token_typ = tclexer_get_token(&lexer, token, MAX_TOK_SIZE)) != TOKEN_ENDFL) {
printf("%d:[%s]\n", token_typ, token);
}
libxtools/tconfig.c
+7 -5
View File
@@ -11,29 +11,31 @@
#include <vmapper.h>
#include <tconfig.h>
void tconfig_init(tconfig_t* tconfig) {
void tconfig_init(tconfig_t * tconfig) {
bstream_init(&(tconfig->stream));
vmapper_init(&(tconfig->mapper));
tclexer_init(&(tconfig->lexer), &(tconfig->stream));
tccomp_init(&(tconfig->comp), &(tconfig->lexer), &(tconfig->mapper));
}
int tconfig_bind(tconfig_t* tconfig, int type, char* name, void* ptr) {
int tconfig_bind(tconfig_t * tconfig, int type, char* name, void* ptr) {
vmapper_t* vmapper = &(tconfig->mapper);
return vmapper_bind(vmapper, type, name, ptr);
}
ssize_t tconfig_read(tconfig_t* tconfig, char* filename) {
ssize_t tconfig_read(tconfig_t * tconfig, char* filename) {
bstream_t* stream = &(tconfig->stream);
return bstream_fread(stream, filename);
}
int tconfig_parse(tconfig_t* tconfig) {
int tconfig_parse(tconfig_t * tconfig) {
return tccomp_parse(&(tconfig->comp));
}
void tconfig_destroy(tconfig_t* tconfig) {
void tconfig_destroy(tconfig_t * tconfig) {
tccomp_destroy(&(tconfig->comp));
tclexer_destroy(&(tconfig->lexer));
bstream_destroy(&(tconfig->stream));
libxtools/tconfig.h
+5 -5
View File
@@ -22,10 +22,10 @@ typedef struct {
#define TCONF_INT MAPPER_INT
#define TCONF_BOOL MAPPER_BOOL
void tconfig_init(tconfig_t* tconfig);
int tconfig_bind(tconfig_t* tconfig, int type, char* name, void* ptr);
ssize_t tconfig_read(tconfig_t* tconfig, char* filename);
int tconfig_parse(tconfig_t* tconfig);
void tconfig_destroy(tconfig_t* tconfig);
void tconfig_init(tconfig_t * tconfig);
int tconfig_bind(tconfig_t * tconfig, int type, char* name, void* ptr);
ssize_t tconfig_read(tconfig_t * tconfig, char* filename);
int tconfig_parse(tconfig_t * tconfig);
void tconfig_destroy(tconfig_t * tconfig);
#endif
libxtools/tconfig_test.c
+4 -1
View File
@@ -10,12 +10,13 @@
#include <tconfig.h>
#include <massert.h>
int main(int argc, char **argv) {
int main(int argc, char** argv) {
(void)argc;
(void)argv;
tconfig_t tconfig;
tconfig_init(&tconfig);
int intkey = 0;
@@ -25,10 +26,12 @@ int main(int argc, char **argv) {
tconfig_bind(&tconfig, TCONF_STR, "strkey", &strkey);
ssize_t rsize = tconfig_read(&tconfig, "test.conf");
printf("%ld\n", rsize);
MASSERT(rsize > 0);
int res = tconfig_parse(&tconfig);
MASSERT(res == -1);
tconfig_destroy(&tconfig);
libxtools/vmapper.c
+45 -27
View File
@@ -12,6 +12,7 @@
static char* copystr(char* src) {
size_t srcsize = strlen(src) + 1;
char* dest = malloc(srcsize);
memset(dest, '\0', srcsize);
strcpy(dest, src);
return dest;
@@ -21,24 +22,27 @@ static char* copystr(char* src) {
static mlink_t* new_mlink_string(char* name, char** val) {
mlink_t* mlink = malloc(sizeof(mlink_t));
mlink->name = name;
mlink->vptr = (void*)val;
mlink->vptr = (void *)val;
mlink->type = MAPPER_STR;
return mlink;
}
static mlink_t* new_mlink_integer(char* name, int* val) {
mlink_t* mlink = malloc(sizeof(mlink_t));
mlink->name = name;
mlink->vptr = (void*)val;
mlink->vptr = (void *)val;
mlink->type = MAPPER_INT;
return mlink;
}
static mlink_t* new_mlink_bool(char* name, bool* val) {
mlink_t* mlink = malloc(sizeof(mlink_t));
mlink->name = name;
mlink->vptr = (void*)val;
mlink->vptr = (void *)val;
mlink->type = MAPPER_BOOL;
return mlink;
}
@@ -49,7 +53,9 @@ static mlink_t* new_mlink_bool(char* name, bool* val) {
vmapper_t* new_vmapper(void) {
vmapper_t* vmapper = malloc(sizeof(vmapper_t));
if (vmapper == NULL) return NULL;
if (vmapper == NULL)
return NULL;
vmapper->mlinks = malloc(sizeof(mlink_t) * MAPPER_INITCAPA);
vmapper->capa = MAPPER_INITCAPA;
vmapper->size = 0;
@@ -59,7 +65,7 @@ vmapper_t* new_vmapper(void) {
}
void vmapper_init(vmapper_t* vmapper) {
void vmapper_init(vmapper_t * vmapper) {
vmapper->mlinks = malloc(sizeof(mlink_t) * MAPPER_INITCAPA);
vmapper->capa = MAPPER_INITCAPA;
vmapper->size = 0;
@@ -71,97 +77,109 @@ void vmapper_init(vmapper_t* vmapper) {
#define RES_BIND_OK ((int)0)
#define RES_BIND_ERR ((int)-1)
int vmapper_check_capa(vmapper_t* vmapper) {
int vmapper_check_capa(vmapper_t * vmapper) {
if (vmapper->size == vmapper->capa) {
size_t newcapa = vmapper->capa * 2;
mlink_t** newmlinks = realloc(vmapper->mlinks, newcapa);
if (newmlinks == NULL) return RES_BIND_ERR;
if (newmlinks == NULL)
return RES_BIND_ERR;
vmapper->mlinks = newmlinks;
vmapper->capa = newcapa;
}
return RES_BIND_OK;
}
int vmapper_bind_string(vmapper_t* vmapper, char* name, char** val) {
int vmapper_bind_string(vmapper_t * vmapper, char* name, char** val) {
int res = 0;
if ((res = vmapper_check_capa(vmapper)) != RES_BIND_OK) {
return res;
}
mlink_t* mlink = new_mlink_string(name, val);
vmapper->mlinks[vmapper->size] = mlink;
vmapper->size++;
return RES_BIND_OK;
}
int vmapper_bind_int(vmapper_t* vmapper, char* name, int* val) {
int vmapper_bind_int(vmapper_t * vmapper, char* name, int* val) {
int res = 0;
if ((res = vmapper_check_capa(vmapper)) != RES_BIND_OK) {
return res;
}
mlink_t* mlink = new_mlink_integer(name, val);
vmapper->mlinks[vmapper->size] = mlink;
vmapper->size++;
return RES_BIND_OK;
}
int vmapper_bind_bool(vmapper_t* vmapper, char* name, bool* val) {
int vmapper_bind_bool(vmapper_t * vmapper, char* name, bool* val) {
int res = 0;
if ((res = vmapper_check_capa(vmapper)) != RES_BIND_OK) {
return res;
}
mlink_t* mlink = new_mlink_bool(name, val);
vmapper->mlinks[vmapper->size] = mlink;
vmapper->size++;
return RES_BIND_OK;
}
int vmapper_set_int(vmapper_t* vmapper, char* key, char* val) {
int vmapper_set_int(vmapper_t * vmapper, char* key, char* val) {
for (size_t i = 0; i < vmapper->size; i++) {
mlink_t* mlink = vmapper->mlinks[i];
if (mlink->type == MAPPER_INT && strcmp(mlink->name, key) == 0) {
char* eptr = NULL;
*(int*)(mlink->vptr) = (int)strtol(val, &eptr, 10);
*(int *)(mlink->vptr) = (int)strtol(val, &eptr, 10);
}
}
return 0;
}
int vmapper_set_string(vmapper_t* vmapper, char* key, char* val) {
int vmapper_set_string(vmapper_t * vmapper, char* key, char* val) {
for (size_t i = 0; i < vmapper->size; i++) {
mlink_t* mlink = vmapper->mlinks[i];
if (mlink->type == MAPPER_STR && strcmp(mlink->name, key) == 0) {
*(char**)(mlink->vptr) = copystr(val);
*(char **)(mlink->vptr) = copystr(val);
}
}
return 0;
}
int vmapper_set_bool(vmapper_t* vmapper, char* key, char* val) {
int vmapper_set_bool(vmapper_t * vmapper, char* key, char* val) {
for (size_t i = 0; i < vmapper->size; i++) {
mlink_t* mlink = vmapper->mlinks[i];
if (mlink->type == MAPPER_BOOL && strcmp(mlink->name, key) == 0) {
if (strcmp(val, "true") == 0) {
*(bool*)(mlink->vptr) = true;
*(bool *)(mlink->vptr) = true;
}
if (strcmp(val, "false") == 0) {
*(bool*)(mlink->vptr) = false;
*(bool *)(mlink->vptr) = false;
}
}
}
return 0;
}
int vmapper_bind(vmapper_t* vmapper, int type, char* name, void* val) {
int vmapper_bind(vmapper_t * vmapper, int type, char* name, void* val) {
switch (type) {
case MAPPER_STR: {
return vmapper_bind_string(vmapper, name, (char**)val);
case MAPPER_STR:{
return vmapper_bind_string(vmapper, name, (char **)val);
}
case MAPPER_INT: {
return vmapper_bind_int(vmapper, name, (int*)val);
case MAPPER_INT:{
return vmapper_bind_int(vmapper, name, (int *)val);
}
case MAPPER_BOOL: {
return vmapper_bind_bool(vmapper, name, (bool*)val);
case MAPPER_BOOL:{
return vmapper_bind_bool(vmapper, name, (bool *)val);
}
}
return 0;
@@ -169,14 +187,14 @@ int vmapper_bind(vmapper_t* vmapper, int type, char* name, void* val) {
int vmapper_set(vmapper_t* vmapper, char* key, char* val) {
int vmapper_set(vmapper_t * vmapper, char* key, char* val) {
vmapper_set_int(vmapper, key, val);
vmapper_set_string(vmapper, key, val);
vmapper_set_bool(vmapper, key, val);
return 0;
}
void vmapper_destroy(vmapper_t* vmapper) {
void vmapper_destroy(vmapper_t * vmapper) {
if (vmapper != NULL) {
for (size_t i = 0; i < vmapper->size; i++) {
free(vmapper->mlinks[i]);
@@ -186,7 +204,7 @@ void vmapper_destroy(vmapper_t* vmapper) {
return;
}
void vmapper_free(vmapper_t* vmapper) {
void vmapper_free(vmapper_t * vmapper) {
if (vmapper != NULL) {
for (size_t i = 0; i < vmapper->size; i++) {
free(vmapper->mlinks[i]);
libxtools/vmapper.h
+12 -12
View File
@@ -30,20 +30,20 @@ typedef struct {
} vmapper_t;
vmapper_t* new_vmapper(void);
void vmapper_init(vmapper_t* vmapper);
int vmapper_check_capa(vmapper_t* vmapper);
int vmapper_bind_string(vmapper_t* vmapper, char* name, char** val);
int vmapper_bind_int(vmapper_t* vmapper, char* name, int* val);
int vmapper_bind_bool(vmapper_t* vmapper, char* name, bool* val);
void vmapper_init(vmapper_t * vmapper);
int vmapper_check_capa(vmapper_t * vmapper);
int vmapper_bind_string(vmapper_t * vmapper, char* name, char** val);
int vmapper_bind_int(vmapper_t * vmapper, char* name, int* val);
int vmapper_bind_bool(vmapper_t * vmapper, char* name, bool* val);
int vmapper_set_int(vmapper_t* vmapper, char* key, char* val);
int vmapper_set_string(vmapper_t* vmapper, char* key, char* val);
int vmapper_set_bool(vmapper_t* vmapper, char* key, char* val);
int vmapper_set_int(vmapper_t * vmapper, char* key, char* val);
int vmapper_set_string(vmapper_t * vmapper, char* key, char* val);
int vmapper_set_bool(vmapper_t * vmapper, char* key, char* val);
int vmapper_set(vmapper_t* vmapper, char* key, char* val);
int vmapper_bind(vmapper_t* vmapper, int type, char* name, void* val);
int vmapper_set(vmapper_t * vmapper, char* key, char* val);
int vmapper_bind(vmapper_t * vmapper, int type, char* name, void* val);
void vmapper_destroy(vmapper_t* vmapper);
void vmapper_free(vmapper_t* vmapper);
void vmapper_destroy(vmapper_t * vmapper);
void vmapper_free(vmapper_t * vmapper);
#endif
libxtools/vmapper_test.c
+2 -1
View File
@@ -10,11 +10,12 @@
#include <vmapper.h>
#include <massert.h>
int main(int argc, char **argv) {
int main(int argc, char** argv) {
(void)argc;
(void)argv;
vmapper_t vmapper;
vmapper_init(&vmapper);
int port = 0;