[pkgsrc/trunk]: pkgsrc/devel/openocd "Remove useless checks causing build fai...

[rodent <rodent%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/223036f6e64e
branches:  trunk
changeset: 650489:223036f6e64e
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Thu Apr 23 12:21:19 2015 +0000

description:
"Remove useless checks causing build failure with clang". --upstream

diffstat:

 devel/openocd/distinfo                                                              |   4 +-
 devel/openocd/patches/patch-src_jtag_drivers_ulink.c                                |  16 ++++++++++
 devel/openocd/patches/patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c |  16 ++++++++++
 3 files changed, 35 insertions(+), 1 deletions(-)

diffs (52 lines):

diff -r 58472302709e -r 223036f6e64e devel/openocd/distinfo
--- a/devel/openocd/distinfo    Thu Apr 23 12:19:53 2015 +0000
+++ b/devel/openocd/distinfo    Thu Apr 23 12:21:19 2015 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1 2015/04/04 00:26:42 rodent Exp $
+$NetBSD: distinfo,v 1.2 2015/04/23 12:21:19 rodent Exp $
 
 SHA1 (openocd-0.8.0.tar.bz2) = 10bf9eeb54e03083cb1a101785b2d69fbdf18f31
 RMD160 (openocd-0.8.0.tar.bz2) = 812755bb51ccf6bb11e4b6aac6dd1c0c674c43b7
 Size (openocd-0.8.0.tar.bz2) = 3768447 bytes
+SHA1 (patch-src_jtag_drivers_ulink.c) = 373960ff40b4cd2b7a74e526595bf4ab9468beb3
+SHA1 (patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c) = 5baff71502a7fc1121efd3d8d6de0bd72eae3832
diff -r 58472302709e -r 223036f6e64e devel/openocd/patches/patch-src_jtag_drivers_ulink.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/openocd/patches/patch-src_jtag_drivers_ulink.c      Thu Apr 23 12:21:19 2015 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_jtag_drivers_ulink.c,v 1.1 2015/04/23 12:21:19 rodent Exp $
+
+"Remove useless checks causing build failure with clang". --upstream
+
+--- src/jtag/drivers/ulink.c.orig      2014-03-29 16:55:12.000000000 +0000
++++ src/jtag/drivers/ulink.c
+@@ -461,9 +461,6 @@ int ulink_write_firmware_section(struct 
+       LOG_DEBUG("section %02i at addr 0x%04x (size 0x%04x)", section_index, addr,
+               size);
+ 
+-      if (data == NULL)
+-              return ERROR_FAIL;
+-
+       /* Copy section contents to local buffer */
+       ret = image_read_section(firmware_image, section_index, 0, size, data,
+                       &size_read);
diff -r 58472302709e -r 223036f6e64e devel/openocd/patches/patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/openocd/patches/patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c       Thu Apr 23 12:21:19 2015 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c,v 1.1 2015/04/23 12:21:19 rodent Exp $
+
+"Remove useless checks causing build failure with clang". --upstream
+
+--- src/jtag/drivers/usb_blaster/ublast2_access_libusb.c.orig  2014-03-29 16:55:12.000000000 +0000
++++ src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
+@@ -74,9 +74,6 @@ static int ublast2_write_firmware_sectio
+       LOG_DEBUG("section %02i at addr 0x%04x (size 0x%04x)", section_index, addr,
+               size);
+ 
+-      if (data == NULL)
+-              return ERROR_FAIL;
+-
+       /* Copy section contents to local buffer */
+       int ret = image_read_section(firmware_image, section_index, 0, size, data,
+                       &size_read);