Differentiate LIBAVRDUDE_EXIT_FAIL and ..._EXIT_OK

stefanrueger · stefanrueger · commit d4308096a94d · 2025-10-31T20:02:37.000+01:00
LIBAVRDUDE_EXIT was introduced to allow driver function to tell main.c
that all is done and avrdude should exit(0) indicating success. For
example, processing the -x help options in the driver should exit.

There have been increasingly more situations when the driver function
needed to return and suppress error messages from the caller; for these
LIBAVRDUDE_EXIT was used but now avrdude wrongly indicated success to the
shell when it should indicate an error.

This commit replaces LIBAVRDUDE_EXIT with LIBAVRDUDE_EXIT_FAIL or
LIBAVRDUDE_EXIT_OK as appropriate indicating error or success to the
shell, respectively.
diff --git a/src/arduino.c b/src/arduino.c
@@ -56,7 +56,7 @@ static int arduino_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/avr.c b/src/avr.c
@@ -471,7 +471,7 @@ int avr_read_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, con
     if(pgm->read_sig_bytes) {
       int rc = pgm->read_sig_bytes(pgm, p, mem);
 
-      if(rc < 0 && rc != LIBAVRDUDE_EXIT)
+      if(rc < 0 && rc != LIBAVRDUDE_EXIT_OK)
         led_set(pgm, LED_ERR);
       led_clr(pgm, LED_PGM);
       return rc;
@@ -1216,13 +1216,13 @@ int avr_signature(const PROGRAMMER *pgm, const AVRPART *p) {
   if(verbose > 1)
     report_progress(0, 1, "Reading");
   rc = avr_read(pgm, p, "signature", 0);
-  if(rc < LIBAVRDUDE_SUCCESS && rc != LIBAVRDUDE_EXIT) {
+  if(rc < LIBAVRDUDE_SUCCESS && rc != LIBAVRDUDE_EXIT_OK) {
     pmsg_error("unable to read signature data for part %s (rc = %d)\n", p->desc, rc);
     return rc;
   }
   report_progress(1, 1, NULL);
 
-  return rc < LIBAVRDUDE_SUCCESS? LIBAVRDUDE_EXIT: LIBAVRDUDE_SUCCESS;
+  return rc < LIBAVRDUDE_SUCCESS? LIBAVRDUDE_EXIT_OK: LIBAVRDUDE_SUCCESS;
 }
 
 // Obtain bitmask for byte in memory (classic, TPI, PDI and UPDI parts)
diff --git a/src/avr910.c b/src/avr910.c
@@ -303,7 +303,7 @@ static int avr910_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
     }
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/avrftdi.c b/src/avrftdi.c
@@ -1348,7 +1348,7 @@ static int avrftdi_jtag_initialize(const PROGRAMMER *pgm, const AVRPART *p) {
 
       pmsg_error("programmer type %s is known not to work for %s\n", pgm->type, p->desc);
       pmsg_error("exiting, use -F to carry on regardless\n");
-      return LIBAVRDUDE_EXIT;
+      return LIBAVRDUDE_EXIT_FAIL;
     }
   }
 
diff --git a/src/buspirate.c b/src/buspirate.c
@@ -395,7 +395,7 @@ static int buspirate_parseextparms(const PROGRAMMER *pgm, const LISTID extparms)
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/butterfly.c b/src/butterfly.c
@@ -640,7 +640,7 @@ static int butterfly_parseextparms(const PROGRAMMER *pgm, const LISTID extparms)
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/dryrun.c b/src/dryrun.c
@@ -1016,7 +1016,7 @@ static int dryrun_parseextparams(const PROGRAMMER *pgm, const LISTID extparms) {
     }
     if(str_eq(xpara, "help")) {
       help = true;
-      rc = LIBAVRDUDE_EXIT;
+      rc = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/flip2.c b/src/flip2.c
@@ -484,7 +484,7 @@ static int flip2_parseexitspecs(PROGRAMMER *pgm, const char *sp) {
     }
     if(str_eq(cp, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/jtag3.c b/src/jtag3.c
@@ -1585,8 +1585,7 @@ static int jtag3_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
         continue;
       }
       // Flag a switch to PIC mode
-      if(str_caseeq(extended_param, "mode=pic") ||
-         str_caseeq(extended_param, "mode=mplab")) {
+      if(str_caseeq(extended_param, "mode=mplab") || str_caseeq(extended_param, "mode=pic")) {
         my.pk4_snap_mode = PK4_SNAP_MODE_PIC;
         continue;
       }
@@ -1597,7 +1596,7 @@ static int jtag3_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
@@ -1738,7 +1737,7 @@ int jtag3_open_common(PROGRAMMER *pgm, const char *port, int mode_switch) {
             imsg_error("$ %s -c pickit4_mplab%s%s%s -P %s\n", progname, pgm_suffix, partsdesc_flag, partsdesc_str, port);
           }
           serial_close(&pgm->fd);
-          return LIBAVRDUDE_EXIT;;
+          return LIBAVRDUDE_EXIT_FAIL;
         }
       }
     }
@@ -1787,7 +1786,7 @@ int jtag3_open_common(PROGRAMMER *pgm, const char *port, int mode_switch) {
     }
     msg_error("MPLAB mode switch successful\n");
     serial_close(&pgm->fd);
-    return LIBAVRDUDE_EXIT;;
+    return LIBAVRDUDE_EXIT_OK;
   }
 
   return 0;
diff --git a/src/jtagmkII.c b/src/jtagmkII.c
@@ -1362,7 +1362,7 @@ static int jtagmkII_parseextparms(const PROGRAMMER *pgm, const LISTID extparms)
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
@@ -2674,7 +2674,7 @@ static int jtagmkII_reset32(const PROGRAMMER *pgm, unsigned short flags) {
 
     status = jtagmkII_recv(pgm, &resp);
     if(status != 2 || resp[0] != 0x87 || resp[1] != 01)
-      gotoerr;;
+      gotoerr;
   }
 
   if(flags & (AVR32_RESET_WRITE | AVR32_SET4RUNNING)) {
diff --git a/src/libavrdude.h b/src/libavrdude.h
@@ -63,9 +63,13 @@ typedef uint32_t Pinmask;
 #define LIBAVRDUDE_GENERAL_FAILURE (-1)
 #define LIBAVRDUDE_NOTSUPPORTED (-2)  // Operation not supported
 #define LIBAVRDUDE_SOFTFAIL (-3)      // Returned, eg, if caller might proceed with a plan B
-#define LIBAVRDUDE_EXIT (-4)          // End all operations in this session
-#define LIBAVRDUDE_DEVICE_LOCKED (-5) // Returned if the programmer determined that the device is locked
-#define LIBAVRDUDE_BEYOND_ERRS (-6)   // This error and lower not normally used by libavrdude functions
+#define LIBAVRDUDE_EXIT_OK (-4)       // End all operations in this session and exit(0) in main
+#define LIBAVRDUDE_EXIT_FAIL (-5)     // End all operations in this session and exit(1) in main
+#ifndef TO_BE_DEPRECATED_IN_2027
+#define LIBAVRDUDE_EXIT (-4)          // Deprecated: this is now LIBAVRDUDE_EXIT_OK
+#endif
+#define LIBAVRDUDE_DEVICE_LOCKED (-6) // Returned if the programmer determined that the device is locked
+#define LIBAVRDUDE_BEYOND_ERRS (-7)   // This error and lower not normally used by libavrdude functions
 
 // Message system
 
diff --git a/src/linuxgpio.c b/src/linuxgpio.c
@@ -346,7 +346,7 @@ static int linuxgpio_parseexitspecs(PROGRAMMER *pgm, const char *sp) {
     }
     if(str_eq(cp, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/linuxspi.c b/src/linuxspi.c
@@ -405,7 +405,7 @@ static int linuxspi_parseexitspecs(PROGRAMMER *pgm, const char *sp) {
     }
     if(str_eq(cp, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
@@ -438,7 +438,7 @@ static int linuxspi_parseextparams(const PROGRAMMER *pgm, const LISTID extparms)
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rc = LIBAVRDUDE_EXIT;
+      rc = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/main.c b/src/main.c
@@ -1341,7 +1341,7 @@ int main(int argc, char *argv[]) {
     } else {
       int rc = pgm->parseextparams(pgm, extended_params);
 
-      if(rc == LIBAVRDUDE_EXIT)
+      if(rc == LIBAVRDUDE_EXIT_OK)
         exit(0);
       if(rc < 0) {
         pmsg_error("unable to parse list of -x parameters\n");
@@ -1495,8 +1495,8 @@ int main(int argc, char *argv[]) {
 
   rc = pgm->open(pgm, port);
   if(rc < 0) {
-    if(rc == LIBAVRDUDE_EXIT) {
-      exitrc = 0;
+    if(rc == LIBAVRDUDE_EXIT_FAIL || rc == LIBAVRDUDE_EXIT_OK) {
+      exitrc = rc == LIBAVRDUDE_EXIT_FAIL;
       goto main_exit;
     }
 
@@ -1536,7 +1536,7 @@ int main(int argc, char *argv[]) {
     } else {
       int rc = pgm->parseexitspecs(pgm, exitspecs);
 
-      if(rc == LIBAVRDUDE_EXIT)
+      if(rc == LIBAVRDUDE_EXIT_OK)
         exit(0);
       if(rc < 0) {
         pmsg_error("unable to parse list of -E parameters\n");
@@ -1628,8 +1628,8 @@ int main(int argc, char *argv[]) {
 init_again:
   init_ok = (rc = pgm->initialize(pgm, p)) >= 0;
   if(!init_ok) {
-    if(rc == LIBAVRDUDE_EXIT) {
-      exitrc = 0;
+    if(rc == LIBAVRDUDE_EXIT_FAIL || rc == LIBAVRDUDE_EXIT_OK) {
+      exitrc = rc == LIBAVRDUDE_EXIT_FAIL;
       goto main_exit;
     }
     if(rc == LIBAVRDUDE_DEVICE_LOCKED) { // The pickit5 with UPDI is a bit tricky
@@ -1699,8 +1699,8 @@ int main(int argc, char *argv[]) {
     usleep(waittime);
     if(init_ok) {
       rc = avr_signature(pgm, p);
-      if(rc == LIBAVRDUDE_EXIT) {
-        exitrc = 0;
+      if(rc == LIBAVRDUDE_EXIT_FAIL || rc == LIBAVRDUDE_EXIT_OK) {
+        exitrc =  rc == LIBAVRDUDE_EXIT_FAIL;
         goto main_exit;
       }
       if(rc != LIBAVRDUDE_SUCCESS) {
diff --git a/src/micronucleus.c b/src/micronucleus.c
@@ -806,7 +806,7 @@ static int micronucleus_parseextparams(const PROGRAMMER *pgm, const LISTID xpara
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/par.c b/src/par.c
@@ -346,7 +346,7 @@ static int par_parseexitspecs(PROGRAMMER *pgm, const char *sp) {
     }
     if(str_eq(cp, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/pickit2.c b/src/pickit2.c
@@ -1041,7 +1041,7 @@ static int pickit2_parseextparams(const PROGRAMMER *pgm, const LISTID extparms)
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/pickit5.c b/src/pickit5.c
@@ -330,7 +330,7 @@ static int pickit5_parseexitspecs(PROGRAMMER *pgm, const char *sp) {
     }
     if(str_eq(cp, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
@@ -398,7 +398,7 @@ static int pickit5_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
       if(can_gen_hv_pulse(pgm))
         msg_error("  -x hvupdi       Enable high-voltage UPDI initialization\n");
       msg_error("  -x help         Show this help menu and exit\n");
-      return LIBAVRDUDE_EXIT;
+      return LIBAVRDUDE_EXIT_OK;
     }
 
     pmsg_error("invalid extended parameter: %s\n", extended_param);
@@ -420,7 +420,7 @@ static int pickit5_send_script(const PROGRAMMER *pgm, unsigned int script_type,
 
   if(script == NULL) {
     pmsg_error("invalid script pointer passed\n");
-    return LIBAVRDUDE_EXIT; // If script is NULL there is a significant problem
+    return LIBAVRDUDE_EXIT_FAIL; // If script is NULL there is a significant problem
   }
 
   unsigned int header_len = 16 + 8;     // Header info + script header
@@ -780,7 +780,7 @@ static int pickit5_open(PROGRAMMER *pgm, const char *port) {
       imsg_error("$ %s -c snap%s %s-P %s\n", progname, pgm_suffix, part_option, port);
 
       serial_close(&pgm->fd);
-      return LIBAVRDUDE_EXIT;
+      return LIBAVRDUDE_EXIT_FAIL;
     }
     pinfo.usbinfo.pid = USB_DEVICE_PICKIT4_AVR_MODE;
     rv = serial_open(port, pinfo, &pgm->fd);  // Try PICkit4 PID
@@ -795,7 +795,7 @@ static int pickit5_open(PROGRAMMER *pgm, const char *port) {
       imsg_error("$ %s -c pickit4%s %s-P %s\n", progname, pgm_suffix, part_option, port);
 
       serial_close(&pgm->fd);
-      return LIBAVRDUDE_EXIT;
+      return LIBAVRDUDE_EXIT_FAIL;
     }
     if(serial_num_len) {
       pmsg_error("no device found matching the specified serial number %s", vidp);
@@ -805,7 +805,7 @@ static int pickit5_open(PROGRAMMER *pgm, const char *port) {
     pmsg_error("no device found matching VID 0x%04x and PID list: 0x%04x, 0x%04x, 0x%04x\n", USB_VENDOR_MICROCHIP,
       USB_DEVICE_PICKIT5, USB_DEVICE_PICKIT4_PIC_MODE, USB_DEVICE_SNAP_PIC_MODE);
     imsg_error("nor VID 0x%04x with PID list: 0x%04x, 0x%04x\n", USB_VENDOR_ATMEL, USB_DEVICE_PICKIT4_AVR_MODE, USB_DEVICE_SNAP_AVR_MODE);
-    return LIBAVRDUDE_EXIT;
+    return LIBAVRDUDE_EXIT_FAIL;
   }
 
   if(str_starts(id, "pickit_basic")) {
@@ -815,15 +815,15 @@ static int pickit5_open(PROGRAMMER *pgm, const char *port) {
       pmsg_error("PICkit Basic in CMSIS-DAP mode detected;\n");
       imsg_error("please use a Microchip tool to switch the firmware to \"mplab\"\n");
       imsg_error("in order to use the programmer with avrdude\n");
-      return LIBAVRDUDE_EXIT;
+      return LIBAVRDUDE_EXIT_FAIL;
     }
 
     rv = usbdev_check_connected(USB_VENDOR_MICROCHIP, USB_DEVICE_PICKIT_BASIC_BL);
     if(rv >= 0) {
       pmsg_error("PICkit Basic in Bootloader mode detected;\n");
       imsg_error("please use a Microchip tool to load the \"mplab\" firmware\n");
       imsg_error("in order to use the programmer with avrdude\n");
-      return LIBAVRDUDE_EXIT;
+      return LIBAVRDUDE_EXIT_FAIL;
     }
   }
 
@@ -837,7 +837,7 @@ static int pickit5_open(PROGRAMMER *pgm, const char *port) {
     msg_error("0x%04x", (unsigned int) (*(int *) (ldata(usbpid))));
     notfirst = 1;
   }
-  return LIBAVRDUDE_EXIT;
+  return LIBAVRDUDE_EXIT_FAIL;
 }
 
 static void pickit5_close(PROGRAMMER *pgm) {
@@ -1386,9 +1386,7 @@ static int pickit5_pdi_flash_write(const PROGRAMMER *pgm, const AVRPART *p,
   pickit5_uint32_to_array(&param[4], len);
 
   int rc = pickit5_download_data(pgm, p, flash_cmd, sizeof(flash_cmd), param, sizeof(param), value, len);
-  if(rc < 0)
-    rc = LIBAVRDUDE_EXIT;
-  return rc;
+  return rc < 0? LIBAVRDUDE_EXIT_FAIL: rc;
 }
 
 // Return numbers of byte written
@@ -1455,7 +1453,7 @@ static int pickit5_write_array(const PROGRAMMER *pgm, const AVRPART *p,
 
   int rc = pickit5_download_data(pgm, p, write_bytes, write_bytes_len, param, 8, value, len);
   if(rc < 0)                    // Any error here means that a write fail occured, so restart
-    return LIBAVRDUDE_EXIT;
+    return LIBAVRDUDE_EXIT_FAIL;
   return len;
 }
 
@@ -1549,9 +1547,8 @@ static int pickit5_read_array(const PROGRAMMER *pgm, const AVRPART *p,
   pickit5_uint32_to_array(&param[4], len);
 
   int rc = pickit5_upload_data(pgm, p, read_bytes, read_bytes_len, param, 8, value, len);
-
   if(rc < 0)                    // Any error here means that a read fail occured, better restart
-    return LIBAVRDUDE_EXIT;
+    return LIBAVRDUDE_EXIT_FAIL;
   return len;
 }
 
diff --git a/src/serialupdi.c b/src/serialupdi.c
@@ -1040,7 +1040,7 @@ static int serialupdi_parseextparms(const PROGRAMMER *pgm, const LISTID extparms
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/serprog.c b/src/serprog.c
@@ -479,7 +479,7 @@ static int serprog_parseextparams(const PROGRAMMER *pgm, const LISTID extparms)
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {
diff --git a/src/stk500.c b/src/stk500.c
diff --git a/src/stk500v2.c b/src/stk500v2.c
diff --git a/src/teensy.c b/src/teensy.c
diff --git a/src/term.c b/src/term.c
diff --git a/src/urclock.c b/src/urclock.c
diff --git a/src/usbasp.c b/src/usbasp.c
diff --git a/src/wiring.c b/src/wiring.c
diff --git a/src/xbee.c b/src/xbee.c

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ static int arduino_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {`
`56`	`56`
`57`	`57`	`if(str_eq(extended_param, "help")) {`
`58`	`58`	`help = true;`
`59`		`- rv = LIBAVRDUDE_EXIT;`
	`59`	`+ rv = LIBAVRDUDE_EXIT_OK;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`if(!help) {`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ static int avr910_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {`
`303`	`303`	`}`
`304`	`304`	`if(str_eq(extended_param, "help")) {`
`305`	`305`	`help = true;`
`306`		`- rv = LIBAVRDUDE_EXIT;`
	`306`	`+ rv = LIBAVRDUDE_EXIT_OK;`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`if(!help) {`
Original file line number	Diff line number	Diff line change
`@@ -1348,7 +1348,7 @@ static int avrftdi_jtag_initialize(const PROGRAMMER pgm, const AVRPART p) {`
`1348`	`1348`
`1349`	`1349`	`pmsg_error("programmer type %s is known not to work for %s\n", pgm->type, p->desc);`
`1350`	`1350`	`pmsg_error("exiting, use -F to carry on regardless\n");`
`1351`		`- return LIBAVRDUDE_EXIT;`
	`1351`	`+ return LIBAVRDUDE_EXIT_FAIL;`
`1352`	`1352`	`}`
`1353`	`1353`	`}`
`1354`	`1354`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ static int buspirate_parseextparms(const PROGRAMMER *pgm, const LISTID extparms)`
`395`	`395`
`396`	`396`	`if(str_eq(extended_param, "help")) {`
`397`	`397`	`help = true;`
`398`		`- rv = LIBAVRDUDE_EXIT;`
	`398`	`+ rv = LIBAVRDUDE_EXIT_OK;`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`if(!help) {`
Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,7 @@ static int butterfly_parseextparms(const PROGRAMMER *pgm, const LISTID extparms)`
`640`	`640`
`641`	`641`	`if(str_eq(extended_param, "help")) {`
`642`	`642`	`help = true;`
`643`		`- rv = LIBAVRDUDE_EXIT;`
	`643`	`+ rv = LIBAVRDUDE_EXIT_OK;`
`644`	`644`	`}`
`645`	`645`
`646`	`646`	`if(!help) {`
Original file line number	Diff line number	Diff line change
`@@ -1016,7 +1016,7 @@ static int dryrun_parseextparams(const PROGRAMMER *pgm, const LISTID extparms) {`
`1016`	`1016`	`}`
`1017`	`1017`	`if(str_eq(xpara, "help")) {`
`1018`	`1018`	`help = true;`
`1019`		`- rc = LIBAVRDUDE_EXIT;`
	`1019`	`+ rc = LIBAVRDUDE_EXIT_OK;`
`1020`	`1020`	`}`
`1021`	`1021`
`1022`	`1022`	`if(!help) {`
Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ static int flip2_parseexitspecs(PROGRAMMER pgm, const char sp) {`
`484`	`484`	`}`
`485`	`485`	`if(str_eq(cp, "help")) {`
`486`	`486`	`help = true;`
`487`		`- rv = LIBAVRDUDE_EXIT;`
	`487`	`+ rv = LIBAVRDUDE_EXIT_OK;`
`488`	`488`	`}`
`489`	`489`
`490`	`490`	`if(!help) {`
Original file line number	Diff line number	Diff line change
`@@ -1585,8 +1585,7 @@ static int jtag3_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {`
`1585`	`1585`	`continue;`
`1586`	`1586`	`}`
`1587`	`1587`	`// Flag a switch to PIC mode`
`1588`		`- if(str_caseeq(extended_param, "mode=pic") \|\|`
`1589`		`- str_caseeq(extended_param, "mode=mplab")) {`
	`1588`	`+ if(str_caseeq(extended_param, "mode=mplab") \|\| str_caseeq(extended_param, "mode=pic")) {`
`1590`	`1589`	`my.pk4_snap_mode = PK4_SNAP_MODE_PIC;`
`1591`	`1590`	`continue;`
`1592`	`1591`	`}`
`@@ -1597,7 +1596,7 @@ static int jtag3_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {`
`1597`	`1596`
`1598`	`1597`	`if(str_eq(extended_param, "help")) {`
`1599`	`1598`	`help = true;`
`1600`		`- rv = LIBAVRDUDE_EXIT;`
	`1599`	`+ rv = LIBAVRDUDE_EXIT_OK;`
`1601`	`1600`	`}`
`1602`	`1601`
`1603`	`1602`	`if(!help) {`
`@@ -1738,7 +1737,7 @@ int jtag3_open_common(PROGRAMMER pgm, const char port, int mode_switch) {`
`1738`	`1737`	`imsg_error("$ %s -c pickit4_mplab%s%s%s -P %s\n", progname, pgm_suffix, partsdesc_flag, partsdesc_str, port);`
`1739`	`1738`	`}`
`1740`	`1739`	`serial_close(&pgm->fd);`
`1741`		`- return LIBAVRDUDE_EXIT;;`
	`1740`	`+ return LIBAVRDUDE_EXIT_FAIL;`
`1742`	`1741`	`}`
`1743`	`1742`	`}`
`1744`	`1743`	`}`
`@@ -1787,7 +1786,7 @@ int jtag3_open_common(PROGRAMMER pgm, const char port, int mode_switch) {`
`1787`	`1786`	`}`
`1788`	`1787`	`msg_error("MPLAB mode switch successful\n");`
`1789`	`1788`	`serial_close(&pgm->fd);`
`1790`		`- return LIBAVRDUDE_EXIT;;`
	`1789`	`+ return LIBAVRDUDE_EXIT_OK;`
`1791`	`1790`	`}`
`1792`	`1791`
`1793`	`1792`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -1362,7 +1362,7 @@ static int jtagmkII_parseextparms(const PROGRAMMER *pgm, const LISTID extparms)`
`1362`	`1362`
`1363`	`1363`	`if(str_eq(extended_param, "help")) {`
`1364`	`1364`	`help = true;`
`1365`		`- rv = LIBAVRDUDE_EXIT;`
	`1365`	`+ rv = LIBAVRDUDE_EXIT_OK;`
`1366`	`1366`	`}`
`1367`	`1367`
`1368`	`1368`	`if(!help) {`
`@@ -2674,7 +2674,7 @@ static int jtagmkII_reset32(const PROGRAMMER *pgm, unsigned short flags) {`
`2674`	`2674`
`2675`	`2675`	`status = jtagmkII_recv(pgm, &resp);`
`2676`	`2676`	`if(status != 2 \|\| resp[0] != 0x87 \|\| resp[1] != 01)`
`2677`		`- gotoerr;;`
	`2677`	`+ gotoerr;`
`2678`	`2678`	`}`
`2679`	`2679`
`2680`	`2680`	`if(flags & (AVR32_RESET_WRITE \| AVR32_SET4RUNNING)) {`