From 5693e592567243508ecad250539aedeff6fbe1cb Mon Sep 17 00:00:00 2001
From: Mike Gelfand <mikedld@mikedld.com>
Date: Sun, 17 Mar 2019 09:15:35 +0300
Subject: [PATCH] Define each identifier in a dedicated statement

* MISRA C++:2008, 8-0-1 - An init-declarator-list or a member-declarator-list
  shall consist of a single init-declarator or member-declarator respectively
* CERT, DCL52-J. - Do not declare more than one variable per declaration
* CERT, DCL04-C. - Do not declare more than one variable per declaration
---
 gtk/makemeta-ui.c           | 3 ++-
 gtk/torrent-cell-renderer.c | 6 ++++--
 libtransmission/utils.c     | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c
index 7e01fcef6..ab15306a9 100644
--- a/gtk/makemeta-ui.c
+++ b/gtk/makemeta-ui.c
@@ -219,7 +219,8 @@ static void onResponse(GtkDialog* d, int response, gpointer user_data)
         {
             int n;
             int tier;
-            GtkTextIter start, end;
+            GtkTextIter start;
+            GtkTextIter end;
             char* dir;
             char* base;
             char* tracker_text;
diff --git a/gtk/torrent-cell-renderer.c b/gtk/torrent-cell-renderer.c
index 59ecd8220..3e9f187a0 100644
--- a/gtk/torrent-cell-renderer.c
+++ b/gtk/torrent-cell-renderer.c
@@ -153,7 +153,8 @@ static char* getShortTransferString(tr_torrent const* tor, tr_stat const* st, do
 
     if (haveDown)
     {
-        char dnStr[32], upStr[32];
+        char dnStr[32];
+        char upStr[32];
         tr_formatter_speed_KBps(dnStr, downloadSpeed_KBps, sizeof(dnStr));
         tr_formatter_speed_KBps(upStr, uploadSpeed_KBps, sizeof(upStr));
 
@@ -513,7 +514,8 @@ static void torrent_cell_renderer_get_size(GtkCellRenderer* cell, GtkWidget* wid
 
         if (y_offset != NULL)
         {
-            int xpad, ypad;
+            int xpad;
+            int ypad;
             gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
             *y_offset = cell_area ? (int)((cell_area->height - (ypad * 2 + h)) / 2.0) : 0;
         }
diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index 10b389abd..250c06dbb 100644
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -1726,7 +1726,8 @@ bool tr_moveFile(char const* oldpath, char const* newpath, tr_error** error)
     while (bytesLeft > 0)
     {
         uint64_t const bytesThisPass = MIN(bytesLeft, buflen);
-        uint64_t numRead, bytesWritten;
+        uint64_t numRead;
+        uint64_t bytesWritten;
 
         if (!tr_sys_file_read(in, buf, bytesThisPass, &numRead, error))
         {