From 3e35fe4d80bbbaa86e85bd127a07fce2c55f3c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= <mikrutrafal54@gmail.com>
Date: Tue, 3 Nov 2020 06:35:54 +0100
Subject: [PATCH] Cppcheck fixes

---
 app/widgets/gimpcolordialog.c    | 1 -
 app/widgets/gimpspinscale.c      | 2 +-
 libgimpwidgets/gimpchainbutton.c | 2 --
 plug-ins/file-fli/fli.c          | 4 ++--
 plug-ins/gfig/gfig-circle.c      | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/widgets/gimpcolordialog.c b/app/widgets/gimpcolordialog.c
index 155abeb495..ae9998be93 100644
--- a/app/widgets/gimpcolordialog.c
+++ b/app/widgets/gimpcolordialog.c
@@ -608,7 +608,6 @@ gimp_color_dialog_colormap_add_activate (GimpColorDialog *dialog)
       GimpContext *user_context = viewable_dialog->context->gimp->user_context;
       GimpRGB      color;
 
-      user_context = viewable_dialog->context->gimp->user_context;
       gimp_context_get_foreground (user_context, &color);
 
       gimp_image_add_colormap_entry (dialog->active_image, &color);
diff --git a/app/widgets/gimpspinscale.c b/app/widgets/gimpspinscale.c
index 624df43f79..94a32c6fab 100644
--- a/app/widgets/gimpspinscale.c
+++ b/app/widgets/gimpspinscale.c
@@ -327,7 +327,7 @@ pattern_to_attrs (const gchar *text,
 
   while (TRUE)
     {
-      while (*p && *q && *q != '_')
+      while (*p && q && *q != '_')
         {
           p = g_utf8_next_char (p);
           q++;
diff --git a/libgimpwidgets/gimpchainbutton.c b/libgimpwidgets/gimpchainbutton.c
index 3e188dfeea..c05224853d 100644
--- a/libgimpwidgets/gimpchainbutton.c
+++ b/libgimpwidgets/gimpchainbutton.c
@@ -196,8 +196,6 @@ gimp_chain_button_init (GimpChainButton *button)
 
   button->priv = gimp_chain_button_get_instance_private (button);
 
-  private = GET_PRIVATE (button);
-
   private->position = GIMP_CHAIN_TOP;
   private->active   = FALSE;
   private->image    = gtk_image_new ();
diff --git a/plug-ins/file-fli/fli.c b/plug-ins/file-fli/fli.c
index d5400cfdd1..c2e28e4fc4 100644
--- a/plug-ins/file-fli/fli.c
+++ b/plug-ins/file-fli/fli.c
@@ -884,8 +884,8 @@ fli_write_lc (FILE          *f,
       while (xc < fli_header->width)
         {
           sc = 0;
-          while ((linebuf[xc] == old_linebuf[xc]) &&
-                 (xc < fli_header->width)         &&
+          while ((xc < fli_header->width)         &&
+                 (linebuf[xc] == old_linebuf[xc]) &&
                  (sc < 255))
             {
               xc++;
diff --git a/plug-ins/gfig/gfig-circle.c b/plug-ins/gfig/gfig-circle.c
index aa77ae9d84..efee55cfcc 100644
--- a/plug-ins/gfig/gfig-circle.c
+++ b/plug-ins/gfig/gfig-circle.c
@@ -147,7 +147,7 @@ d_paint_circle (GfigObject *obj)
       gdouble       angle = 0;
       gint          i = 0;
 
-      while (i < 362)
+      while (i < 361)
         {
           static const gdouble step = 2 * G_PI / 180;