Fix more build warnings. (eclipse-paho#111)

josesimoes · Mar 31, 2021 · ff5aa09 · ff5aa09
1 parent 42b23a4
commit ff5aa09
Show file tree

Hide file tree

Showing 36 changed files with 223 additions and 169 deletions.
diff --git a/M2Mqtt/IMqttNetworkChannel.cs b/M2Mqtt/IMqttNetworkChannel.cs
@@ -1,5 +1,4 @@
 /*
-Copyright (c) 2019 The nanoFramework project contributors
 Copyright (c) 2013, 2014 Paolo Patierno
 
 All rights reserved. This program and the accompanying materials
@@ -13,6 +12,7 @@ and the Eclipse Distribution License is available at
 
 Contributors:
    Paolo Patierno - initial API and implementation and/or initial documentation
+   .NET Foundation and Contributors - nanoFramework support
 */
 
 using System;

diff --git a/M2Mqtt/Messages/MqttMsgBase.cs b/M2Mqtt/Messages/MqttMsgBase.cs
@@ -193,7 +193,7 @@ protected int encodeRemainingLength(int remainingLength, byte[] buffer, int inde
                 digit = remainingLength % 128;
                 remainingLength /= 128;
                 if (remainingLength > 0)
-                    digit = digit | 0x80;
+                    digit |= 0x80;
                 buffer[index++] = (byte)digit;
             } while (remainingLength > 0);
             return index;

diff --git a/M2Mqtt/Messages/MqttMsgConnack.cs b/M2Mqtt/Messages/MqttMsgConnack.cs
@@ -171,7 +171,7 @@ public override byte[] GetBytes(byte ProtocolVersion)
             do
             {
                 fixedHeaderSize++;
-                temp = temp / 128;
+                temp /= 128;
             } while (temp > 0);
 
             // allocate buffer for message

diff --git a/M2Mqtt/Messages/MqttMsgConnect.cs b/M2Mqtt/Messages/MqttMsgConnect.cs
@@ -482,7 +482,7 @@ public override byte[] GetBytes(byte protocolVersion)
             do
             {
                 fixedHeaderSize++;
-                temp = temp / 128;
+                temp /= 128;
             } while (temp > 0);
 
             // allocate buffer for message

diff --git a/M2Mqtt/Messages/MqttMsgConnectEventArgs.cs b/M2Mqtt/Messages/MqttMsgConnectEventArgs.cs
@@ -12,6 +12,7 @@ and the Eclipse Distribution License is available at
 
 Contributors:
    Paolo Patierno - initial API and implementation and/or initial documentation
+   .NET Foundation and Contributors - nanoFramework support
 */
 
 #if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || MF_FRAMEWORK_VERSION_V4_4)

diff --git a/M2Mqtt/Messages/MqttMsgDisconnect.cs b/M2Mqtt/Messages/MqttMsgDisconnect.cs
@@ -59,7 +59,7 @@ public static MqttMsgDisconnect Parse(byte fixedHeaderFirstByte, byte protocolVe
         /// <summary>
         /// Returns the bytes that represents the current object.
         /// </summary>
-        /// <param name="ProtocolVersion">MQTT protocol version</param>
+        /// <param name="protocolVersion">MQTT protocol version</param>
         /// <returns>An array of bytes that represents the current object.</returns>
         public override byte[] GetBytes(byte protocolVersion)
         {

diff --git a/M2Mqtt/Messages/MqttMsgPingReq.cs b/M2Mqtt/Messages/MqttMsgPingReq.cs
@@ -34,7 +34,7 @@ public MqttMsgPingReq()
         /// <summary>
         /// Returns the bytes that represents the current object.
         /// </summary>
-        /// <param name="ProtocolVersion">MQTT protocol version</param>
+        /// <param name="protocolVersion">MQTT protocol version</param>
         /// <returns>An array of bytes that represents the current object.</returns>
         public override byte[] GetBytes(byte protocolVersion)
         {

diff --git a/M2Mqtt/Messages/MqttMsgPingResp.cs b/M2Mqtt/Messages/MqttMsgPingResp.cs
@@ -60,7 +60,7 @@ public static MqttMsgPingResp Parse(byte fixedHeaderFirstByte, byte protocolVers
         /// <summary>
         /// Returns the bytes that represents the current object.
         /// </summary>
-        /// <param name="ProtocolVersion">MQTT protocol version</param>
+        /// <param name="protocolVersion">MQTT protocol version</param>
         /// <returns>An array of bytes that represents the current object.</returns>
         public override byte[] GetBytes(byte protocolVersion)
         {

diff --git a/M2Mqtt/Messages/MqttMsgPuback.cs b/M2Mqtt/Messages/MqttMsgPuback.cs
@@ -34,7 +34,7 @@ public MqttMsgPuback()
         /// <summary>
         /// Returns the bytes that represents the current object.
         /// </summary>
-        /// <param name="ProtocolVersion">MQTT protocol version</param>
+        /// <param name="protocolVersion">MQTT protocol version</param>
         /// <returns>An array of bytes that represents the current object.</returns>
         public override byte[] GetBytes(byte protocolVersion)
         {
@@ -59,7 +59,7 @@ public override byte[] GetBytes(byte protocolVersion)
             do
             {
                 fixedHeaderSize++;
-                temp = temp / 128;
+                temp /= 128;
             } while (temp > 0);
 
             // allocate buffer for message

diff --git a/M2Mqtt/Messages/MqttMsgPubcomp.cs b/M2Mqtt/Messages/MqttMsgPubcomp.cs
@@ -34,7 +34,7 @@ public MqttMsgPubcomp()
         /// <summary>
         /// Returns the bytes that represents the current object.
         /// </summary>
-        /// <param name="ProtocolVersion">MQTT protocol version</param>
+        /// <param name="protocolVersion">MQTT protocol version</param>
         /// <returns>An array of bytes that represents the current object.</returns>
         public override byte[] GetBytes(byte protocolVersion)
         {
@@ -59,7 +59,7 @@ public override byte[] GetBytes(byte protocolVersion)
             do
             {
                 fixedHeaderSize++;
-                temp = temp / 128;
+                temp /= 128;
             } while (temp > 0);
 
             // allocate buffer for message

diff --git a/M2Mqtt/Messages/MqttMsgPublish.cs b/M2Mqtt/Messages/MqttMsgPublish.cs
@@ -97,7 +97,7 @@ public MqttMsgPublish(string topic,
         /// <summary>
         /// Returns the bytes that represents the current object.
         /// </summary>
-        /// <param name="ProtocolVersion">MQTT protocol version</param>
+        /// <param name="protocolVersion">MQTT protocol version</param>
         /// <returns>An array of bytes that represents the current object.</returns>
         public override byte[] GetBytes(byte protocolVersion)
         {
@@ -148,7 +148,7 @@ public override byte[] GetBytes(byte protocolVersion)
             do
             {
                 fixedHeaderSize++;
-                temp = temp / 128;
+                temp /= 128;
             } while (temp > 0);
 
             // allocate buffer for message

diff --git a/M2Mqtt/Messages/MqttMsgPublishEventArgs.cs b/M2Mqtt/Messages/MqttMsgPublishEventArgs.cs
@@ -12,6 +12,7 @@ and the Eclipse Distribution License is available at
 
 Contributors:
    Paolo Patierno - initial API and implementation and/or initial documentation
+   .NET Foundation and Contributors - nanoFramework support
 */
 
 #if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || MF_FRAMEWORK_VERSION_V4_4)

diff --git a/M2Mqtt/Messages/MqttMsgPublishedEventArgs.cs b/M2Mqtt/Messages/MqttMsgPublishedEventArgs.cs
@@ -12,6 +12,7 @@ and the Eclipse Distribution License is available at
 
 Contributors:
    Paolo Patierno - initial API and implementation and/or initial documentation
+   .NET Foundation and Contributors - nanoFramework support
 */
 
 #if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || MF_FRAMEWORK_VERSION_V4_4)

diff --git a/M2Mqtt/Messages/MqttMsgPubrec.cs b/M2Mqtt/Messages/MqttMsgPubrec.cs
@@ -34,7 +34,7 @@ public MqttMsgPubrec()
         /// <summary>
         /// Returns the bytes that represents the current object.
         /// </summary>
-        /// <param name="ProtocolVersion">MQTT protocol version</param>
+        /// <param name="protocolVersion">MQTT protocol version</param>
         /// <returns>An array of bytes that represents the current object.</returns>
         public override byte[] GetBytes(byte protocolVersion)
         {
@@ -59,7 +59,7 @@ public override byte[] GetBytes(byte protocolVersion)
             do
             {
                 fixedHeaderSize++;
-                temp = temp / 128;
+                temp /= 128;
             } while (temp > 0);
 
             // allocate buffer for message

diff --git a/M2Mqtt/Messages/MqttMsgPubrel.cs b/M2Mqtt/Messages/MqttMsgPubrel.cs
@@ -36,7 +36,7 @@ public MqttMsgPubrel()
         /// <summary>
         /// Returns the bytes that represents the current object.
         /// </summary>
-        /// <param name="ProtocolVersion">MQTT protocol version</param>
+        /// <param name="protocolVersion">MQTT protocol version</param>
         /// <returns>An array of bytes that represents the current object.</returns>
         public override byte[] GetBytes(byte protocolVersion)
         {
@@ -61,7 +61,7 @@ public override byte[] GetBytes(byte protocolVersion)
             do
             {
                 fixedHeaderSize++;
-                temp = temp / 128;
+                temp /= 128;
             } while (temp > 0);
 
             // allocate buffer for message

diff --git a/M2Mqtt/Messages/MqttMsgSuback.cs b/M2Mqtt/Messages/MqttMsgSuback.cs
@@ -93,7 +93,7 @@ public static MqttMsgSuback Parse(byte fixedHeaderFirstByte, byte protocolVersio
         /// <summary>
         /// Returns the bytes that represents the current object.
         /// </summary>
-        /// <param name="ProtocolVersion">MQTT protocol version</param>
+        /// <param name="protocolVersion">MQTT protocol version</param>
         /// <returns>An array of bytes that represents the current object.</returns>
         public override byte[] GetBytes(byte protocolVersion)
         {
@@ -124,7 +124,7 @@ public override byte[] GetBytes(byte protocolVersion)
             do
             {
                 fixedHeaderSize++;
-                temp = temp / 128;
+                temp /= 128;
             } while (temp > 0);
 
             // allocate buffer for message

diff --git a/M2Mqtt/Messages/MqttMsgSubscribe.cs b/M2Mqtt/Messages/MqttMsgSubscribe.cs
@@ -12,11 +12,12 @@ and the Eclipse Distribution License is available at
 
 Contributors:
    Paolo Patierno - initial API and implementation and/or initial documentation
+   .NET Foundation and Contributors - nanoFramework support
 */
 
 using System;
 // if NOT .Net Micro Framework
-#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3 && !NANOFRAMEWORK_1_0)
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3 && !MF_FRAMEWORK_VERSION_V4_4 && !NANOFRAMEWORK_1_0)
 using System.Collections.Generic;
 #endif
 using System.Collections;
@@ -130,7 +131,7 @@ public static MqttMsgSubscribe Parse(byte fixedHeaderFirstByte, byte protocolVer
             // NOTE : before, I don't know how many topics will be in the payload (so use List)
 
             // if .Net Micro Framework
-#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || NANOFRAMEWORK_1_0)
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || MF_FRAMEWORK_VERSION_V4_4 || NANOFRAMEWORK_1_0)
             IList tmpTopics = new ArrayList();
             IList tmpQosLevels = new ArrayList();
 // else other frameworks (.Net, .Net Compact, Mono, Windows Phone) 
@@ -168,7 +169,7 @@ public static MqttMsgSubscribe Parse(byte fixedHeaderFirstByte, byte protocolVer
         /// <summary>
         /// Returns the bytes that represents the current object.
         /// </summary>
-        /// <param name="ProtocolVersion">MQTT protocol version</param>
+        /// <param name="protocolVersion">MQTT protocol version</param>
         /// <returns>An array of bytes that represents the current object.</returns>
         public override byte[] GetBytes(byte protocolVersion)
         {
@@ -220,7 +221,7 @@ public override byte[] GetBytes(byte protocolVersion)
             do
             {
                 fixedHeaderSize++;
-                temp = temp / 128;
+                temp /= 128;
             } while (temp > 0);
 
             // allocate buffer for message

diff --git a/M2Mqtt/Messages/MqttMsgSubscribeEventArgs.cs b/M2Mqtt/Messages/MqttMsgSubscribeEventArgs.cs
@@ -12,9 +12,10 @@ and the Eclipse Distribution License is available at
 
 Contributors:
    Paolo Patierno - initial API and implementation and/or initial documentation
+   .NET Foundation and Contributors - nanoFramework support
 */
 
-#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || MF_FRAMEWORK_VERSION_V4_4)
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || MF_FRAMEWORK_VERSION_V4_4 || MF_FRAMEWORK_VERSION_V4_4)
 using Microsoft.SPOT;
 #else
 using System;

diff --git a/M2Mqtt/Messages/MqttMsgSubscribedEventArgs.cs b/M2Mqtt/Messages/MqttMsgSubscribedEventArgs.cs
@@ -12,9 +12,10 @@ and the Eclipse Distribution License is available at
 
 Contributors:
    Paolo Patierno - initial API and implementation and/or initial documentation
+   .NET Foundation and Contributors - nanoFramework support
 */
 
-#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || MF_FRAMEWORK_VERSION_V4_4)
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || MF_FRAMEWORK_VERSION_V4_4 || MF_FRAMEWORK_VERSION_V4_4)
 using Microsoft.SPOT;
 #else
 using System;

diff --git a/M2Mqtt/Messages/MqttMsgUnsuback.cs b/M2Mqtt/Messages/MqttMsgUnsuback.cs
@@ -69,7 +69,7 @@ public static MqttMsgUnsuback Parse(byte fixedHeaderFirstByte, byte protocolVers
         /// <summary>
         /// Returns the bytes that represents the current object.
         /// </summary>
-        /// <param name="ProtocolVersion">MQTT protocol version</param>
+        /// <param name="protocolVersion">MQTT protocol version</param>
         /// <returns>An array of bytes that represents the current object.</returns>
         public override byte[] GetBytes(byte protocolVersion)
         {
@@ -94,7 +94,7 @@ public override byte[] GetBytes(byte protocolVersion)
             do
             {
                 fixedHeaderSize++;
-                temp = temp / 128;
+                temp /= 128;
             } while (temp > 0);
 
             // allocate buffer for message

diff --git a/M2Mqtt/Messages/MqttMsgUnsubscribe.cs b/M2Mqtt/Messages/MqttMsgUnsubscribe.cs
@@ -12,11 +12,12 @@ and the Eclipse Distribution License is available at
 
 Contributors:
    Paolo Patierno - initial API and implementation and/or initial documentation
+   .NET Foundation and Contributors - nanoFramework support
 */
 
 using System;
 // if NOT .Net Micro Framework
-#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3 && !NANOFRAMEWORK_1_0)
+#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3 && !MF_FRAMEWORK_VERSION_V4_4 && !NANOFRAMEWORK_1_0)
 using System.Collections.Generic;
 #endif
 using System.Collections;
@@ -117,7 +118,7 @@ public static MqttMsgUnsubscribe Parse(byte fixedHeaderFirstByte, byte protocolV
             // NOTE : before, I don't know how many topics will be in the payload (so use List)
 
             // if .Net Micro Framework
-#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || NANOFRAMEWORK_1_0)
+#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || MF_FRAMEWORK_VERSION_V4_4 || NANOFRAMEWORK_1_0)
             IList tmpTopics = new ArrayList();
 // else other frameworks (.Net, .Net Compact, Mono, Windows Phone) 
 #else
@@ -147,7 +148,7 @@ public static MqttMsgUnsubscribe Parse(byte fixedHeaderFirstByte, byte protocolV
         /// <summary>
         /// Returns the bytes that represents the current object.
         /// </summary>
-        /// <param name="ProtocolVersion">MQTT protocol version</param>
+        /// <param name="protocolVersion">MQTT protocol version</param>
         /// <returns>An array of bytes that represents the current object.</returns>
         public override byte[] GetBytes(byte protocolVersion)
         {
@@ -190,7 +191,7 @@ public override byte[] GetBytes(byte protocolVersion)
             do
             {
                 fixedHeaderSize++;
-                temp = temp / 128;
+                temp /= 128;
             } while (temp > 0);
 
             // allocate buffer for message

diff --git a/M2Mqtt/Messages/MqttMsgUnsubscribeEventArgs.cs b/M2Mqtt/Messages/MqttMsgUnsubscribeEventArgs.cs
@@ -12,6 +12,7 @@ and the Eclipse Distribution License is available at
 
 Contributors:
    Paolo Patierno - initial API and implementation and/or initial documentation
+   .NET Foundation and Contributors - nanoFramework support
 */
 
 #if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || MF_FRAMEWORK_VERSION_V4_4)

diff --git a/M2Mqtt/Messages/MqttMsgUnsubscribedEventArgs.cs b/M2Mqtt/Messages/MqttMsgUnsubscribedEventArgs.cs
@@ -12,6 +12,7 @@ and the Eclipse Distribution License is available at
 
 Contributors:
    Paolo Patierno - initial API and implementation and/or initial documentation
+   .NET Foundation and Contributors - nanoFramework support
 */
 
 #if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || MF_FRAMEWORK_VERSION_V4_4)