From 12de7132f32f796b46bc04a3f894a8f686c14a68 Mon Sep 17 00:00:00 2001
From: joerg_wunsch <joerg_wunsch@81a1dc3b-b13d-400b-aceb-764788c761c2>
Date: Mon, 2 Sep 2013 20:30:09 +0000
Subject: [PATCH] bug #39794: warnings when building avrdude 6.0rc1 under
 CentOS 6.4 * pickit.c (usb_open_device): Use %p rather than %X to print
 "handle" which is a pointer * jtag3.c (jtag3_initialize): Initialize
 "flashsize" to be sure it proceeds with a valid value.

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1197 81a1dc3b-b13d-400b-aceb-764788c761c2
---
 ChangeLog | 8 ++++++++
 jtag3.c   | 2 +-
 pickit2.c | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a750ca10..e2d86f36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-09-02  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	bug #39794: warnings when building avrdude 6.0rc1 under CentOS 6.4
+	* pickit.c (usb_open_device): Use %p rather than %X to print "handle"
+	which is a pointer
+	* jtag3.c (jtag3_initialize): Initialize "flashsize" to be sure it
+	proceeds with a valid value.
+
 2013-09-02  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	bug #39794: warnings when building avrdude 6.0rc1 under CentOS 6.4
diff --git a/jtag3.c b/jtag3.c
index da45bfcd..725073d0 100644
--- a/jtag3.c
+++ b/jtag3.c
@@ -847,7 +847,7 @@ static int jtag3_initialize(PROGRAMMER * pgm, AVRPART * p)
     struct mega_device_desc md;
     LNODEID ln;
     AVRMEM * m;
-    unsigned int flashsize;
+    unsigned int flashsize = 0;
 
     memset(&md, 0, sizeof md);
 
diff --git a/pickit2.c b/pickit2.c
index c4e95131..1221f350 100644
--- a/pickit2.c
+++ b/pickit2.c
@@ -49,6 +49,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
+#include <unistd.h>
 
 #include "avrdude.h"
 #include "avr.h"
@@ -1167,7 +1168,7 @@ static int usb_open_device(struct usb_dev_handle **device, int vendor, int produ
                 {
                     if (verbose)
                     {
-                        fprintf(stderr, "Device 0x%4.4X seemed to open OK.\n", (int)handle);
+                        fprintf(stderr, "Device %p seemed to open OK.\n", handle);
                     }
 
                     if ((errorCode = usb_set_configuration(handle, 1)) < 0)