Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c0439ba12e |
@@ -6,8 +6,8 @@ CFLAGS=-DRASPBERRY_PI
|
|||||||
all: raspjson
|
all: raspjson
|
||||||
|
|
||||||
# ===== Compile
|
# ===== Compile
|
||||||
LibTeleinfo.o: ../../LibTeleinfo.cpp
|
LibTeleinfo.o: ../../src/LibTeleinfo.cpp
|
||||||
$(CC) $(CFLAGS) -c ../../LibTeleinfo.cpp
|
$(CC) $(CFLAGS) -c ../../src/LibTeleinfo.cpp
|
||||||
|
|
||||||
raspjson.o: raspjson.cpp
|
raspjson.o: raspjson.cpp
|
||||||
$(CC) $(CFLAGS) -c raspjson.cpp
|
$(CC) $(CFLAGS) -c raspjson.cpp
|
||||||
@@ -18,4 +18,4 @@ raspjson: raspjson.o LibTeleinfo.o
|
|||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o raspjson
|
rm -f *.o raspjson
|
||||||
|
|
||||||
|
|||||||
@@ -224,7 +224,7 @@ ValueList * TInfo::valueAdd(char * name, char * value, uint8_t checksum, uint8_t
|
|||||||
// Do we have enought space to hold new value ?
|
// Do we have enought space to hold new value ?
|
||||||
if (strlen(me->value) >= lgvalue ) {
|
if (strlen(me->value) >= lgvalue ) {
|
||||||
// Copy it
|
// Copy it
|
||||||
strncpy(me->value, value , lgvalue + 1);
|
strlcpy(me->value, value , lgvalue + 1);
|
||||||
me->checksum = checksum ;
|
me->checksum = checksum ;
|
||||||
|
|
||||||
// That's all
|
// That's all
|
||||||
@@ -427,7 +427,7 @@ char * TInfo::valueGet(char * name, char * value)
|
|||||||
if (me->value) {
|
if (me->value) {
|
||||||
// copy to dest buffer
|
// copy to dest buffer
|
||||||
uint8_t lgvalue = strlen(me->value);
|
uint8_t lgvalue = strlen(me->value);
|
||||||
strncpy(value, me->value , lgvalue + 1 );
|
strlcpy(value, me->value , lgvalue + 1 );
|
||||||
return ( value );
|
return ( value );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -662,7 +662,7 @@ ValueList * TInfo::checkLine(char * pline)
|
|||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
// Get our own working copy
|
// Get our own working copy
|
||||||
strncpy( buff, pline, len+1);
|
strlcpy( buff, pline, len+1);
|
||||||
|
|
||||||
p = &buff[0];
|
p = &buff[0];
|
||||||
ptok = p; // for sure we start with token name
|
ptok = p; // for sure we start with token name
|
||||||
|
|||||||
Reference in New Issue
Block a user