A few fixes

C++ wrapper now "translates" empty channel or channel group string to
"NULL" for C functions.
Also, a bug in handling residual messages on errors is fixed.

Author: vveljko

core/pubnub_ccore.c

@@ -115,6 +115,7 @@ static int simple_parse_response(struct pbcc_context *p)
 {
     char *reply = p->http_reply;
     int replylen = p->http_buf_len;
+	DEBUG_PRINTF("simple_parse_response()\n");
     if (replylen < 2) {
         return -1;
     }
@@ -168,6 +169,7 @@ int pbcc_parse_time_response(struct pbcc_context *p)
 
 int pbcc_parse_history_response(struct pbcc_context *p)
 {
+	DEBUG_PRINTF("pbcc_parse_history_response()\n");
     return simple_parse_response(p);
 }
 
@@ -189,8 +191,7 @@ int pbcc_parse_presence_response(struct pbcc_context *p)
         return -1;
     }
 
-    p->chan_ofs = 0;
-    p->chan_end = 0;
+    p->chan_ofs = p->chan_end = 0;
 
     p->msg_ofs = 0;
     p->msg_end = replylen;
@@ -207,8 +208,7 @@ enum pubnub_res pbcc_parse_channel_registry_response(struct pbcc_context *p)
     p->chan_ofs = 0;
     p->chan_end = p->http_buf_len;
 
-    p->msg_ofs = 0;
-    p->msg_end = 0;
+    p->msg_ofs = p->msg_end = 0;
 
     /* We should probably also check that there is a key "service"
        with value "channel-registry".  Maybe even that there is a key
@@ -424,7 +424,7 @@ enum pubnub_res pbcc_subscribe_prep(struct pbcc_context *p, const char *channel,
     }
 
     p->http_content_len = 0;
-    p->msg_ofs = 0;
+    p->msg_ofs = p->msg_end = 0;
 
     p->http_buf_len = snprintf(
         p->http_buf, sizeof(p->http_buf),
@@ -475,7 +475,7 @@ enum pubnub_res pbcc_time_prep(struct pbcc_context *pb)
     }
 
     pb->http_content_len = 0;
-    pb->msg_ofs = 0;
+    pb->msg_ofs = pb->msg_end = 0;
 
     pb->http_buf_len = snprintf(
         pb->http_buf, sizeof pb->http_buf,
@@ -503,7 +503,7 @@ enum pubnub_res pbcc_history_prep(struct pbcc_context *pb, const char *channel,
     }
 
     pb->http_content_len = 0;
-    pb->msg_ofs = 0;
+    pb->msg_ofs = pb->msg_end = 0;
 
     pb->http_buf_len = snprintf(
         pb->http_buf, sizeof pb->http_buf,
@@ -531,7 +531,7 @@ enum pubnub_res pbcc_historyv2_prep(struct pbcc_context *pb, const char *channel
     }
 
     pb->http_content_len = 0;
-    pb->msg_ofs = 0;
+    pb->msg_ofs = pb->msg_end = 0;
 
     pb->http_buf_len = snprintf(
         pb->http_buf, sizeof pb->http_buf,
@@ -561,7 +561,7 @@ enum pubnub_res pbcc_here_now_prep(struct pbcc_context *pb, const char *channel,
     }
 
     pb->http_content_len = 0;
-    pb->msg_ofs = 0;
+    pb->msg_ofs = pb->msg_end = 0;
 
     pb->http_buf_len = snprintf(
         pb->http_buf, sizeof pb->http_buf,
@@ -588,7 +588,7 @@ enum pubnub_res pbcc_where_now_prep(struct pbcc_context *pb, const char *uuid)
     }
 
     pb->http_content_len = 0;
-    pb->msg_ofs = 0;
+    pb->msg_ofs = pb->msg_end = 0;
 
     pb->http_buf_len = snprintf(
         pb->http_buf, sizeof pb->http_buf,

cpp/pubnub_common.hpp

@@ -263,7 +263,9 @@ namespace pubnub {
         /// Subscribes to @p channel and/or @p channel_group
         /// @see pubnub_subscribe
         futres subscribe(std::string const &channel, std::string const &channel_group = "") {
-            return doit(pubnub_subscribe(d_pb, channel.c_str(), channel_group.c_str()));
+			char const *ch = channel.empty() ? 0 : channel.c_str();
+			char const *gr = channel_group.empty() ? 0 : channel_group.c_str();
+            return doit(pubnub_subscribe(d_pb, ch, gr));
         }
 
         /// Pass a vector of channels in the @p channel and a vector
@@ -276,7 +278,9 @@ namespace pubnub {
         /// Leaves a @p channel and/or @p channel_group
         /// @see pubnub_leave
         futres leave(std::string const &channel, std::string const &channel_group) {
-            return doit(pubnub_leave(d_pb, channel.c_str(), channel_group.c_str()));
+			char const *ch = channel.empty() ? 0 : channel.c_str();
+			char const *gr = channel_group.empty() ? 0 : channel_group.c_str();
+            return doit(pubnub_leave(d_pb, ch, gr));
         }
 
         /// Pass a vector of channels in the @p channel and a vector
@@ -297,7 +301,9 @@ namespace pubnub {
         /// messages to retrieve
         /// @see pubnub_history
         futres history(std::string const &channel, std::string const &channel_group = "", unsigned count = 100) {
-            return doit(pubnub_history(d_pb, channel.c_str(), channel_group.c_str(), count));
+			char const *ch = channel.empty() ? 0 : channel.c_str();
+			char const *gr = channel_group.empty() ? 0 : channel_group.c_str();
+            return doit(pubnub_history(d_pb, ch, gr, count));
         }
 
         /// Pass a vector of channels in the @p channel and a vector
@@ -313,7 +319,9 @@ namespace pubnub {
         /// a time token for each message. Uses the v2 protocol.
         /// @see pubnub_historyv2
         futres historyv2(std::string const &channel, std::string const &channel_group = "", unsigned count = 100, bool include_token = false) {
-            return doit(pubnub_historyv2(d_pb, channel.c_str(), channel_group.c_str(), count, include_token));
+			char const *ch = channel.empty() ? 0 : channel.c_str();
+			char const *gr = channel_group.empty() ? 0 : channel_group.c_str();
+            return doit(pubnub_historyv2(d_pb, ch, gr, count, include_token));
         }
 
         /// Pass a vector of channels in the @p channel and a vector
@@ -327,7 +335,9 @@ namespace pubnub {
         /// UUIDs on a @p channel and/or @p channel_group
         /// @see pubnub_here_now
         futres here_now(std::string const &channel, std::string const &channel_group = "") {
-            return doit(pubnub_here_now(d_pb, channel.c_str(), channel_group.c_str()));
+			char const *ch = channel.empty() ? 0 : channel.c_str();
+			char const *gr = channel_group.empty() ? 0 : channel_group.c_str();
+            return doit(pubnub_here_now(d_pb, ch, gr));
         }
 
         /// Pass a vector of channels in the @p channel and a vector
@@ -356,7 +366,9 @@ namespace pubnub {
         /// given @p channel and/or @pchannel_group of the given @p uuid
         /// @see pubnub_set_state
         futres set_state(std::string const &channel, std::string const &channel_group, std::string const &uuid, std::string const &state) {
-            return doit(pubnub_set_state(d_pb, channel.c_str(), channel_group.c_str(), uuid.c_str(), state.c_str()));
+			char const *ch = channel.empty() ? 0 : channel.c_str();
+			char const *gr = channel_group.empty() ? 0 : channel_group.c_str();
+            return doit(pubnub_set_state(d_pb, ch, gr, uuid.c_str(), state.c_str()));
         }
 
         /// Pass a vector of channels in the @p channel and a vector
@@ -371,7 +383,9 @@ namespace pubnub {
         /// uuid 
         /// @see pubnub_set_state
         futres state_get(std::string const &channel, std::string const &channel_group = "", std::string const &uuid = "") {
-            return doit(pubnub_state_get(d_pb, channel.c_str(), channel_group.c_str(), uuid.empty() ? NULL : uuid.c_str()));
+			char const *ch = channel.empty() ? 0 : channel.c_str();
+			char const *gr = channel_group.empty() ? 0 : channel_group.c_str();
+            return doit(pubnub_state_get(d_pb, ch, gr, uuid.empty() ? NULL : uuid.c_str()));
         }
         futres state_get(std::vector<std::string> const &channel, std::vector<std::string> const &channel_group, std::string const &uuid = "") {
             return state_get(join(channel, comma), join(channel_group, comma), uuid);