All:
Here is another problem with the bundle of Avarice patches, this patch
"warnings.patch" has a problem at line 198 of the patch file. The
patch process barfs on hunk #3 with an error: (Hunk #3 FAILED at 244.
1 out of 3 hunks FAILED -- saving rejects to file src/
jtag2prog.cc.rej). It appears the Avarice file src/jtag2prog.cc and
the patch file disagree as to what is and what is supposed to be
witness:
warnings.patch starting at line # 198:
@@ -246,8 +244,8 @@
// Basically, we just open the file and copy blocks over to the
JTAG
// box.
struct stat ifstat;
- char *target = NULL;
- char *default_target = "binary";
+ const char *target = NULL;
+ const char *default_target = "binary";
unsigned int page_size;
bool done = 0;
bfd *file;
This is the relevant sections of the file to be patched /src/
jtag2prog.cc are:
// Basically, we just open the file and copy blocks over to the
JTAG
// box.
struct stat ifstat;
char *target = NULL;
char default_target[] = "binary";
unsigned int page_size;
bool done = 0;
bfd *file;
This section of code was previously patched by another file called
"avarice-string-warning.patch". Here is the relevant patch from the
patch file:
RCS file: /cvsroot/avarice/avarice/src/jtag2prog.cc,v
retrieving revision 1.3
diff -u -r1.3 jtag2prog.cc
--- jtag2prog.cc 8 Aug 2006 21:27:34 -0000 1.3
+++ jtag2prog.cc 21 Aug 2009 21:00:40 -0000
@@ -247,7 +247,7 @@
// box.
struct stat ifstat;
char *target = NULL;
- char *default_target = "binary";
+ char default_target[] = "binary";
unsigned int page_size;
bool done = 0;
bfd *file;
Its looks to me that the change is changing an array called
default_target to a constant char pointer called default_target.
The question is, which patch is correct? Are they both correct?
TIA,
Ed
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
avarice-user mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/avarice-user
