Simplify message counter logic

include/channel.h

@@ -137,8 +137,8 @@ public:
     /**
      * Return number of messages sent.
      *
-     * This functions returns number of messages sent. It's incremented only
-     * when channel is in confirm mode.
+     * This functions returns number of messages sent. It's reset to zero when channel is
+     * put into confirm mode.
      */
     uint64_t messageCounter() const
     {

include/channelimpl.h

@@ -764,11 +764,11 @@ public:
     void complete();
 
     /**
-     * Start message counter
+     * Reset message counter
      */
-    void startMessageCounter()
+    void resetMessageCounter()
     {
-        _messageCounter = 1;
+        _messageCounter = 0;
     }
 
     /**

src/channelimpl.cpp

@@ -505,9 +505,8 @@ bool ChannelImpl::publish(const std::string &exchange, const std::string &routin
         bytesleft -= chunksize;
     }
 
-    // increment message counter if we're in confirm mode
-    if (_messageCounter)
-        _messageCounter++;
+    // increment message counter
+    _messageCounter++;
 
     // done
     return true;

src/confirmselectokframe.h

@@ -74,8 +74,8 @@ public:
         // channel does not exist
         if(!channel) return false;
 
-        // start message counter
-        channel->startMessageCounter();
+        // reset message counter
+        channel->resetMessageCounter();
 
         // report that the channel is open
         if (channel->reportSuccess()) channel->onSynchronized();