Skip to content

const correct MQTT APIs to enable compiling with C++ #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brokeh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

const correct MQTT APIs to enable compiling with C++ #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Internet/MQTT/MQTTClient.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ static int readPacket(MQTTClient* c, Timer* timer)
// + and # can only be next to separator
static char isTopicMatched(char* topicFilter, MQTTString* topicName)
{
char* curf = topicFilter;
char* curn = topicName->lenstring.data;
char* curn_end = curn + topicName->lenstring.len;
const char* curf = topicFilter;
const char* curn = topicName->lenstring.data;
const char* curn_end = curn + topicName->lenstring.len;

while (*curf && curn < curn_end)
{
Expand All @@ -145,7 +145,7 @@ static char isTopicMatched(char* topicFilter, MQTTString* topicName)
break;
if (*curf == '+')
{ // skip until we meet the next separator, or end of string
char* nextpos = curn + 1;
const char* nextpos = curn + 1;
while (nextpos < curn_end && *nextpos != '/')
nextpos = ++curn + 1;
}
Expand Down
2 changes: 1 addition & 1 deletion Internet/MQTT/MQTTClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ typedef struct MQTTMessage
unsigned char retained;
unsigned char dup;
unsigned short id;
void *payload;
const void *payload;
size_t payloadlen;
} MQTTMessage;

Expand Down
4 changes: 2 additions & 2 deletions Internet/MQTT/MQTTPacket/src/MQTTPacket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,11 @@ int MQTTstrlen(MQTTString mqttstring)
* @param bptr the C string to compare
* @return boolean - equal or not
*/
int MQTTPacket_equals(MQTTString* a, char* bptr)
int MQTTPacket_equals(MQTTString* a, const char* bptr)
{
int alen = 0,
blen = 0;
char *aptr;
const char *aptr;

if (a->cstring)
{
Expand Down
6 changes: 3 additions & 3 deletions Internet/MQTT/MQTTPacket/src/MQTTPacket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ typedef union
typedef struct
{
int len;
char* data;
const char* data;
} MQTTLenString;

typedef struct
{
char* cstring;
const char* cstring;
MQTTLenString lenstring;
} MQTTString;

Expand All @@ -98,7 +98,7 @@ int MQTTSerialize_ack(unsigned char* buf, int buflen, unsigned char type, unsign
int MQTTDeserialize_ack(unsigned char* packettype, unsigned char* dup, unsigned short* packetid, unsigned char* buf, int buflen);

int MQTTPacket_len(int rem_len);
int MQTTPacket_equals(MQTTString* a, char* b);
int MQTTPacket_equals(MQTTString* a, const char* b);

int MQTTPacket_encode(unsigned char* buf, int length);
int MQTTPacket_decode(int (*getcharfn)(unsigned char*, int), int* value);
Expand Down