Attachment 151261 Details for Bug 196460 – patch file for flashrom with latest release of clang

[patch] patch file for flashrom with latest release of clang

ports.flashrom.patch (text/plain), 2.00 KB, created by olivier on 2015-01-03 11:22:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: olivier

Created: 2015-01-03 11:22:40 UTC

Size: 2.00 KB

patch

obsolete

>Index: sysutils/flashrom/Makefile
>===================================================================
>--- sysutils/flashrom/Makefile	(revision 375744)
>+++ sysutils/flashrom/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	flashrom
> PORTVERSION=	0.9.7
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	sysutils
> MASTER_SITES=	http://download.flashrom.org/releases/
> 
>Index: sysutils/flashrom/files/patch-flashrom.c
>===================================================================
>--- sysutils/flashrom/files/patch-flashrom.c	(revision 0)
>+++ sysutils/flashrom/files/patch-flashrom.c	(working copy)
>@@ -0,0 +1,35 @@
>+--- flashrom.c.orig	2015-01-03 11:51:27.374478495 +0100
>++++ flashrom.c	2015-01-03 11:53:02.382473813 +0100
>+@@ -1738,7 +1738,7 @@
>+ 	 * For 'flashchips' we check the first element to be non-null. In the
>+ 	 * other cases there exist use cases where the first element can be
>+ 	 * null. */
>+-	if (flashchips == NULL || flashchips[0].vendor == NULL) {
>++	if (!flashchips || flashchips[0].vendor == NULL) {
>+ 		msg_gerr("Flashchips table miscompilation!\n");
>+ 		ret = 1;
>+ 	}
>+@@ -1747,19 +1747,19 @@
>+ 			ret = 1;
>+ 
>+ #if CONFIG_INTERNAL == 1
>+-	if (chipset_enables == NULL) {
>++	if (!chipset_enables) {
>+ 		msg_gerr("Chipset enables table does not exist!\n");
>+ 		ret = 1;
>+ 	}
>+-	if (board_matches == NULL) {
>++	if (!board_matches) {
>+ 		msg_gerr("Board enables table does not exist!\n");
>+ 		ret = 1;
>+ 	}
>+-	if (boards_known == NULL) {
>++	if (!boards_known) {
>+ 		msg_gerr("Known boards table does not exist!\n");
>+ 		ret = 1;
>+ 	}
>+-	if (laptops_known == NULL) {
>++	if (!laptops_known) {
>+ 		msg_gerr("Known laptops table does not exist!\n");
>+ 		ret = 1;
>+ 	}
>
>Property changes on: sysutils/flashrom/files/patch-flashrom.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 196460: 151261