Skip to content

Commit

Permalink
replaced all string pointers with array notation
Browse files Browse the repository at this point in the history
  • Loading branch information
256dpi committed May 3, 2017
1 parent a46f52b commit 310ed19
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 46 deletions.
38 changes: 19 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ Initialize the object using the hostname of the broker, the brokers port (defaul

```c++
void begin(Client& client);
void begin(const char *hostname, Client &client);
void begin(const char *hostname, int port, Client &client);
void begin(const char hostname[], Client &client);
void begin(const char hostname[], int port, Client &client);
```
- Specify port `8883` when using SSL clients for secure connections.
Expand All @@ -45,24 +45,24 @@ void begin(const char *hostname, int port, Client &client);
The hostname and port can also be changed after calling `begin()`:
```c++
void setHost(const char *hostname);
void setHost(const char *hostname, int port);
void setHost(const char hostname[]);
void setHost(const char hostname[], int port);
```

Set a will message (last testament) that gets registered on the broker after connecting:

```c++
void setWill(const char *topic);
void setWill(const char *topic, const char *payload);
void setWill(const char *topic, const char *payload, bool retained, int qos);
void setWill(const char topic[]);
void setWill(const char topic[], const char payload[]);
void setWill(const char topic[], const char payload[], bool retained, int qos);
void clearWill();
```
Connect to broker using the supplied client id and an optional username and password:
```c++
boolean connect(const char *clientId);
boolean connect(const char *clientId, const char *username, const char *password);
boolean connect(const char clientId[]);
boolean connect(const char clientId[], const char username[], const char password[]);
```

- This functions returns a boolean that indicates if the connection has been established successfully.
Expand All @@ -71,31 +71,31 @@ Publishes a message to the broker with an optional payload:

```c++
boolean publish(String topic);
boolean publish(const char *topic);
boolean publish(const char topic[]);
boolean publish(String topic, String payload);
boolean publish(String topic, String payload, bool retained, int qos);
boolean publish(const char *topic, String payload);
boolean publish(const char *topic, String payload, bool retained, int qos);
boolean publish(const char *topic, const char *payload);
boolean publish(const char *topic, const char *payload, bool retained, int qos);
boolean publish(const char *topic, char *payload, unsigned int length);
boolean publish(const char *topic, char *payload, unsigned int length, bool retained, int qos);
boolean publish(const char topic[], String payload);
boolean publish(const char topic[], String payload, bool retained, int qos);
boolean publish(const char topic[], const char payload[]);
boolean publish(const char topic[], const char payload[], bool retained, int qos);
boolean publish(const char topic[], char payload[], unsigned int length);
boolean publish(const char topic[], char payload[], unsigned int length, bool retained, int qos);
```
Subscribe to a topic:
```c++
boolean subscribe(String topic);
boolean subscribe(String topic, int qos);
boolean subscribe(const char *topic);
boolean subscribe(const char *topic, int qos);
boolean subscribe(const char topic[]);
boolean subscribe(const char topic[], int qos);
```

Unsubscribe from a topic:

```c++
boolean unsubscribe(String topic);
boolean unsubscribe(const char *topic);
boolean unsubscribe(const char topic[]);
```
Sends and receives packets:
Expand Down
4 changes: 2 additions & 2 deletions examples/AdafruitHuzzahESP8266/AdafruitHuzzahESP8266.ino
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <ESP8266WiFi.h>
#include <MQTTClient.h>

const char *ssid = "ssid";
const char *pass = "pass";
const char ssid[] = "ssid";
const char pass[] = "pass";

WiFiClient net;
MQTTClient client;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <ESP8266WiFi.h>
#include <MQTTClient.h>

const char *ssid = "ssid";
const char *pass = "pass";
const char ssid[] = "ssid";
const char pass[] = "pass";

WiFiClientSecure net;
MQTTClient client;
Expand Down
4 changes: 2 additions & 2 deletions examples/ESP32DevelopmentBoard/ESP32DevelopmentBoard.ino
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <MQTTClient.h>
#include <WiFi.h>

const char *ssid = "ssid";
const char *pass = "pass";
const char ssid[] = "ssid";
const char pass[] = "pass";

WiFiClient net;
MQTTClient client;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <MQTTClient.h>
#include <WiFiClientSecure.h>

const char *ssid = "ssid";
const char *pass = "pass";
const char ssid[] = "ssid";
const char pass[] = "pass";

WiFiClientSecure net;
MQTTClient client;
Expand Down
38 changes: 19 additions & 19 deletions src/MQTTClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ class AdvancedMQTTClient {

void begin(Client &client) { this->begin("", client); }

void begin(const char *hostname, Client &client) { this->begin(hostname, 1883, client); }
void begin(const char hostname[], Client &client) { this->begin(hostname, 1883, client); }

void begin(const char *hostname, int port, Client &client) {
void begin(const char hostname[], int port, Client &client) {
// set config
this->hostname = hostname;
this->port = port;
Expand All @@ -85,18 +85,18 @@ class AdvancedMQTTClient {
lwmqtt_set_callback(&this->client, (void *)cb, MQTTClient_callback);
}

void setHost(const char *hostname) { this->setHost(hostname, 1883); }
void setHost(const char hostname[]) { this->setHost(hostname, 1883); }

void setHost(const char *hostname, int port) {
void setHost(const char hostname[], int port) {
this->hostname = hostname;
this->port = port;
}

void setWill(const char *topic) { this->setWill(topic, ""); }
void setWill(const char topic[]) { this->setWill(topic, ""); }

void setWill(const char *topic, const char *payload) { this->setWill(topic, payload, false, 0); }
void setWill(const char topic[], const char payload[]) { this->setWill(topic, payload, false, 0); }

void setWill(const char *topic, const char *payload, bool retained, int qos) {
void setWill(const char topic[], const char payload[], bool retained, int qos) {
this->hasWill = true;
this->will.topic = lwmqtt_str(topic);
this->will.payload = (void *)payload;
Expand All @@ -107,9 +107,9 @@ class AdvancedMQTTClient {

void clearWill() { this->hasWill = false; }

boolean connect(const char *clientId) { return this->connect(clientId, NULL, NULL); }
boolean connect(const char clientId[]) { return this->connect(clientId, NULL, NULL); }

boolean connect(const char *clientId, const char *username, const char *password) {
boolean connect(const char clientId[], const char username[], const char password[]) {
// return immediately if connected
if (this->connected()) {
return false;
Expand Down Expand Up @@ -152,33 +152,33 @@ class AdvancedMQTTClient {

boolean publish(String topic) { return this->publish(topic.c_str(), ""); }

boolean publish(const char *topic) { return this->publish(topic, ""); }
boolean publish(const char topic[]) { return this->publish(topic, ""); }

boolean publish(String topic, String payload) { return this->publish(topic.c_str(), payload.c_str()); }

boolean publish(String topic, String payload, bool retained, int qos) {
return this->publish(topic.c_str(), payload.c_str(), retained, qos);
}

boolean publish(const char *topic, String payload) { return this->publish(topic, payload.c_str()); }
boolean publish(const char topic[], String payload) { return this->publish(topic, payload.c_str()); }

boolean publish(const char *topic, String payload, bool retained, int qos) {
boolean publish(const char topic[], String payload, bool retained, int qos) {
return this->publish(topic, payload.c_str(), retained, qos);
}

boolean publish(const char *topic, const char *payload) {
boolean publish(const char topic[], const char payload[]) {
return this->publish(topic, (char *)payload, (unsigned int)strlen(payload));
}

boolean publish(const char *topic, const char *payload, bool retained, int qos) {
boolean publish(const char topic[], const char payload[], bool retained, int qos) {
return this->publish(topic, (char *)payload, (unsigned int)strlen(payload), retained, qos);
}

boolean publish(const char *topic, char *payload, unsigned int length) {
boolean publish(const char topic[], char payload[], unsigned int length) {
return this->publish(topic, payload, length, false, 0);
}

boolean publish(const char *topic, char *payload, unsigned int length, bool retained, int qos) {
boolean publish(const char topic[], char payload[], unsigned int length, bool retained, int qos) {
// return immediately if not connected
if (!this->connected()) {
return false;
Expand All @@ -205,9 +205,9 @@ class AdvancedMQTTClient {

boolean subscribe(String topic, int qos) { return this->subscribe(topic.c_str(), qos); }

boolean subscribe(const char *topic) { this->subscribe(topic, 0); }
boolean subscribe(const char topic[]) { this->subscribe(topic, 0); }

boolean subscribe(const char *topic, int qos) {
boolean subscribe(const char topic[], int qos) {
// return immediately if not connected
if (!this->connected()) {
return false;
Expand All @@ -225,7 +225,7 @@ class AdvancedMQTTClient {

boolean unsubscribe(String topic) { return this->unsubscribe(topic.c_str()); }

boolean unsubscribe(const char *topic) {
boolean unsubscribe(const char topic[]) {
// return immediately if not connected
if (!this->connected()) {
return false;
Expand Down

0 comments on commit 310ed19

Please sign in to comment.