Attachment 99466 Details for Bug 138540 – file.diff

[patch] file.diff

file.diff (text/plain), 1.53 KB, created by huntting on 2009-09-04 23:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: huntting

Created: 2009-09-04 23:20:00 UTC

Size: 1.53 KB

patch

obsolete

>diff -Nru /usr/ports/sysutils/smartmontools/Makefile /home/huntting/src/Copan/smartmontools/Makefile
>--- /usr/ports/sysutils/smartmontools/Makefile	2009-07-08 13:56:07.000000000 -0600
>+++ /home/huntting/src/Copan/smartmontools/Makefile	2009-09-04 14:58:21.000000000 -0600
>@@ -25,7 +25,7 @@
> MAN5=		smartd.conf.5
> MAN8=		smartd.8 smartctl.8
> 
>-CFLAGS:=	${CFLAGS:S/-O2/-O/}
>+CFLAGS:=	${CFLAGS:S/-O2/-O/} -Wno-write-strings
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's| install-initdDATA | |' ${WRKSRC}/Makefile.in
>diff -Nru /usr/ports/sysutils/smartmontools/files/patch-scsiata.cpp /home/huntting/src/Copan/smartmontools/files/patch-scsiata.cpp
>--- /usr/ports/sysutils/smartmontools/files/patch-scsiata.cpp	1969-12-31 17:00:00.000000000 -0700
>+++ /home/huntting/src/Copan/smartmontools/files/patch-scsiata.cpp	2009-09-04 14:28:13.000000000 -0600
>@@ -0,0 +1,22 @@
>+--- scsiata.cpp.orig	2007-12-02 19:14:20.000000000 -0700
>++++ scsiata.cpp	2009-09-04 14:27:48.000000000 -0600
>+@@ -380,14 +380,14 @@
>+    return 1, else 0 */
>+ int has_sat_pass_through(int device, int packet_interface)
>+ {
>+-    char data[512];
>++    int ret;
>++    char *data = (char *)malloc(512);	// (alignment)
>+     smart_command_set command;
>+ 
>+     command = packet_interface ? PIDENTIFY : IDENTIFY;
>+-    if (0 == sat_command_interface(device, command, 0, data))
>+-        return 1;
>+-    else
>+-        return 0;
>++    ret = ( 0 == sat_command_interface(device, command, 0, data) ? 1 : 0 );
>++    free(data);
>++    return ret;
>+ }
>+ 
>+ /* Next two functions are borrowed from sg_lib.c in the sg3_utils

Actions: View | Diff

Attachments on bug 138540: 99466