libtransport.git Changeset - af0c5d6f194a

Changeset - af0c5d6f194a

Parent rev.

Child rev.

[Not reviewed]

0 5 0

Steffen Vogel - 8 years ago 2017-10-30 16:20:47
post@steffenvogel.de

fix more compiler warnings emitted by Clang on Travis-CI

5 files changed with 15 insertions and 9 deletions:

backends/frotz/dfrotz/dumb/dumb_output.c

backends/twitter/TwitterPlugin.cpp

include/transport/utf8/unchecked.h

libtransport/AdminInterface.cpp

tests/libtransport/config.cpp

0 comments (0 inline, 0 general)

backends/frotz/dfrotz/dumb/dumb_output.c

➞

Show inline comments

@@ @@ -268,8 +268,12 @@ static bool will_print_blank(cell c) @@
 static void show_line_prefix(int row, char c)
+{
   if (show_line_numbers)
     printf((row == -1) ? ".." : "%02d", (row + 1) % 100);
   if (show_line_numbers) {
     if (row == -1)
       printf("..");
     else
       printf("%02d", (row + 1) % 100);
+  }
   if (show_line_types)
     putchar(c);
   /* Add a separator char (unless there's nothing to separate).  */

backends/twitter/TwitterPlugin.cpp

➞

Show inline comments

 		std::map<std::string, int> lastTweet;
 		std::map<std::string, int>::iterator it;
-		for(unsigned i = tweets.size() - 1 ; i >= 0 ; i--) {
+		for(int i = tweets.size() - 1 ; i >= 0 ; i--) {
 			if(userdb[user].twitterMode != CHATROOM) {
 				std::string m = " - " + tweets[i].getUserData().getScreenName() + ": " + tweets[i].getTweet() + " (MsgId: " + (tweets[i].getRetweetID().empty() ? tweets[i].getID() : tweets[i].getRetweetID()) + ")\n";
 				handleMessage(user, adminLegacyName, m, "", "", tweets[i].getCreationTime(), true);

include/transport/utf8/unchecked.h

➞

Show inline comments

@@ @@ -45,13 +45,13 @@ namespace utf8 @@
+            }
             else if (cp < 0x10000) {              // three octets
                 *(result++) = static_cast<uint8_t>((cp >> 12)         | 0xe0);
-                *(result++) = static_cast<uint8_t>((cp >> 6) & 0x3f   | 0x80);
+                *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
                 *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
+            }
             else {                                // four octets
                 *(result++) = static_cast<uint8_t>((cp >> 18)         | 0xf0);
                 *(result++) = static_cast<uint8_t>((cp >> 12)& 0x3f   | 0x80);
                 *(result++) = static_cast<uint8_t>((cp >> 6) & 0x3f   | 0x80);
                 *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)| 0x80);
                 *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
                 *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
+            }
             return result;

libtransport/AdminInterface.cpp

➞

Show inline comments

+				}
 				id++;
+			}
 			return lst;
+		}
 	private:

tests/libtransport/config.cpp

➞

Show inline comments

@@ @@ -35,7 +35,7 @@ class ConfigTest : public CPPUNIT_NS :: TestFixture{ @@
+		}
 	void setStringTwice() {
 		char *argv[3] = {"binary", "--service.jids=localhost", NULL};
+		const char *argv[3] = {"binary", "--service.jids=localhost", NULL};
 		Config cfg(2, argv);
 		std::istringstream ifs("service.jids = irc.freenode.org\n");
 		cfg.load(ifs);
@@ @@ -43,7 +43,7 @@ class ConfigTest : public CPPUNIT_NS :: TestFixture{ @@
+	}
 	void setUnknownBool() {
 		char *argv[3] = {"binary", "--service.jids=localhost", NULL};
+		const char *argv[3] = {"binary", "--service.jids=localhost", NULL};
 		Config cfg(2, argv);
 		std::istringstream ifs("service.irc_send_pass = 1\npurple.group-chat-open=0\n");
 		cfg.load(ifs);
@@ @@ -52,7 +52,7 @@ class ConfigTest : public CPPUNIT_NS :: TestFixture{ @@
+	}
 	void enumerateConfigSection() {
 		char *argv[3] = {"binary", "--service.jids=localhost", NULL};
+		const char *argv[3] = {"binary", "--service.jids=localhost", NULL};
 		Config cfg(2, argv);
 		std::istringstream ifs("purple.irc_send_pass=1\npurple.group-chat-open=false\npurple.test=passed");
 		cfg.load(ifs);

0 comments (0 inline, 0 general)