Merge branch 'master' of ssh://home.hottis.de:2922/wolutator/mbus-gateway
This commit is contained in:
@ -6,7 +6,9 @@ LDFLAGS=-lwiringPi
|
|||||||
mbusgw: mbusgw.o
|
mbusgw: mbusgw.o
|
||||||
$(CC) -o $@ $(LDFLAGS) $^
|
$(CC) -o $@ $(LDFLAGS) $^
|
||||||
|
|
||||||
.c.o:
|
mbusgw.o: mbusgw.c mbusgw.h
|
||||||
|
|
||||||
|
%.o : %.c
|
||||||
$(CC) $(CFLAGS) -c $<
|
$(CC) $(CFLAGS) -c $<
|
||||||
|
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
|
@ -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));
|
t_longframe *frame = (t_longframe*) malloc(sizeof(t_longframe));
|
||||||
if (! frame) {
|
if (! frame) {
|
||||||
errlog("unable to allocate memory for frame\n");
|
errlog("unable to allocate memory for frame\n");
|
||||||
return ERROR_OUT_OF_MEMORY;
|
return ERROR_OUT_OF_MEMORY__FRAME;
|
||||||
}
|
}
|
||||||
frame->userdata = NULL;
|
frame->userdata = NULL;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user