From: Mike Gelfand <mikedld@mikedld.com>
Date: Sat, 16 Feb 2019 07:50:37 +0000 (+0300)
Subject: Fixup some formatting leftovers
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d6d946388dc7309d5796b28022f698b7dab4b75;p=transmission

Fixup some formatting leftovers
---

diff --git a/libtransmission/blocklist.c b/libtransmission/blocklist.c
index 1608b9761..e9d054c3b 100644
--- a/libtransmission/blocklist.c
+++ b/libtransmission/blocklist.c
@@ -307,8 +307,8 @@ static bool parseLine2(char const* line, struct tr_ipv4_range* range)
  */
 static bool parseLine3(char const* line, struct tr_ipv4_range* range)
 {
-    unsigned ip[4];
-    unsigned pflen;
+    unsigned int ip[4];
+    unsigned int pflen;
     uint32_t ip_u;
     uint32_t mask = 0xffffffff;
 
diff --git a/libtransmission/metainfo-test.c b/libtransmission/metainfo-test.c
index cf837be45..930d15141 100644
--- a/libtransmission/metainfo-test.c
+++ b/libtransmission/metainfo-test.c
@@ -56,7 +56,7 @@ static int test_metainfo(void)
     {
         int expected_benc_err;
         int expected_parse_result;
-        const void* benc;
+        void const* benc;
     }
     const metainfo[] =
     {
diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 36a7e1cdc..058ba5f09 100644
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -2639,7 +2639,7 @@ void tr_peerMgrTorrentAvailability(tr_torrent const* tor, int8_t* tab, unsigned
     if (tr_torrentHasMetadata(tor))
     {
         int const peerCount = tr_ptrArraySize(&tor->swarm->peers);
-        tr_peer const** peers = (const tr_peer**)tr_ptrArrayBase(&tor->swarm->peers);
+        tr_peer const** peers = (tr_peer const**)tr_ptrArrayBase(&tor->swarm->peers);
         float const interval = tor->info.pieceCount / (float)tabCount;
         bool const isSeed = tr_torrentGetCompleteness(tor) == TR_SEED;
 
diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index 629214f8b..f93409f1f 100644
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -1162,7 +1162,7 @@ static char* strip_non_utf8(char const* in, size_t inlen)
     return evbuffer_free_to_str(buf, NULL);
 }
 
-static char* to_utf8(const char* in, size_t inlen)
+static char* to_utf8(char const* in, size_t inlen)
 {
     char* ret = NULL;
 
diff --git a/macosx/Controller.m b/macosx/Controller.m
index a80431ab2..95c494321 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1449,7 +1449,7 @@ static void removeKeRangerRansomware()
             alert.informativeText = message;
             [alert addButtonWithTitle:NSLocalizedString(@"Remove", "Removal confirm panel -> button")];
             [alert addButtonWithTitle:NSLocalizedString(@"Cancel", "Removal confirm panel -> button")];
-            
+
             [alert beginSheetModalForWindow:fWindow
                           completionHandler:^(NSModalResponse returnCode) {
                               if (returnCode == NSAlertFirstButtonReturn) {
diff --git a/macosx/InfoTabButtonBack.m b/macosx/InfoTabButtonBack.m
index 796239cc1..5aa83e46e 100644
--- a/macosx/InfoTabButtonBack.m
+++ b/macosx/InfoTabButtonBack.m
@@ -64,7 +64,7 @@
     NSRectFillListWithColors(gridRects, colorRects, count);
 
     NSGradient *gradient;
-    
+
     if ([NSApp isDarkMode]) {
         NSColor * darkColor = [NSColor colorWithCalibratedRed: 60.0/255.0 green: 60.0/255.0 blue: 60.0/255.0 alpha: 1.0];
         NSColor * lightColor = [NSColor colorWithCalibratedRed: 90.0/255.0 green: 90.0/255.0 blue: 90.0/255.0 alpha: 1.0];
diff --git a/macosx/InfoTabButtonCell.m b/macosx/InfoTabButtonCell.m
index efa5b86ef..c64d93d9e 100644
--- a/macosx/InfoTabButtonCell.m
+++ b/macosx/InfoTabButtonCell.m
@@ -60,7 +60,7 @@
 - (void) setSelectedTab: (BOOL) selected
 {
     fSelected = selected;
-    
+
     [self reloadAppearance];
 }
 
@@ -137,7 +137,7 @@
 - (void) updateControlTint: (NSNotification *) notification
 {
     NSAssert(![NSApp isOnMojaveOrBetter], @"should not be observing control tint color when accent color is available");
-    
+
     if (fSelected)
         [self setSelectedTab: YES];
 }