Merge branch 'master' of ssh://home.hottis.de:2922/wolutator/mbus-gateway

This commit is contained in:
Wolfgang Hottgenroth 2020-09-04 20:34:21 +02:00
commit 0485ae4687
Signed by: wn
GPG Key ID: B586EAFCDF2F65F4
2 changed files with 4 additions and 2 deletions

View File

@ -6,7 +6,9 @@ LDFLAGS=-lwiringPi
mbusgw: mbusgw.o
$(CC) -o $@ $(LDFLAGS) $^
.c.o:
mbusgw.o: mbusgw.c mbusgw.h
%.o : %.c
$(CC) $(CFLAGS) -c $<
.PHONY: all

View File

@ -233,7 +233,7 @@ uint8_t request(int fd, uint8_t cmd, uint8_t addr, t_longframe **retFrame) {
t_longframe *frame = (t_longframe*) malloc(sizeof(t_longframe));
if (! frame) {
errlog("unable to allocate memory for frame\n");
return ERROR_OUT_OF_MEMORY;
return ERROR_OUT_OF_MEMORY__FRAME;
}
frame->userdata = NULL;