From 84027a3d3bbf48d61fc238621b1b0b16004f3280 Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Tue, 25 Jun 2019 14:50:27 +0200
Subject: [PATCH 1/5] avrdude: warnings cleanup

---
 src/avrdude/arduino.c          |  13 ++-
 src/avrdude/avr.c              |  24 ++--
 src/avrdude/avr910.c           |   2 +-
 src/avrdude/avrdude-slic3r.cpp |   6 +-
 src/avrdude/avrdude.h          |   2 +
 src/avrdude/avrpart.c          |   4 +-
 src/avrdude/buspirate.c        |   4 +-
 src/avrdude/butterfly.c        |   2 +-
 src/avrdude/config.c           |   6 +-
 src/avrdude/config_gram.c      |   2 +-
 src/avrdude/config_gram.y      |   2 +-
 src/avrdude/fileio.c           |  43 +++----
 src/avrdude/lists.c            |  12 +-
 src/avrdude/main.c             |   6 +-
 src/avrdude/pindefs.c          |   2 +-
 src/avrdude/ser_win32.c        |  12 +-
 src/avrdude/serbb_win32.c      |   8 +-
 src/avrdude/stk500.c           |  12 +-
 src/avrdude/stk500v2.c         | 205 ++++++++++++++++++---------------
 src/avrdude/term.c             |  26 ++---
 20 files changed, 206 insertions(+), 187 deletions(-)

diff --git a/src/avrdude/arduino.c b/src/avrdude/arduino.c
index 53e5ed822..e6008adeb 100644
--- a/src/avrdude/arduino.c
+++ b/src/avrdude/arduino.c
@@ -41,6 +41,7 @@
 static int arduino_read_sig_bytes(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m)
 {
   unsigned char buf[32];
+  (void)p;
 
   /* Signature byte reads are always 3 bytes. */
 
@@ -83,9 +84,9 @@ static int arduino_read_sig_bytes(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m)
 static int prusa_init_external_flash(PROGRAMMER * pgm)
 {
   // Note: send/receive as in _the firmare_ send & receives
-  const char entry_magic_send   [] = "start\n";
-  const char entry_magic_receive[] = "w25x20cl_enter\n";
-  const char entry_magic_cfm    [] = "w25x20cl_cfm\n";
+  const char entry_magic_send[]             = "start\n";
+  const unsigned char entry_magic_receive[] = "w25x20cl_enter\n";
+  const char entry_magic_cfm[]              = "w25x20cl_cfm\n";
   const size_t buffer_len = 32;     // Should be large enough for the above messages
 
   int res;
@@ -94,7 +95,7 @@ static int prusa_init_external_flash(PROGRAMMER * pgm)
 
   // 1. receive the "start" command
   recv_size = sizeof(entry_magic_send) - 1;
-  res = serial_recv(&pgm->fd, buffer, recv_size);
+  res = serial_recv(&pgm->fd, (unsigned char *)buffer, recv_size);
   if (res < 0) {
     avrdude_message(MSG_INFO, "%s: prusa_init_external_flash(): MK3 printer did not boot up on time or serial communication failed\n", progname);
     return -1;
@@ -111,7 +112,7 @@ static int prusa_init_external_flash(PROGRAMMER * pgm)
 
   // 3. Receive the entry confirmation command
   recv_size = sizeof(entry_magic_cfm) - 1;
-  res = serial_recv(&pgm->fd, buffer, recv_size);
+  res = serial_recv(&pgm->fd, (unsigned char *)buffer, recv_size);
   if (res < 0) {
     avrdude_message(MSG_INFO, "%s: prusa_init_external_flash(): MK3 printer did not boot up on time or serial communication failed\n", progname);
     return -1;
@@ -142,7 +143,7 @@ static int arduino_open(PROGRAMMER * pgm, char * port)
 
   // Sometimes there may be line noise generating input on the printer's USB-to-serial IC
   // Here we try to clean its input buffer with a sequence of newlines (a minimum of 9 is needed):
-  const char cleanup_newlines[] = "\n\n\n\n\n\n\n\n\n\n";
+  const unsigned char cleanup_newlines[] = "\n\n\n\n\n\n\n\n\n\n";
   if (serial_send(&pgm->fd, cleanup_newlines, sizeof(cleanup_newlines) - 1) < 0) {
     return -1;
   }
diff --git a/src/avrdude/avr.c b/src/avrdude/avr.c
index 73dcaf4ff..defae75d5 100644
--- a/src/avrdude/avr.c
+++ b/src/avrdude/avr.c
@@ -341,7 +341,7 @@ int avr_read(PROGRAMMER * pgm, AVRPART * p, char * memtype,
     avr_tpi_setup_rw(pgm, mem, 0, TPI_NVMCMD_NO_OPERATION);
 
     /* load bytes */
-    for (lastaddr = i = 0; i < mem->size; i++) {
+    for (lastaddr = i = 0; i < (unsigned)mem->size; i++) {
       RETURN_IF_CANCEL();
       if (vmem == NULL ||
           (vmem->tags[i] & TAG_ALLOCATED) != 0)
@@ -374,7 +374,7 @@ int avr_read(PROGRAMMER * pgm, AVRPART * p, char * memtype,
 
     /* quickly scan number of pages to be written to first */
     for (pageaddr = 0, npages = 0;
-         pageaddr < mem->size;
+         pageaddr < (unsigned)mem->size;
          pageaddr += mem->page_size) {
       /* check whether this page must be read */
       for (i = pageaddr;
@@ -391,7 +391,7 @@ int avr_read(PROGRAMMER * pgm, AVRPART * p, char * memtype,
     }
 
     for (pageaddr = 0, failure = 0, nread = 0;
-         !failure && pageaddr < mem->size;
+         !failure && pageaddr < (unsigned)mem->size;
          pageaddr += mem->page_size) {
       RETURN_IF_CANCEL();
       /* check whether this page must be read */
@@ -437,7 +437,7 @@ int avr_read(PROGRAMMER * pgm, AVRPART * p, char * memtype,
     }
   }
 
-  for (i=0; i < mem->size; i++) {
+  for (i = 0; i < (unsigned)mem->size; i++) {
     RETURN_IF_CANCEL();
     if (vmem == NULL ||
 	(vmem->tags[i] & TAG_ALLOCATED) != 0)
@@ -634,18 +634,18 @@ int avr_write_byte_default(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
       writeop = mem->op[AVR_OP_WRITE_HI];
     else
       writeop = mem->op[AVR_OP_WRITE_LO];
-    caddr = addr / 2;
+    caddr = (unsigned short)(addr / 2);
   }
   else if (mem->paged && mem->op[AVR_OP_LOADPAGE_LO]) {
     if (addr & 0x01)
       writeop = mem->op[AVR_OP_LOADPAGE_HI];
     else
       writeop = mem->op[AVR_OP_LOADPAGE_LO];
-    caddr = addr / 2;
+    caddr = (unsigned short)(addr / 2);
   }
   else {
     writeop = mem->op[AVR_OP_WRITE];
-    caddr = addr;
+    caddr = (unsigned short)addr;
   }
 
   if (writeop == NULL) {
@@ -723,7 +723,7 @@ int avr_write_byte_default(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
         gettimeofday (&tv, NULL);
         prog_time = (tv.tv_sec * 1000000) + tv.tv_usec;
       } while ((r != data) &&
-               ((prog_time-start_time) < mem->max_write_delay));
+               ((prog_time - start_time) < (unsigned long)mem->max_write_delay));
     }
 
     /*
@@ -878,7 +878,7 @@ int avr_write(PROGRAMMER * pgm, AVRPART * p, char * memtype, int size,
     }
 
     /* write words, low byte first */
-    for (lastaddr = i = 0; i < wsize; i += 2) {
+    for (lastaddr = i = 0; i < (unsigned)wsize; i += 2) {
       RETURN_IF_CANCEL();
       if ((m->tags[i] & TAG_ALLOCATED) != 0 ||
           (m->tags[i + 1] & TAG_ALLOCATED) != 0) {
@@ -915,7 +915,7 @@ int avr_write(PROGRAMMER * pgm, AVRPART * p, char * memtype, int size,
 
     /* quickly scan number of pages to be written to first */
     for (pageaddr = 0, npages = 0;
-         pageaddr < wsize;
+         pageaddr < (unsigned)wsize;
          pageaddr += m->page_size) {
       /* check whether this page must be written to */
       for (i = pageaddr;
@@ -928,7 +928,7 @@ int avr_write(PROGRAMMER * pgm, AVRPART * p, char * memtype, int size,
     }
 
     for (pageaddr = 0, failure = 0, nwritten = 0;
-         !failure && pageaddr < wsize;
+         !failure && pageaddr < (unsigned)wsize;
          pageaddr += m->page_size) {
       RETURN_IF_CANCEL();
       /* check whether this page must be written to */
@@ -968,7 +968,7 @@ int avr_write(PROGRAMMER * pgm, AVRPART * p, char * memtype, int size,
   page_tainted = 0;
   flush_page = 0;
 
-  for (i=0; i<wsize; i++) {
+  for (i = 0; i < (unsigned)wsize; i++) {
     RETURN_IF_CANCEL();
     data = m->buf[i];
     report_progress(i, wsize, NULL);
diff --git a/src/avrdude/avr910.c b/src/avrdude/avr910.c
index aa5cc07a9..17a4ab69f 100644
--- a/src/avrdude/avr910.c
+++ b/src/avrdude/avr910.c
@@ -676,7 +676,7 @@ static int avr910_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
     avr910_set_addr(pgm, addr / rd_size);
 
     while (addr < max_addr) {
-      if ((max_addr - addr) < blocksize) {
+      if ((max_addr - addr) < (unsigned)blocksize) {
         blocksize = max_addr - addr;
       }
       cmd[1] = (blocksize >> 8) & 0xff;
diff --git a/src/avrdude/avrdude-slic3r.cpp b/src/avrdude/avrdude-slic3r.cpp
index 0140d93ed..7eff436e2 100644
--- a/src/avrdude/avrdude-slic3r.cpp
+++ b/src/avrdude/avrdude-slic3r.cpp
@@ -93,7 +93,7 @@ void AvrDude::priv::unset_handlers()
 
 
 int AvrDude::priv::run_one(const std::vector<std::string> &args) {
-	std::vector<char*> c_args {{ const_cast<char*>(PACKAGE) }};
+	std::vector<char*> c_args { const_cast<char*>(PACKAGE) };
 	std::string command_line { PACKAGE };
 
 	for (const auto &arg : args) {
@@ -105,7 +105,7 @@ int AvrDude::priv::run_one(const std::vector<std::string> &args) {
 
 	HandlerGuard guard(*this);
 
-	message_fn(command_line.c_str(), command_line.size());
+	message_fn(command_line.c_str(), (unsigned)command_line.size());
 
 	const auto res = ::avrdude_main(static_cast<int>(c_args.size()), c_args.data());
 
@@ -200,7 +200,7 @@ AvrDude::Ptr AvrDude::run()
 				auto &message_fn = self->p->message_fn;
 				if (message_fn) {
 					message_fn(msg, sizeof(msg));
-					message_fn(what, std::strlen(what));
+					message_fn(what, (unsigned)std::strlen(what));
 					message_fn("\n", 1);
 				}
 
diff --git a/src/avrdude/avrdude.h b/src/avrdude/avrdude.h
index ff464f46f..bc784cec6 100644
--- a/src/avrdude/avrdude.h
+++ b/src/avrdude/avrdude.h
@@ -64,6 +64,8 @@ int avrdude_main(int argc, char * argv []);
 #include <windows.h>
 #include <unistd.h>
 
+#define strdup _strdup
+
 #ifdef UNICODE
 #error "UNICODE should not be defined for avrdude bits on Windows"
 #endif
diff --git a/src/avrdude/avrpart.c b/src/avrdude/avrpart.c
index d0bb951ee..1c7d6af00 100644
--- a/src/avrdude/avrpart.c
+++ b/src/avrdude/avrpart.c
@@ -358,7 +358,7 @@ AVRMEM * avr_locate_mem(AVRPART * p, char * desc)
   int matches;
   int l;
 
-  l = strlen(desc);
+  l = (int)strlen(desc);
   matches = 0;
   match = NULL;
   for (ln=lfirst(p->mem); ln; ln=lnext(ln)) {
@@ -662,7 +662,7 @@ void avr_display(FILE * f, AVRPART * p, const char * prefix, int verbose)
           prefix);
 
   px = prefix;
-  i = strlen(prefix) + 5;
+  i = (int)strlen(prefix) + 5;
   buf = (char *)malloc(i);
   if (buf == NULL) {
     /* ugh, this is not important enough to bail, just ignore it */
diff --git a/src/avrdude/buspirate.c b/src/avrdude/buspirate.c
index 5875d4283..dc8c68fbe 100644
--- a/src/avrdude/buspirate.c
+++ b/src/avrdude/buspirate.c
@@ -128,7 +128,7 @@ static int buspirate_recv_bin(struct programmer_t *pgm, unsigned char *buf, size
 	avrdude_message(MSG_DEBUG, "%s: buspirate_recv_bin():\n", progname);
 	dump_mem(MSG_DEBUG, buf, len);
 
-	return len;
+	return (int)len;
 }
 
 static int buspirate_expect_bin(struct programmer_t *pgm,
@@ -249,7 +249,7 @@ static int buspirate_send(struct programmer_t *pgm, const char *str)
 
 static int buspirate_is_prompt(const char *str)
 {
-	int strlen_str = strlen(str);
+	int strlen_str = (int)strlen(str);
 	/* Prompt ends with '>' or '> '
 	 * all other input probably ends with '\n' */
 	return (str[strlen_str - 1] == '>' || str[strlen_str - 2] == '>');
diff --git a/src/avrdude/butterfly.c b/src/avrdude/butterfly.c
index beb5e04de..8f582e72a 100644
--- a/src/avrdude/butterfly.c
+++ b/src/avrdude/butterfly.c
@@ -675,7 +675,7 @@ static int butterfly_paged_load(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
       butterfly_set_addr(pgm, addr / rd_size);
     }
     while (addr < max_addr) {
-      if ((max_addr - addr) < blocksize) {
+      if ((max_addr - addr) < (unsigned)blocksize) {
         blocksize = max_addr - addr;
       };
       cmd[1] = (blocksize >> 8) & 0xff;
diff --git a/src/avrdude/config.c b/src/avrdude/config.c
index 1c0ff5525..b82fb29cb 100644
--- a/src/avrdude/config.c
+++ b/src/avrdude/config.c
@@ -240,7 +240,7 @@ TOKEN * string(char * text)
       return NULL; /* yyerror already called */
   }
 
-  len = strlen(text);
+  len = (int)strlen(text);
 
   tkn->value.type   = V_STR;
   tkn->value.string = (char *) malloc(len+1);
@@ -351,7 +351,7 @@ int read_config(const char * file)
 }
 
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
-extern YY_BUFFER_STATE yy_scan_bytes(char *base, size_t size);
+extern YY_BUFFER_STATE yy_scan_bytes(const char *base, size_t size);
 extern void yy_delete_buffer(YY_BUFFER_STATE b);
 
 int read_config_builtin()
@@ -363,7 +363,7 @@ int read_config_builtin()
 
   // Note: Can't use yy_scan_buffer, it's buggy (?), leads to fread from a null FILE*
   // and so unfortunatelly we have to use the copying variant here
-  YY_BUFFER_STATE buffer = yy_scan_bytes(avrdude_slic3r_conf, avrdude_slic3r_conf_size);
+  YY_BUFFER_STATE buffer = yy_scan_bytes((const char *)avrdude_slic3r_conf, avrdude_slic3r_conf_size);
   if (buffer == NULL) {
     avrdude_message(MSG_INFO, "%s: read_config_builtin: Failed to initialize parsing buffer\n", progname);
     return -1;
diff --git a/src/avrdude/config_gram.c b/src/avrdude/config_gram.c
index c1a65b13e..2d32fe739 100644
--- a/src/avrdude/config_gram.c
+++ b/src/avrdude/config_gram.c
@@ -3640,7 +3640,7 @@ static int parse_cmdbits(OPCODE * op)
         break;
       }
 
-      len = strlen(s);
+      len = (int)strlen(s);
 
       if (len == 0) {
         yyerror("invalid bit specifier \"\"");
diff --git a/src/avrdude/config_gram.y b/src/avrdude/config_gram.y
index 0aa95a8e8..6a062352b 100644
--- a/src/avrdude/config_gram.y
+++ b/src/avrdude/config_gram.y
@@ -1493,7 +1493,7 @@ static int parse_cmdbits(OPCODE * op)
         break;
       }
 
-      len = strlen(s);
+      len = (int)strlen(s);
 
       if (len == 0) {
         yyerror("invalid bit specifier \"\"");
diff --git a/src/avrdude/fileio.c b/src/avrdude/fileio.c
index 7803497a0..7f4c8edee 100644
--- a/src/avrdude/fileio.c
+++ b/src/avrdude/fileio.c
@@ -264,7 +264,7 @@ static int ihex_readrec(struct ihexrec * ihex, char * rec)
   unsigned char cksum;
   int rc;
 
-  len    = strlen(rec);
+  len    = (int)strlen(rec);
   offset = 1;
   cksum  = 0;
 
@@ -274,7 +274,7 @@ static int ihex_readrec(struct ihexrec * ihex, char * rec)
   for (i=0; i<2; i++)
     buf[i] = rec[offset++];
   buf[i] = 0;
-  ihex->reclen = strtoul(buf, &e, 16);
+  ihex->reclen = (unsigned char)strtoul(buf, &e, 16);
   if (e == buf || *e != 0)
     return -1;
 
@@ -294,7 +294,7 @@ static int ihex_readrec(struct ihexrec * ihex, char * rec)
   for (i=0; i<2; i++)
     buf[i] = rec[offset++];
   buf[i] = 0;
-  ihex->rectyp = strtoul(buf, &e, 16);
+  ihex->rectyp = (unsigned char)strtoul(buf, &e, 16);
   if (e == buf || *e != 0)
     return -1;
 
@@ -308,7 +308,7 @@ static int ihex_readrec(struct ihexrec * ihex, char * rec)
     for (i=0; i<2; i++)
       buf[i] = rec[offset++];
     buf[i] = 0;
-    ihex->data[j] = strtoul(buf, &e, 16);
+    ihex->data[j] = (char)strtoul(buf, &e, 16);
     if (e == buf || *e != 0)
       return -1;
     cksum += ihex->data[j];
@@ -320,7 +320,7 @@ static int ihex_readrec(struct ihexrec * ihex, char * rec)
   for (i=0; i<2; i++)
     buf[i] = rec[offset++];
   buf[i] = 0;
-  ihex->cksum = strtoul(buf, &e, 16);
+  ihex->cksum = (char)strtoul(buf, &e, 16);
   if (e == buf || *e != 0)
     return -1;
 
@@ -361,7 +361,7 @@ static int ihex2b(char * infile, FILE * inf,
 
   while (fgets((char *)buffer,MAX_LINE_LEN,inf)!=NULL) {
     lineno++;
-    len = strlen(buffer);
+    len = (int)strlen(buffer);
     if (buffer[len-1] == '\n') 
       buffer[--len] = 0;
     if (buffer[0] != ':')
@@ -388,7 +388,7 @@ static int ihex2b(char * infile, FILE * inf,
           return -1;
         }
         nextaddr = ihex.loadofs + baseaddr - fileoffset;
-        if (nextaddr + ihex.reclen > bufsize) {
+        if (nextaddr + ihex.reclen > (unsigned)bufsize) {
           avrdude_message(MSG_INFO, "%s: ERROR: address 0x%04x out of range at line %d of %s\n",
                           progname, nextaddr+ihex.reclen, lineno, infile);
           return -1;
@@ -502,10 +502,11 @@ static int b2srec(unsigned char * inbuf, int bufsize,
 
       cksum += n + addr_width + 1;
 
-      for (i=addr_width; i>0; i--) 
+      for (i = addr_width; i>0; i--) {
         cksum += (nextaddr >> (i-1) * 8) & 0xff;
+      }
 
-      for (i=nextaddr; i<nextaddr + n; i++) {
+      for (unsigned i = nextaddr; i < nextaddr + n; i++) {
         fprintf(outf, "%02X", buf[i]);
         cksum += buf[i];
       }
@@ -562,7 +563,7 @@ static int srec_readrec(struct ihexrec * srec, char * rec)
   unsigned char cksum;
   int rc;
 
-  len = strlen(rec);
+  len = (int)strlen(rec);
   offset = 1;
   cksum = 0;
   addr_width = 2;
@@ -582,7 +583,7 @@ static int srec_readrec(struct ihexrec * srec, char * rec)
   for (i=0; i<2; i++) 
     buf[i] = rec[offset++];
   buf[i] = 0;
-  srec->reclen = strtoul(buf, &e, 16);
+  srec->reclen = (char)strtoul(buf, &e, 16);
   cksum += srec->reclen;
   srec->reclen -= (addr_width+1);
   if (e == buf || *e != 0) 
@@ -594,7 +595,7 @@ static int srec_readrec(struct ihexrec * srec, char * rec)
   for (i=0; i<addr_width*2; i++) 
     buf[i] = rec[offset++];
   buf[i] = 0;
-  srec->loadofs = strtoull(buf, &e, 16);
+  srec->loadofs = strtoul(buf, &e, 16);
   if (e == buf || *e != 0) 
     return -1;
 
@@ -608,7 +609,7 @@ static int srec_readrec(struct ihexrec * srec, char * rec)
     for (i=0; i<2; i++) 
       buf[i] = rec[offset++];
     buf[i] = 0;
-    srec->data[j] = strtoul(buf, &e, 16);
+    srec->data[j] = (char)strtoul(buf, &e, 16);
     if (e == buf || *e != 0) 
       return -1;
     cksum += srec->data[j];
@@ -620,7 +621,7 @@ static int srec_readrec(struct ihexrec * srec, char * rec)
   for (i=0; i<2; i++) 
     buf[i] = rec[offset++];
   buf[i] = 0;
-  srec->cksum = strtoul(buf, &e, 16);
+  srec->cksum = (char)strtoul(buf, &e, 16);
   if (e == buf || *e != 0) 
     return -1;
 
@@ -650,7 +651,7 @@ static int srec2b(char * infile, FILE * inf,
 
   while (fgets((char *)buffer,MAX_LINE_LEN,inf)!=NULL) {
     lineno++;
-    len = strlen(buffer);
+    len = (int)strlen(buffer);
     if (buffer[len-1] == '\n') 
       buffer[--len] = 0;
     if (buffer[0] != 0x53)
@@ -729,7 +730,7 @@ static int srec2b(char * infile, FILE * inf,
         return -1;
       }
       nextaddr -= fileoffset;
-      if (nextaddr + srec.reclen > bufsize) {
+      if (nextaddr + srec.reclen > (unsigned)bufsize) {
         avrdude_message(MSG_INFO, msg, progname, nextaddr+srec.reclen, "",
                 lineno, infile);
         return -1;
@@ -740,7 +741,7 @@ static int srec2b(char * infile, FILE * inf,
       }
       if (nextaddr+srec.reclen > maxaddr)
         maxaddr = nextaddr+srec.reclen;
-      reccount++;      
+      reccount++;
     }
 
   }
@@ -1143,12 +1144,12 @@ static int fileio_rbin(struct fioparms * fio,
 
   switch (fio->op) {
     case FIO_READ:
-      rc = fread(buf, 1, size, f);
+      rc = (int)fread(buf, 1, size, f);
       if (rc > 0)
         memset(mem->tags, TAG_ALLOCATED, rc);
       break;
     case FIO_WRITE:
-      rc = fwrite(buf, 1, size, f);
+      rc = (int)fwrite(buf, 1, size, f);
       break;
     default:
       avrdude_message(MSG_INFO, "%s: fileio: invalid operation=%d\n",
@@ -1190,7 +1191,7 @@ static int fileio_imm(struct fioparms * fio,
                           progname, p);
           return -1;
         }
-        mem->buf[loc] = b;
+        mem->buf[loc] = (char)b;
         mem->tags[loc++] = TAG_ALLOCATED;
         p = strtok(NULL, " ,");
         rc = loc;
@@ -1452,7 +1453,7 @@ static int fmt_autodetect(char * fname, unsigned section)
     }
 
     buf[MAX_LINE_LEN-1] = 0;
-    len = strlen((char *)buf);
+    len = (int)strlen((char *)buf);
     if (buf[len-1] == '\n')
       buf[--len] = 0;
 
diff --git a/src/avrdude/lists.c b/src/avrdude/lists.c
index cab88364e..063507ed3 100644
--- a/src/avrdude/lists.c
+++ b/src/avrdude/lists.c
@@ -444,7 +444,7 @@ lcreat ( void * liststruct, int elements )
     l->poolsize = DEFAULT_POOLSIZE;
   }
   else {
-    l->poolsize = elements*sizeof(LISTNODE)+sizeof(NODEPOOL);
+    l->poolsize = (short)(elements*sizeof(LISTNODE)+sizeof(NODEPOOL));
   }
 
   l->n_ln_pool = (l->poolsize-sizeof(NODEPOOL))/sizeof(LISTNODE);
@@ -803,7 +803,7 @@ lget_n ( LISTID lid, unsigned int n )
 
   CKLMAGIC(l);
 
-  if ((n<1)||(n>lsize(l))) {
+  if ((n < 1) || (n > (unsigned)lsize(l))) {
     return NULL;
   }
 
@@ -844,7 +844,7 @@ lget_ln ( LISTID lid, unsigned int n )
 
   CKLMAGIC(l);
 
-  if ((n<1)||(n>lsize(l))) {
+  if ((n < 1) || (n > (unsigned)lsize(l))) {
     return NULL;
   }
 
@@ -941,7 +941,7 @@ insert_ln ( LIST * l, LISTNODE * ln, void * data_ptr )
 |
 |  Insert data before the nth item in the list.
  -----------------------------------------------------------------*/
-int 
+int
 lins_n ( LISTID lid, void * data_ptr, unsigned int n )
 {
   int i;
@@ -952,7 +952,7 @@ lins_n ( LISTID lid, void * data_ptr, unsigned int n )
 
   CKLMAGIC(l);
 
-  if ((n<1)||(n>(l->num+1))) {
+  if ((n < 1) || (n > (unsigned)(l->num+1))) {
     return -1;
   }
 
@@ -1193,7 +1193,7 @@ lrmv_n ( LISTID lid, unsigned int n )
 
   CKLMAGIC(l);
 
-  if ((n<1)||(n>l->num)) {
+  if ((n < 1) || (n > (unsigned)l->num)) {
     return NULL;
   }
 
diff --git a/src/avrdude/main.c b/src/avrdude/main.c
index 8f9040349..60be7ec3a 100644
--- a/src/avrdude/main.c
+++ b/src/avrdude/main.c
@@ -107,7 +107,7 @@ int avrdude_message(const int msglvl, const char *format, ...)
             if (rc > 0 && rc < MSGBUFFER_SIZE) {
                 avrdude_message_handler(msgbuffer, rc, avrdude_message_handler_user_p);
             } else {
-                avrdude_message_handler(format_error, strlen(format_error), avrdude_message_handler_user_p);
+                avrdude_message_handler(format_error, (unsigned)strlen(format_error), avrdude_message_handler_user_p);
             }
         }
 
@@ -567,7 +567,7 @@ int avrdude_main(int argc, char * argv [])
 
 // #endif
 
-  len = strlen(progname) + 2;
+  len = (int)strlen(progname) + 2;
   for (i=0; i<len; i++)
     progbuf[i] = ' ';
   progbuf[i] = 0;
@@ -601,7 +601,7 @@ int avrdude_main(int argc, char * argv [])
 	bitclock = strtod(optarg, &e);
 	if (*e != 0) {
 	  /* trailing unit of measure present */
-	  int suffixlen = strlen(e);
+	  size_t suffixlen = strlen(e);
 	  switch (suffixlen) {
 	  case 2:
 	    if ((e[0] != 'h' && e[0] != 'H') || e[1] != 'z')
diff --git a/src/avrdude/pindefs.c b/src/avrdude/pindefs.c
index 5753fc67b..d89f4828b 100644
--- a/src/avrdude/pindefs.c
+++ b/src/avrdude/pindefs.c
@@ -217,7 +217,7 @@ const char * pinmask_to_str(const pinmask_t * const pinmask) {
  * @param[in] size the number of entries in checklist
  * @returns 0 if all pin definitions are valid, -1 otherwise
  */
-int pins_check(const struct programmer_t * const pgm, const struct pin_checklist_t * const checklist, const int size, bool output) {
+int pins_check(const struct programmer_t *const pgm, const struct pin_checklist_t *const checklist, const int size, const bool output) {
   static const struct pindef_t no_valid_pins = {{0}, {0}}; // default value if check list does not contain anything else
   int rv = 0; // return value
   int pinname; // loop counter through pinnames
diff --git a/src/avrdude/ser_win32.c b/src/avrdude/ser_win32.c
index 8efca0397..6b8a18f8f 100644
--- a/src/avrdude/ser_win32.c
+++ b/src/avrdude/ser_win32.c
@@ -292,7 +292,7 @@ static int ser_open(char * port, union pinfo pinfo, union filedescriptor *fdp)
 	if (hComPort == INVALID_HANDLE_VALUE) {
 		const char *error = last_error_string(0);
 		avrdude_message(MSG_INFO, "%s: ser_open(): can't open device \"%s\": %s\n", progname, port, error);
-		free(error);
+		free((char *)error);
 		return -1;
 	}
 
@@ -460,10 +460,10 @@ static int ser_send(union filedescriptor *fd, const unsigned char * buf, size_t
 
 	serial_w32SetTimeOut(hComPort,500);
 
-	if (!WriteFile(hComPort, buf, buflen, &written, NULL)) {
+	if (!WriteFile(hComPort, buf, (DWORD)buflen, &written, NULL)) {
 		const char *error = last_error_string(0);
 		avrdude_message(MSG_INFO, "%s: ser_send(): write error: %s\n", progname, error);
-		free(error);
+		free((char *)error);
 		return -1;
 	}
 
@@ -576,10 +576,10 @@ static int ser_recv(union filedescriptor *fd, unsigned char * buf, size_t buflen
 
 	serial_w32SetTimeOut(hComPort, serial_recv_timeout);
 
-	if (!ReadFile(hComPort, buf, buflen, &read, NULL)) {
+	if (!ReadFile(hComPort, buf, (DWORD)buflen, &read, NULL)) {
 		const char *error = last_error_string(0);
 		avrdude_message(MSG_INFO, "%s: ser_recv(): read error: %s\n", progname, error);
-		free(error);
+		free((char *)error);
 		return -1;
 	}
 
@@ -642,7 +642,7 @@ static int ser_drain(union filedescriptor *fd, int display)
 		if (!readres) {
 			const char *error = last_error_string(0);
 			avrdude_message(MSG_INFO, "%s: ser_drain(): read error: %s\n", progname, error);
-			free(error);
+			free((char *)error);
 			return -1;
 		}
 
diff --git a/src/avrdude/serbb_win32.c b/src/avrdude/serbb_win32.c
index 4f1069c85..76db6ce3f 100644
--- a/src/avrdude/serbb_win32.c
+++ b/src/avrdude/serbb_win32.c
@@ -308,8 +308,8 @@ static int serbb_open(PROGRAMMER *pgm, char *port)
                         progname, port);
                 return -1;
 	}
-        avrdude_message(MSG_DEBUG, "%s: ser_open(): opened comm port \"%s\", handle 0x%x\n",
-                        progname, port, (int)hComPort);
+        avrdude_message(MSG_DEBUG, "%s: ser_open(): opened comm port \"%s\", handle %p\n",
+                        progname, port, (void *)hComPort);
 
         pgm->fd.pfd = (void *)hComPort;
 
@@ -326,8 +326,8 @@ static void serbb_close(PROGRAMMER *pgm)
 		pgm->setpin(pgm, PIN_AVR_RESET, 1);
 		CloseHandle (hComPort);
 	}
-        avrdude_message(MSG_DEBUG, "%s: ser_close(): closed comm port handle 0x%x\n",
-                                progname, (int)hComPort);
+        avrdude_message(MSG_DEBUG, "%s: ser_close(): closed comm port handle %p\n",
+                                progname, (void *)hComPort);
 
 	hComPort = INVALID_HANDLE_VALUE;
 }
diff --git a/src/avrdude/stk500.c b/src/avrdude/stk500.c
index efb7078bc..256076cc6 100644
--- a/src/avrdude/stk500.c
+++ b/src/avrdude/stk500.c
@@ -504,7 +504,7 @@ static int stk500_initialize(PROGRAMMER * pgm, AVRPART * p)
   }
   else {
     buf[9]  = 0xff;
-    buf[10]  = 0xff;
+    buf[10] = 0xff;
     buf[13] = 0;
     buf[14] = 0;
     buf[17] = 0;
@@ -821,7 +821,7 @@ static int stk500_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
         break;
       }
 
-    for (prusa3d_semicolon_workaround_round = 0; prusa3d_semicolon_workaround_round < (has_semicolon ? 2 : 1); ++ prusa3d_semicolon_workaround_round) {
+    for (prusa3d_semicolon_workaround_round = 0; prusa3d_semicolon_workaround_round < (has_semicolon ? 2u : 1u); prusa3d_semicolon_workaround_round++) {
       /* build command block and avoid multiple send commands as it leads to a crash
           of the silabs usb serial driver on mac os x */
       i = 0;
@@ -834,7 +834,7 @@ static int stk500_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
       buf[i++] = block_size & 0x0f;
       buf[i++] = memtype;
       if (has_semicolon) {
-        for (j = 0; j < block_size; ++i, ++ j) {
+        for (j = 0; j < (unsigned)block_size; ++i, ++ j) {
           buf[i] = m->buf[addr + j];
           if (buf[i] == ';')
             buf[i] |= (prusa3d_semicolon_workaround_round ? 0xf0 : 0x0f);
@@ -1088,8 +1088,8 @@ static int stk500_set_sck_period(PROGRAMMER * pgm, double v)
 
   min = 8.0 / STK500_XTAL;
   max = 255 * min;
-  dur = v / min + 0.5;
-  
+  dur = (int)(v / min + 0.5);
+
   if (v < min) {
       dur = 1;
       avrdude_message(MSG_INFO, "%s: stk500_set_sck_period(): p = %.1f us too small, using %.1f us\n",
@@ -1099,7 +1099,7 @@ static int stk500_set_sck_period(PROGRAMMER * pgm, double v)
       avrdude_message(MSG_INFO, "%s: stk500_set_sck_period(): p = %.1f us too large, using %.1f us\n",
                       progname, v / 1e-6, dur * min / 1e-6);
   }
-  
+
   return stk500_setparm(pgm, Parm_STK_SCK_DURATION, dur);
 }
 
diff --git a/src/avrdude/stk500v2.c b/src/avrdude/stk500v2.c
index 9bc629ba4..33bdf8eea 100644
--- a/src/avrdude/stk500v2.c
+++ b/src/avrdude/stk500v2.c
@@ -130,58 +130,58 @@ struct jtagispentry
 #define SZ_SPI_MULTI     (USHRT_MAX - 1)
 };
 
-static const struct jtagispentry jtagispcmds[] = {
-  /* generic */
-  { CMD_SET_PARAMETER, 2 },
-  { CMD_GET_PARAMETER, 3 },
-  { CMD_OSCCAL, 2 },
-  { CMD_LOAD_ADDRESS, 2 },
-  /* ISP mode */
-  { CMD_ENTER_PROGMODE_ISP, 2 },
-  { CMD_LEAVE_PROGMODE_ISP, 2 },
-  { CMD_CHIP_ERASE_ISP, 2 },
-  { CMD_PROGRAM_FLASH_ISP, 2 },
-  { CMD_READ_FLASH_ISP, SZ_READ_FLASH_EE },
-  { CMD_PROGRAM_EEPROM_ISP, 2 },
-  { CMD_READ_EEPROM_ISP, SZ_READ_FLASH_EE },
-  { CMD_PROGRAM_FUSE_ISP, 3 },
-  { CMD_READ_FUSE_ISP, 4 },
-  { CMD_PROGRAM_LOCK_ISP, 3 },
-  { CMD_READ_LOCK_ISP, 4 },
-  { CMD_READ_SIGNATURE_ISP, 4 },
-  { CMD_READ_OSCCAL_ISP, 4 },
-  { CMD_SPI_MULTI, SZ_SPI_MULTI },
-  /* all HV modes */
-  { CMD_SET_CONTROL_STACK, 2 },
-  /* HVSP mode */
-  { CMD_ENTER_PROGMODE_HVSP, 2 },
-  { CMD_LEAVE_PROGMODE_HVSP, 2 },
-  { CMD_CHIP_ERASE_HVSP, 2 },
-  { CMD_PROGRAM_FLASH_HVSP, 2 },
-  { CMD_READ_FLASH_HVSP, SZ_READ_FLASH_EE },
-  { CMD_PROGRAM_EEPROM_HVSP, 2 },
-  { CMD_READ_EEPROM_HVSP, SZ_READ_FLASH_EE },
-  { CMD_PROGRAM_FUSE_HVSP, 2 },
-  { CMD_READ_FUSE_HVSP, 3 },
-  { CMD_PROGRAM_LOCK_HVSP, 2 },
-  { CMD_READ_LOCK_HVSP, 3 },
-  { CMD_READ_SIGNATURE_HVSP, 3 },
-  { CMD_READ_OSCCAL_HVSP, 3 },
-  /* PP mode */
-  { CMD_ENTER_PROGMODE_PP, 2 },
-  { CMD_LEAVE_PROGMODE_PP, 2 },
-  { CMD_CHIP_ERASE_PP, 2 },
-  { CMD_PROGRAM_FLASH_PP, 2 },
-  { CMD_READ_FLASH_PP, SZ_READ_FLASH_EE },
-  { CMD_PROGRAM_EEPROM_PP, 2 },
-  { CMD_READ_EEPROM_PP, SZ_READ_FLASH_EE },
-  { CMD_PROGRAM_FUSE_PP, 2 },
-  { CMD_READ_FUSE_PP, 3 },
-  { CMD_PROGRAM_LOCK_PP, 2 },
-  { CMD_READ_LOCK_PP, 3 },
-  { CMD_READ_SIGNATURE_PP, 3 },
-  { CMD_READ_OSCCAL_PP, 3 },
-};
+// static const struct jtagispentry jtagispcmds[] = {
+//   /* generic */
+//   { CMD_SET_PARAMETER, 2 },
+//   { CMD_GET_PARAMETER, 3 },
+//   { CMD_OSCCAL, 2 },
+//   { CMD_LOAD_ADDRESS, 2 },
+//   /* ISP mode */
+//   { CMD_ENTER_PROGMODE_ISP, 2 },
+//   { CMD_LEAVE_PROGMODE_ISP, 2 },
+//   { CMD_CHIP_ERASE_ISP, 2 },
+//   { CMD_PROGRAM_FLASH_ISP, 2 },
+//   { CMD_READ_FLASH_ISP, SZ_READ_FLASH_EE },
+//   { CMD_PROGRAM_EEPROM_ISP, 2 },
+//   { CMD_READ_EEPROM_ISP, SZ_READ_FLASH_EE },
+//   { CMD_PROGRAM_FUSE_ISP, 3 },
+//   { CMD_READ_FUSE_ISP, 4 },
+//   { CMD_PROGRAM_LOCK_ISP, 3 },
+//   { CMD_READ_LOCK_ISP, 4 },
+//   { CMD_READ_SIGNATURE_ISP, 4 },
+//   { CMD_READ_OSCCAL_ISP, 4 },
+//   { CMD_SPI_MULTI, SZ_SPI_MULTI },
+//   /* all HV modes */
+//   { CMD_SET_CONTROL_STACK, 2 },
+//   /* HVSP mode */
+//   { CMD_ENTER_PROGMODE_HVSP, 2 },
+//   { CMD_LEAVE_PROGMODE_HVSP, 2 },
+//   { CMD_CHIP_ERASE_HVSP, 2 },
+//   { CMD_PROGRAM_FLASH_HVSP, 2 },
+//   { CMD_READ_FLASH_HVSP, SZ_READ_FLASH_EE },
+//   { CMD_PROGRAM_EEPROM_HVSP, 2 },
+//   { CMD_READ_EEPROM_HVSP, SZ_READ_FLASH_EE },
+//   { CMD_PROGRAM_FUSE_HVSP, 2 },
+//   { CMD_READ_FUSE_HVSP, 3 },
+//   { CMD_PROGRAM_LOCK_HVSP, 2 },
+//   { CMD_READ_LOCK_HVSP, 3 },
+//   { CMD_READ_SIGNATURE_HVSP, 3 },
+//   { CMD_READ_OSCCAL_HVSP, 3 },
+//   /* PP mode */
+//   { CMD_ENTER_PROGMODE_PP, 2 },
+//   { CMD_LEAVE_PROGMODE_PP, 2 },
+//   { CMD_CHIP_ERASE_PP, 2 },
+//   { CMD_PROGRAM_FLASH_PP, 2 },
+//   { CMD_READ_FLASH_PP, SZ_READ_FLASH_EE },
+//   { CMD_PROGRAM_EEPROM_PP, 2 },
+//   { CMD_READ_EEPROM_PP, SZ_READ_FLASH_EE },
+//   { CMD_PROGRAM_FUSE_PP, 2 },
+//   { CMD_READ_FUSE_PP, 3 },
+//   { CMD_PROGRAM_LOCK_PP, 2 },
+//   { CMD_READ_LOCK_PP, 3 },
+//   { CMD_READ_SIGNATURE_PP, 3 },
+//   { CMD_READ_OSCCAL_PP, 3 },
+// };
 
 /*
  * From XML file:
@@ -379,15 +379,15 @@ static void stk500v2_jtag3_teardown(PROGRAMMER * pgm)
 }
 
 
-static unsigned short
-b2_to_u16(unsigned char *b)
-{
-  unsigned short l;
-  l = b[0];
-  l += (unsigned)b[1] << 8;
+// static unsigned short
+// b2_to_u16(unsigned char *b)
+// {
+//   unsigned short l;
+//   l = b[0];
+//   l += (unsigned)b[1] << 8;
 
-  return l;
-}
+//   return l;
+// }
 
 static int stk500v2_send_mk2(PROGRAMMER * pgm, unsigned char * data, size_t len)
 {
@@ -399,16 +399,16 @@ static int stk500v2_send_mk2(PROGRAMMER * pgm, unsigned char * data, size_t len)
   return 0;
 }
 
-static unsigned short get_jtagisp_return_size(unsigned char cmd)
-{
-  int i;
+// static unsigned short get_jtagisp_return_size(unsigned char cmd)
+// {
+//   int i;
 
-  for (i = 0; i < sizeof jtagispcmds / sizeof jtagispcmds[0]; i++)
-    if (jtagispcmds[i].cmd == cmd)
-      return jtagispcmds[i].size;
+//   for (i = 0; i < sizeof jtagispcmds / sizeof jtagispcmds[0]; i++)
+//     if (jtagispcmds[i].cmd == cmd)
+//       return jtagispcmds[i].size;
 
-  return 0;
-}
+//   return 0;
+// }
 
 /*
  * Send the data as a JTAG ICE mkII encapsulated ISP packet.
@@ -504,7 +504,7 @@ static int stk500v2_send(PROGRAMMER * pgm, unsigned char * data, size_t len)
 
   buf[0] = MESSAGE_START;
   buf[1] = PDATA(pgm)->command_sequence;
-  buf[2] = len / 256;
+  buf[2] = (char)(len / 256);
   buf[3] = len % 256;
   buf[4] = TOKEN;
   memcpy(buf+5, data, len);
@@ -1128,7 +1128,8 @@ static int stk500v2_program_enable(PROGRAMMER * pgm, AVRPART * p)
 {
   unsigned char buf[16];
   char msg[100];             /* see remarks above about size needed */
-  int rv, tries;
+  int rv;
+  // int tries;
 
   PDATA(pgm)->lastpart = p;
 
@@ -1143,7 +1144,7 @@ static int stk500v2_program_enable(PROGRAMMER * pgm, AVRPART * p)
       /* Activate AVR-style (low active) RESET */
       stk500v2_setparm_real(pgm, PARAM_RESET_POLARITY, 0x01);
 
-  tries = 0;
+  // tries = 0;
 // retry:
   buf[0] = CMD_ENTER_PROGMODE_ISP;
   buf[1] = p->timeout;
@@ -1882,7 +1883,7 @@ static int stk500hv_read_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
     if (stk500v2_loadaddr(pgm, use_ext_addr | (paddr >> addrshift)) < 0)
         return -1;
   } else {
-    buf[1] = addr;
+    buf[1] = (char)addr;
   }
 
   avrdude_message(MSG_NOTICE2, "%s: stk500hv_read_byte(): Sending read memory command: ",
@@ -2137,7 +2138,7 @@ static int stk500hv_write_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
     if (stk500v2_loadaddr(pgm, use_ext_addr | (paddr >> addrshift)) < 0)
         return -1;
   } else {
-    buf[1] = addr;
+    buf[1] = (char)addr;
     buf[2] = data;
     if (mode == PPMODE) {
       buf[3] = pulsewidth;
@@ -2298,7 +2299,7 @@ static int stk500v2_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
                                 unsigned int page_size,
                                 unsigned int addr, unsigned int n_bytes)
 {
-static int page = 0;
+// static int page = 0;
   unsigned int block_size, last_addr, addrshift, use_ext_addr;
   unsigned int maxaddr = addr + n_bytes;
   unsigned char commandbuf[10];
@@ -2833,10 +2834,10 @@ static int stk500v2_set_fosc(PROGRAMMER * pgm, double v)
                       progname, v, unit, STK500V2_XTAL / 2e6);
       fosc = STK500V2_XTAL / 2;
     } else
-      fosc = (unsigned)v;
+      fosc = (int)v;
 
     for (idx = 0; idx < sizeof(ps) / sizeof(ps[0]); idx++) {
-      if (fosc >= STK500V2_XTAL / (256 * ps[idx] * 2)) {
+      if (fosc >= (int)(STK500V2_XTAL / (256 * ps[idx] * 2))) {
         /* this prescaler value can handle our frequency */
         prescale = idx + 1;
         cmatch = (unsigned)(STK500V2_XTAL / (2 * fosc * ps[idx])) - 1;
@@ -3065,8 +3066,8 @@ static int stk600_set_fosc(PROGRAMMER * pgm, double v)
 {
   unsigned int oct, dac;
 
-  oct = 1.443 * log(v / 1039.0);
-  dac = 2048 - (2078.0 * pow(2, (double)(10 + oct))) / v;
+  oct = (unsigned)(1.443 * log(v / 1039.0));
+  dac = (unsigned)(2048.0 - (2078.0 * pow(2, (double)(10 + oct))) / v);
 
   return stk500v2_setparm2(pgm, PARAM2_CLOCK_CONF, (oct << 12) | (dac << 2));
 }
@@ -3075,7 +3076,7 @@ static int stk600_set_sck_period(PROGRAMMER * pgm, double v)
 {
   unsigned int sck;
 
-  sck = ceil((16e6 / (2 * 1.0 / v)) - 1);
+  sck = (unsigned)ceil((16e6 / (2 * 1.0 / v)) - 1);
 
   if (sck >= 4096)
     sck = 4095;
@@ -3093,7 +3094,7 @@ static int stk500v2_jtag3_set_sck_period(PROGRAMMER * pgm, double v)
   else if (v > 1E-3)
     sck = 1;
   else
-    sck = 1.0 / (1000.0 * v);
+    sck = (unsigned)(1.0 / (1000.0 * v));
 
   value[0] = CMD_SET_SCK;
   value[1] = sck & 0xff;
@@ -3143,7 +3144,7 @@ static int stk500v2_setparm_real(PROGRAMMER * pgm, unsigned char parm, unsigned
 
 static int stk500v2_setparm(PROGRAMMER * pgm, unsigned char parm, unsigned char value)
 {
-  unsigned char current_value;
+  unsigned char current_value = 0;
   int res;
 
   res = stk500v2_getparm(pgm, parm, &current_value);
@@ -3214,8 +3215,15 @@ static const char *stk600_get_cardname(const struct carddata *table,
 
 static void stk500v2_display(PROGRAMMER * pgm, const char * p)
 {
-  unsigned char maj, min, hdw, topcard, maj_s1, min_s1, maj_s2, min_s2;
-  unsigned int rev;
+  unsigned char maj = 0;
+  unsigned char min = 0;
+  unsigned char hdw = 0;
+  unsigned char topcard = 0;
+  unsigned char maj_s1 = 0;
+  unsigned char min_s1 = 0;
+  unsigned char maj_s2 = 0;
+  unsigned char min_s2 = 0;
+  unsigned int rev = 0;
   const char *topcard_name, *pgmname;
 
   switch (PDATA(pgm)->pgmtype) {
@@ -3294,13 +3302,20 @@ f_to_kHz_MHz(double f, const char **unit)
 
 static void stk500v2_print_parms1(PROGRAMMER * pgm, const char * p)
 {
-  unsigned char vtarget, vadjust, osc_pscale, osc_cmatch, sck_duration =0; //XXX 0 is not correct, check caller
-  unsigned int sck_stk600, clock_conf, dac, oct, varef;
-  unsigned char vtarget_jtag[4];
+  unsigned char vtarget = 0;
+  unsigned char vadjust = 0;
+  unsigned char sck_duration = 0;
+  unsigned char osc_pscale = 0;
+  unsigned char osc_cmatch = 0;
+  unsigned varef = 0;
+  unsigned sck_stk600 = 0;
+  unsigned clock_conf = 0;
+  unsigned dac, oct;
+  // unsigned char vtarget_jtag[4];
   int prescale;
   double f;
   const char *unit;
-  void *mycookie;
+  // void *mycookie;
 
   if (PDATA(pgm)->pgmtype == PGMTYPE_JTAGICE_MKII) {
     return;
@@ -3963,10 +3978,10 @@ static int stk600_xprog_write_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
     b[0] = XPRG_CMD_WRITE_MEM;
     b[1] = memcode;
     b[2] = 0;			/* pagemode: non-paged write */
-    b[3] = addr >> 24;
-    b[4] = addr >> 16;
-    b[5] = addr >> 8;
-    b[6] = addr;
+    b[3] = (char)(addr >> 24);
+    b[4] = (char)(addr >> 16);
+    b[5] = (char)(addr >> 8);
+    b[6] = (char)addr;
     b[7] = 0;
     b[8] = write_size;
     b[9] = data;
@@ -4011,10 +4026,10 @@ static int stk600_xprog_read_byte(PROGRAMMER * pgm, AVRPART * p, AVRMEM * mem,
     addr += mem->offset;
 
     b[0] = XPRG_CMD_READ_MEM;
-    b[2] = addr >> 24;
-    b[3] = addr >> 16;
-    b[4] = addr >> 8;
-    b[5] = addr;
+    b[2] = (char)(addr >> 24);
+    b[3] = (char)(addr >> 16);
+    b[4] = (char)(addr >> 8);
+    b[5] = (char)addr;
     b[6] = 0;
     b[7] = 1;
     if (stk600_xprog_command(pgm, b, 8, 3) < 0) {
diff --git a/src/avrdude/term.c b/src/avrdude/term.c
index 012f6f1a5..182367cf2 100644
--- a/src/avrdude/term.c
+++ b/src/avrdude/term.c
@@ -281,7 +281,7 @@ static int cmd_dump(PROGRAMMER * pgm, struct avrpart * p,
 
   maxsize = mem->size;
 
-  if (addr >= maxsize) {
+  if (addr >= (unsigned long)maxsize) {
     if (argc == 2) {
       /* wrap around */
       addr = 0;
@@ -294,7 +294,7 @@ static int cmd_dump(PROGRAMMER * pgm, struct avrpart * p,
   }
 
   /* trim len if nessary to not read past the end of memory */
-  if ((addr + len) > maxsize)
+  if ((addr + len) > (unsigned long)maxsize)
     len = maxsize - addr;
 
   buf = malloc(len);
@@ -303,7 +303,7 @@ static int cmd_dump(PROGRAMMER * pgm, struct avrpart * p,
     return -1;
   }
 
-  for (i=0; i<len; i++) {
+  for (i = 0; i < (unsigned long)len; i++) {
     rc = pgm->read_byte(pgm, p, mem, addr+i, &buf[i]);
     if (rc != 0) {
       avrdude_message(MSG_INFO, "error reading %s address 0x%05lx of part %s\n",
@@ -364,7 +364,7 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
     return -1;
   }
 
-  if (addr > maxsize) {
+  if (addr > (unsigned long)maxsize) {
     avrdude_message(MSG_INFO, "%s (write): address 0x%05lx is out of range for %s memory\n",
                     progname, addr, memtype);
     return -1;
@@ -373,7 +373,7 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
   /* number of bytes to write at the specified address */
   len = argc - 3;
 
-  if ((addr + len) > maxsize) {
+  if ((addr + len) > (unsigned long)maxsize) {
     avrdude_message(MSG_INFO, "%s (write): selected address and # bytes exceed "
                     "range for %s memory\n",
                     progname, memtype);
@@ -386,8 +386,8 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
     return -1;
   }
 
-  for (i=3; i<argc; i++) {
-    buf[i-3] = strtoul(argv[i], &e, 0);
+  for (i = 3; i < (unsigned long)argc; i++) {
+    buf[i-3] = (char)strtoul(argv[i], &e, 0);
     if (*e || (e == argv[i])) {
       avrdude_message(MSG_INFO, "%s (write): can't parse byte \"%s\"\n",
               progname, argv[i]);
@@ -397,7 +397,7 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
   }
 
   pgm->err_led(pgm, OFF);
-  for (werror=0, i=0; i<len; i++) {
+  for (werror = 0, i = 0; i < (unsigned long)len; i++) {
 
     rc = avr_write_byte(pgm, p, mem, addr+i, buf[i]);
     if (rc) {
@@ -462,7 +462,7 @@ static int cmd_send(PROGRAMMER * pgm, struct avrpart * p,
 
   /* load command bytes */
   for (i=1; i<argc; i++) {
-    cmd[i-1] = strtoul(argv[i], &e, 0);
+    cmd[i-1] = (char)strtoul(argv[i], &e, 0);
     if (*e || (e == argv[i])) {
       avrdude_message(MSG_INFO, "%s (send): can't parse byte \"%s\"\n",
               progname, argv[i]);
@@ -789,7 +789,7 @@ static int tokenize(char * s, char *** argv)
   char  * nbuf;
   char ** av;
 
-  slen = strlen(s);
+  slen = (int)strlen(s);
 
   /* 
    * initialize allow for 20 arguments, use realloc to grow this if
@@ -812,7 +812,7 @@ static int tokenize(char * s, char *** argv)
     nexttok(r, &q, &r);
     strcpy(nbuf, q);
     bufv[n]  = nbuf;
-    len      = strlen(q);
+    len      = (int)strlen(q);
     l       += len + 1;
     nbuf    += len + 1;
     nbuf[0]  = 0;
@@ -841,7 +841,7 @@ static int tokenize(char * s, char *** argv)
   q  = (char *)&av[n+1];
   memcpy(q, buf, l);
   for (i=0; i<n; i++) {
-    offset = bufv[i] - buf;
+    offset = (int)(bufv[i] - buf);
     av[i] = q + offset;
   }
   av[i] = NULL;
@@ -862,7 +862,7 @@ static int do_cmd(PROGRAMMER * pgm, struct avrpart * p,
   int hold;
   int len;
 
-  len = strlen(argv[0]);
+  len = (int)strlen(argv[0]);
   hold = -1;
   for (i=0; i<NCMDS; i++) {
     if (strcasecmp(argv[0], cmd[i].name) == 0) {

From f7d4a35c3db5c0fc7ea861e2ea2c9f426c379f4a Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Tue, 25 Jun 2019 16:54:11 +0200
Subject: [PATCH 2/5] semver: warnings cleanup

---
 src/semver/semver.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/semver/semver.c b/src/semver/semver.c
index 527738644..e8bd6edcf 100644
--- a/src/semver/semver.c
+++ b/src/semver/semver.c
@@ -22,6 +22,10 @@
 static const size_t MAX_SIZE     = sizeof(char) * 255;
 static const int MAX_SAFE_INT = (unsigned int) -1 >> 1;
 
+#ifdef _WIN32
+  #define strdup _strdup
+#endif
+
 /**
  * Define comparison operators, storing the
  * ASCII code per each symbol in hexadecimal notation.
@@ -50,8 +54,8 @@ strcut (char *str, int begin, int len) {
 
   if((int)l < 0 || (int)l > MAX_SAFE_INT) return -1;
 
-  if (len < 0) len = l - begin + 1;
-  if (begin + len > (int)l) len = l - begin;
+  if (len < 0) len = (int)l - begin + 1;
+  if (begin + len > (int)l) len = (int)l - begin;
   memmove(str + begin, str + begin + len, l - len + 1 - begin);
 
   return len;
@@ -104,7 +108,7 @@ parse_int (const char *s) {
 static char *
 parse_slice (char *buf, char sep) {
   char *pr, *part;
-  int plen;
+  size_t plen;
 
   /* Find separator in buf */
   pr = strchr(buf, sep);
@@ -210,8 +214,9 @@ semver_parse_version (const char *str, semver_t *ver) {
 static int
 compare_prerelease (char *x, char *y) {
   char *lastx, *lasty, *xptr, *yptr, *endptr;
-  int xlen, ylen, xisnum, yisnum, xnum, ynum;
-  int xn, yn, min, res;
+  size_t xlen, ylen, xn, yn, min;
+  int xisnum, yisnum, xnum, ynum;
+  int res;
   if (x == NULL && y == NULL) return 0;
   if (y == NULL && x) return -1;
   if (x == NULL && y) return 1;
@@ -572,7 +577,7 @@ semver_clean (char *s) {
 
   for (i = 0; i < len; i++) {
     if (contains(s[i], VALID_CHARS, mlen) == 0) {
-      res = strcut(s, i, 1);
+      res = strcut(s, (int)i, 1);
       if(res == -1) return -1;
       --len; --i;
     }

From 4fb904357f9b3d727bb1dd8130cc7252f50e2e1e Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Tue, 25 Jun 2019 17:23:53 +0200
Subject: [PATCH 3/5] Warnings cleanup in BonjourDialog, ConfigWizard,
 FirmwareDialog, GLGizmoCut, ImGuiWrapper

---
 src/slic3r/GUI/BonjourDialog.cpp     |  2 +-
 src/slic3r/GUI/ConfigWizard.cpp      |  6 ++--
 src/slic3r/GUI/FirmwareDialog.cpp    |  3 +-
 src/slic3r/GUI/Gizmos/GLGizmoCut.cpp | 44 +---------------------------
 src/slic3r/GUI/ImGuiWrapper.cpp      |  4 +--
 5 files changed, 8 insertions(+), 51 deletions(-)

diff --git a/src/slic3r/GUI/BonjourDialog.cpp b/src/slic3r/GUI/BonjourDialog.cpp
index 1885dda7b..0e05a517c 100644
--- a/src/slic3r/GUI/BonjourDialog.cpp
+++ b/src/slic3r/GUI/BonjourDialog.cpp
@@ -171,7 +171,7 @@ void BonjourDialog::on_reply(BonjourReplyEvent &e)
 	// Filter replies based on selected technology
 	const auto model = e.reply.txt_data.find("model");
 	const bool sl1 = model != e.reply.txt_data.end() && model->second == "SL1";
-	if (tech == ptFFF && sl1 || tech == ptSLA && !sl1) {
+	if ((tech == ptFFF && sl1) || (tech == ptSLA && !sl1)) {
 		return;
 	}
 
diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp
index aacbfdc52..8b08f6f7f 100644
--- a/src/slic3r/GUI/ConfigWizard.cpp
+++ b/src/slic3r/GUI/ConfigWizard.cpp
@@ -330,8 +330,8 @@ PagePrinters::PagePrinters(ConfigWizard *parent, wxString title, wxString shortn
     const auto families = vendor.families();
     for (const auto &family : families) {
         const auto filter = [&](const VendorProfile::PrinterModel &model) {
-            return (model.technology == ptFFF && technology & T_FFF
-                    || model.technology == ptSLA && technology & T_SLA)
+            return ((model.technology == ptFFF && technology & T_FFF)
+                    || (model.technology == ptSLA && technology & T_SLA))
                 && model.family == family;
         };
 
@@ -810,7 +810,7 @@ void ConfigWizardIndex::on_paint(wxPaintEvent & evt)
         const Item& item = items[i];
         unsigned x = em_w/2 + item.indent * em_w;
 
-        if (i == item_active || item_hover >= 0 && i == (size_t)item_hover) {
+        if (i == item_active || (item_hover >= 0 && i == (size_t)item_hover)) {
             dc.DrawBitmap(bullet_blue.bmp(), x, y + yoff_icon, false);
         }
         else if (i < item_active)  { dc.DrawBitmap(bullet_black.bmp(), x, y + yoff_icon, false); }
diff --git a/src/slic3r/GUI/FirmwareDialog.cpp b/src/slic3r/GUI/FirmwareDialog.cpp
index 15a09aa71..7865aecf2 100644
--- a/src/slic3r/GUI/FirmwareDialog.cpp
+++ b/src/slic3r/GUI/FirmwareDialog.cpp
@@ -442,8 +442,7 @@ void FirmwareDialog::priv::avr109_lookup_port(Avr109Pid usb_pid)
 	auto ports = Utils::scan_serial_ports_extended();
 	ports.erase(std::remove_if(ports.begin(), ports.end(), [=](const SerialPortInfo &port ) {
 		return port.id_vendor != USB_VID_PRUSA ||
-			port.id_product != usb_pid.boot &&
-			port.id_product != usb_pid.app;
+			(port.id_product != usb_pid.boot && port.id_product != usb_pid.app);
 	}), ports.end());
 
 	if (ports.size() == 0) {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
index 8934bc52b..17db953d4 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
@@ -15,48 +15,6 @@
 namespace Slic3r {
 namespace GUI {
 
-
-class GLGizmoCutPanel : public wxPanel
-{
-public:
-    GLGizmoCutPanel(wxWindow *parent);
-
-    void display(bool display);
-private:
-    bool m_active;
-    wxCheckBox *m_cb_rotate;
-    wxButton *m_btn_cut;
-    wxButton *m_btn_cancel;
-};
-
-GLGizmoCutPanel::GLGizmoCutPanel(wxWindow *parent)
-    : wxPanel(parent)
-    , m_active(false)
-    , m_cb_rotate(new wxCheckBox(this, wxID_ANY, _(L("Rotate lower part upwards"))))
-    , m_btn_cut(new wxButton(this, wxID_OK, _(L("Perform cut"))))
-    , m_btn_cancel(new wxButton(this, wxID_CANCEL, _(L("Cancel"))))
-{
-    enum { MARGIN = 5 };
-
-    auto *sizer = new wxBoxSizer(wxHORIZONTAL);
-
-    auto *label = new wxStaticText(this, wxID_ANY, _(L("Cut object:")));
-    sizer->Add(label, 0, wxALL | wxALIGN_CENTER, MARGIN);
-    sizer->Add(m_cb_rotate, 0, wxALL | wxALIGN_CENTER, MARGIN);
-    sizer->AddStretchSpacer();
-    sizer->Add(m_btn_cut, 0, wxALL | wxALIGN_CENTER, MARGIN);
-    sizer->Add(m_btn_cancel, 0, wxALL | wxALIGN_CENTER, MARGIN);
-
-    SetSizer(sizer);
-}
-
-void GLGizmoCutPanel::display(bool display)
-{
-    Show(display);
-    GetParent()->Layout();
-}
-
-
 const double GLGizmoCut::Offset = 10.0;
 const double GLGizmoCut::Margin = 20.0;
 const std::array<float, 3> GLGizmoCut::GrabberColor = { 1.0, 0.5, 0.0 };
@@ -188,7 +146,7 @@ void GLGizmoCut::on_render_input_window(float x, float y, float bottom_limit, co
     m_imgui->begin(_(L("Cut")), ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);
 
     ImGui::PushItemWidth(m_imgui->scaled(5.0f));
-    bool _value_changed = ImGui::InputDouble("Z", &m_cut_z, 0.0f, 0.0f, "%.2f");
+    ImGui::InputDouble("Z", &m_cut_z, 0.0f, 0.0f, "%.2f");
 
     m_imgui->checkbox(_(L("Keep upper part")), m_keep_upper);
     m_imgui->checkbox(_(L("Keep lower part")), m_keep_lower);
diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp
index ca1538bf7..b6abf641a 100644
--- a/src/slic3r/GUI/ImGuiWrapper.cpp
+++ b/src/slic3r/GUI/ImGuiWrapper.cpp
@@ -326,9 +326,9 @@ bool ImGuiWrapper::combo(const wxString& label, const std::vector<std::string>&
     int selection_out = -1;
     bool res = false;
 
-    const char *selection_str = selection < options.size() ? options[selection].c_str() : "";
+    const char *selection_str = selection < (int)options.size() ? options[selection].c_str() : "";
     if (ImGui::BeginCombo("", selection_str)) {
-        for (int i = 0; i < options.size(); i++) {
+        for (int i = 0; i < (int)options.size(); i++) {
             if (ImGui::Selectable(options[i].c_str(), i == selection)) {
                 selection_out = i;
             }

From 85575e5615d44e5bc46963f446b2b406464c1150 Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Tue, 25 Jun 2019 17:25:24 +0200
Subject: [PATCH 4/5] Fix: IsTriviallyCopyable on clang

---
 src/libslic3r/Utils.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp
index e76fccdb8..adf7f57a7 100644
--- a/src/libslic3r/Utils.hpp
+++ b/src/libslic3r/Utils.hpp
@@ -167,7 +167,7 @@ template<class T> size_t next_highest_power_of_2(T v,
 extern std::string xml_escape(std::string text);
 
 
-#if defined __GNUC__ & __GNUC__ < 5
+#if defined __GNUC__ && __GNUC__ < 5 && !defined __clang__
 // Older GCCs don't have std::is_trivially_copyable
 // cf. https://gcc.gnu.org/onlinedocs/gcc-4.9.4/libstdc++/manual/manual/status.html#status.iso.2011
 #warning "GCC version < 5, faking std::is_trivially_copyable"

From a38bcdde6681c81559e0aa7a01361d62ef2118eb Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Tue, 25 Jun 2019 17:41:24 +0200
Subject: [PATCH 5/5] avrdude: Fix types in embedded config

---
 src/avrdude/avrdude-slic3r.conf.h | 6 +++---
 src/avrdude/conf-generate.cpp     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/avrdude/avrdude-slic3r.conf.h b/src/avrdude/avrdude-slic3r.conf.h
index 7cc901336..905b14ee8 100644
--- a/src/avrdude/avrdude-slic3r.conf.h
+++ b/src/avrdude/avrdude-slic3r.conf.h
@@ -1,5 +1,5 @@
 /* WARN: This file is auto-generated from `avrdude-slic3r.conf` */
-unsigned char avrdude_slic3r_conf[] = {
+const unsigned char avrdude_slic3r_conf[] = {
     0x0a, 0x23, 0x0a, 0x23, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 
     0x20, 0x61, 0x20, 0x62, 0x61, 0x73, 0x69, 0x63, 0x20, 0x6d, 0x69, 0x6e, 
     0x69, 0x6d, 0x61, 0x6c, 0x20, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x20, 
@@ -1184,5 +1184,5 @@ unsigned char avrdude_slic3r_conf[] = {
     0x20, 0x20, 0x3b, 0x0a, 0x0a, 0x0a, 
     0, 0
 };
-size_t avrdude_slic3r_conf_size = 14178;
-size_t avrdude_slic3r_conf_size_yy = 14180;
+const size_t avrdude_slic3r_conf_size = 14178;
+const size_t avrdude_slic3r_conf_size_yy = 14180;
diff --git a/src/avrdude/conf-generate.cpp b/src/avrdude/conf-generate.cpp
index f2761ba22..4aa80ae0a 100644
--- a/src/avrdude/conf-generate.cpp
+++ b/src/avrdude/conf-generate.cpp
@@ -21,7 +21,7 @@ int main(int argc, char const *argv[])
     }
 
     std::cout << "/* WARN: This file is auto-generated from `" << filename << "` */" << std::endl;
-    std::cout << "unsigned char " << symbol << "[] = {";
+    std::cout << "const unsigned char " << symbol << "[] = {";
 
     char c;
     std::cout << std::hex;
@@ -34,8 +34,8 @@ int main(int argc, char const *argv[])
     std::cout << "\n    0, 0\n};\n";
 
     std::cout << std::dec;
-    std::cout << "size_t " << symbol << "_size = " << size << ";" << std::endl;
-    std::cout << "size_t " << symbol << "_size_yy = " << size + 2 << ";" << std::endl;
+    std::cout << "const size_t " << symbol << "_size = " << size << ";" << std::endl;
+    std::cout << "const size_t " << symbol << "_size_yy = " << size + 2 << ";" << std::endl;
 
     return 0;
 }