CVS commit: src/lib/libc/arch/mips/gen
Module Name:src Committed By: joerg Date: Wed Sep 17 11:01:05 UTC 2014 Modified Files: src/lib/libc/arch/mips/gen: ldexp.S Log Message: Use canonical three operand form of add.d. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/mips/gen/ldexp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/gen/ldexp.S diff -u src/lib/libc/arch/mips/gen/ldexp.S:1.9 src/lib/libc/arch/mips/gen/ldexp.S:1.10 --- src/lib/libc/arch/mips/gen/ldexp.S:1.9 Mon Dec 14 01:07:42 2009 +++ src/lib/libc/arch/mips/gen/ldexp.S Wed Sep 17 11:01:05 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ldexp.S,v 1.9 2009/12/14 01:07:42 matt Exp $ */ +/* $NetBSD: ldexp.S,v 1.10 2014/09/17 11:01:05 joerg Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -38,7 +38,7 @@ #if 0 RCSID(from: @(#)ldexp.s 8.1 (Berkeley) 6/4/93) #else - RCSID($NetBSD: ldexp.S,v 1.9 2009/12/14 01:07:42 matt Exp $) + RCSID($NetBSD: ldexp.S,v 1.10 2014/09/17 11:01:05 joerg Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -209,7 +209,7 @@ LEAF(ldexp) bge v1, zero, 1f # should result be negative infinity? neg.d $f0, $f0 # result is negative infinity 1: - add.d $f0, $f0 # cause overflow faults if enabled + add.d $f0, $f0, $f0 # cause overflow faults if enabled j ra 9: mov.d $f0, $f12 # yes, result is just x
CVS commit: src/lib/libc/arch/mips/gen
Module Name:src
Committed By: joerg
Date: Wed Sep 17 11:02:55 UTC 2014
Modified Files:
src/lib/libc/arch/mips/gen: flt_rounds.c fpgetmask.c fpgetround.c
fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c
Log Message:
Explicitly set noat around instructions using $at.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/mips/gen/flt_rounds.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/arch/mips/gen/fpgetmask.c \
src/lib/libc/arch/mips/gen/fpgetsticky.c \
src/lib/libc/arch/mips/gen/fpsetmask.c \
src/lib/libc/arch/mips/gen/fpsetsticky.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/mips/gen/fpgetround.c \
src/lib/libc/arch/mips/gen/fpsetround.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/mips/gen/flt_rounds.c
diff -u src/lib/libc/arch/mips/gen/flt_rounds.c:1.7 src/lib/libc/arch/mips/gen/flt_rounds.c:1.8
--- src/lib/libc/arch/mips/gen/flt_rounds.c:1.7 Sun Jun 24 15:26:02 2012
+++ src/lib/libc/arch/mips/gen/flt_rounds.c Wed Sep 17 11:02:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: flt_rounds.c,v 1.7 2012/06/24 15:26:02 christos Exp $ */
+/* $NetBSD: flt_rounds.c,v 1.8 2014/09/17 11:02:55 joerg Exp $ */
/*
* Written by J.T. Conklin, Apr 11, 1995
@@ -7,7 +7,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: flt_rounds.c,v 1.7 2012/06/24 15:26:02 christos Exp $);
+__RCSID($NetBSD: flt_rounds.c,v 1.8 2014/09/17 11:02:55 joerg Exp $);
#endif /* LIBC_SCCS and not lint */
#include machine/float.h
@@ -28,7 +28,7 @@ __flt_rounds(void)
#else
int x;
- __asm(cfc1\t%0,$31 : =r (x));
+ __asm(.set push; .set noat; cfc1 %0,$31; .set pop : =r (x));
return map[x 0x03];
#endif
}
Index: src/lib/libc/arch/mips/gen/fpgetmask.c
diff -u src/lib/libc/arch/mips/gen/fpgetmask.c:1.8 src/lib/libc/arch/mips/gen/fpgetmask.c:1.9
--- src/lib/libc/arch/mips/gen/fpgetmask.c:1.8 Tue Mar 20 16:19:56 2012
+++ src/lib/libc/arch/mips/gen/fpgetmask.c Wed Sep 17 11:02:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetmask.c,v 1.8 2012/03/20 16:19:56 matt Exp $ */
+/* $NetBSD: fpgetmask.c,v 1.9 2014/09/17 11:02:55 joerg Exp $ */
/*
* Written by J.T. Conklin, Apr 11, 1995
@@ -7,7 +7,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fpgetmask.c,v 1.8 2012/03/20 16:19:56 matt Exp $);
+__RCSID($NetBSD: fpgetmask.c,v 1.9 2014/09/17 11:02:55 joerg Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -23,6 +23,6 @@ fpgetmask(void)
{
fp_except x;
- __asm(cfc1 %0,$31 : =r (x));
+ __asm(.set push; .set noat; cfc1 %0,$31; .set pop : =r (x));
return (x 7) 0x1f;
}
Index: src/lib/libc/arch/mips/gen/fpgetsticky.c
diff -u src/lib/libc/arch/mips/gen/fpgetsticky.c:1.8 src/lib/libc/arch/mips/gen/fpgetsticky.c:1.9
--- src/lib/libc/arch/mips/gen/fpgetsticky.c:1.8 Tue Mar 20 16:19:56 2012
+++ src/lib/libc/arch/mips/gen/fpgetsticky.c Wed Sep 17 11:02:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetsticky.c,v 1.8 2012/03/20 16:19:56 matt Exp $ */
+/* $NetBSD: fpgetsticky.c,v 1.9 2014/09/17 11:02:55 joerg Exp $ */
/*
* Written by J.T. Conklin, Apr 11, 1995
@@ -7,7 +7,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fpgetsticky.c,v 1.8 2012/03/20 16:19:56 matt Exp $);
+__RCSID($NetBSD: fpgetsticky.c,v 1.9 2014/09/17 11:02:55 joerg Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -23,6 +23,6 @@ fpgetsticky(void)
{
fp_except x;
- __asm(cfc1 %0,$31 : =r (x));
+ __asm(.set push; .set noat; cfc1 %0,$31; .set pop : =r (x));
return (x 2) 0x1f;
}
Index: src/lib/libc/arch/mips/gen/fpsetmask.c
diff -u src/lib/libc/arch/mips/gen/fpsetmask.c:1.8 src/lib/libc/arch/mips/gen/fpsetmask.c:1.9
--- src/lib/libc/arch/mips/gen/fpsetmask.c:1.8 Tue Mar 20 16:19:56 2012
+++ src/lib/libc/arch/mips/gen/fpsetmask.c Wed Sep 17 11:02:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetmask.c,v 1.8 2012/03/20 16:19:56 matt Exp $ */
+/* $NetBSD: fpsetmask.c,v 1.9 2014/09/17 11:02:55 joerg Exp $ */
/*
* Written by J.T. Conklin, Apr 11, 1995
@@ -7,7 +7,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fpsetmask.c,v 1.8 2012/03/20 16:19:56 matt Exp $);
+__RCSID($NetBSD: fpsetmask.c,v 1.9 2014/09/17 11:02:55 joerg Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -24,12 +24,12 @@ fpsetmask(fp_except mask)
fp_except old;
fp_except new;
- __asm(cfc1 %0,$31 : =r (old));
+ __asm(.set push; .set noat; cfc1 %0,$31; .set pop : =r (old));
new = old ~(0x1f 7);
new |= ((mask 0x1f) 7);
- __asm(ctc1 %0,$31 : : r (new));
+ __asm(.set push; .set noat; ctc1 %0,$31; .set pop : =r (new));
return (old 7) 0x1f;
}
Index: src/lib/libc/arch/mips/gen/fpsetsticky.c
diff -u src/lib/libc/arch/mips/gen/fpsetsticky.c:1.8 src/lib/libc/arch/mips/gen/fpsetsticky.c:1.9
---
CVS commit: src/lib/libc/gmon
Module Name:src
Committed By: joerg
Date: Wed Sep 17 11:37:28 UTC 2014
Modified Files:
src/lib/libc/gmon: Makefile.inc
Log Message:
Use --no-warn only with GCC on MIPS.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/gmon/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gmon/Makefile.inc
diff -u src/lib/libc/gmon/Makefile.inc:1.10 src/lib/libc/gmon/Makefile.inc:1.11
--- src/lib/libc/gmon/Makefile.inc:1.10 Sun Jan 23 06:27:32 2011
+++ src/lib/libc/gmon/Makefile.inc Wed Sep 17 11:37:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2011/01/23 06:27:32 matt Exp $
+# $NetBSD: Makefile.inc,v 1.11 2014/09/17 11:37:28 joerg Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
# gmon sources
@@ -15,7 +15,7 @@ MLINKS+=moncontrol.3 monstartup.3
# and mcount.c causes warnings from as(1).
# mcount.c should be fixed and this test removed.
#
-COPTS.mcount.c+=-Wa,--no-warn
+COPTS.mcount.c+=${${ACTIVE_CXX} == gcc:? -Wa,--no-warn :}
.endif
CVS commit: src/sys/external/bsd/drm2/dist/uapi/drm
Module Name:src Committed By: riastradh Date: Wed Sep 17 15:36:04 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/uapi/drm: drm.h Log Message: Don't redefine __u64 c. here if we included linux/types.h. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/uapi/drm/drm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/uapi/drm/drm.h diff -u src/sys/external/bsd/drm2/dist/uapi/drm/drm.h:1.4 src/sys/external/bsd/drm2/dist/uapi/drm/drm.h:1.5 --- src/sys/external/bsd/drm2/dist/uapi/drm/drm.h:1.4 Wed Jul 16 20:56:25 2014 +++ src/sys/external/bsd/drm2/dist/uapi/drm/drm.h Wed Sep 17 15:36:04 2014 @@ -53,6 +53,7 @@ typedef unsigned int drm_handle_t; #ifdef __NetBSD__ #include sys/ioccom.h #include sys/types.h +#ifndef _KERNEL typedef int8_t __s8; typedef uint8_t __u8; typedef int16_t __s16; @@ -65,6 +66,7 @@ typedef uint64_t __u64; #define __user # endif #endif +#endif #define DRM_NAME drm /** Name in kernel, /dev, and /proc */ #define DRM_MIN_ORDER 5 /** At least 2^5 bytes = 32 bytes */
CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon
Module Name:src Committed By: riastradh Date: Wed Sep 17 15:41:56 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/drm/radeon: atombios_dp.c Log Message: Use %hhx for uint8_t, not %hx. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c diff -u src/sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c:1.4 --- src/sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c:1.3 Thu Aug 28 20:40:57 2014 +++ src/sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c Wed Sep 17 15:41:56 2014 @@ -371,11 +371,11 @@ static void radeon_dp_probe_oui(struct r return; if (drm_dp_dpcd_read(radeon_connector-ddc_bus-aux, DP_SINK_OUI, buf, 3) == 3) - DRM_DEBUG_KMS(Sink OUI: %02hx%02hx%02hx\n, + DRM_DEBUG_KMS(Sink OUI: %02hhx%02hhx%02hhx\n, buf[0], buf[1], buf[2]); if (drm_dp_dpcd_read(radeon_connector-ddc_bus-aux, DP_BRANCH_OUI, buf, 3) == 3) - DRM_DEBUG_KMS(Branch OUI: %02hx%02hx%02hx\n, + DRM_DEBUG_KMS(Branch OUI: %02hhx%02hhx%02hhx\n, buf[0], buf[1], buf[2]); }
CVS commit: src/sys/external/bsd/drm2/include/asm
Module Name:src Committed By: riastradh Date: Wed Sep 17 15:46:57 UTC 2014 Modified Files: src/sys/external/bsd/drm2/include/asm: processor.h Log Message: Fix header guard name. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/asm/processor.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/include/asm/processor.h diff -u src/sys/external/bsd/drm2/include/asm/processor.h:1.2 src/sys/external/bsd/drm2/include/asm/processor.h:1.3 --- src/sys/external/bsd/drm2/include/asm/processor.h:1.2 Tue Mar 18 18:20:42 2014 +++ src/sys/external/bsd/drm2/include/asm/processor.h Wed Sep 17 15:46:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: processor.h,v 1.2 2014/03/18 18:20:42 riastradh Exp $ */ +/* $NetBSD: processor.h,v 1.3 2014/09/17 15:46:57 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #ifndef _ASM_PROCESSOR_H_ -#define _ASM_CURRENT_H_ +#define _ASM_PROCESSOR_H_ #include machine/param.h
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src
Committed By: riastradh
Date: Wed Sep 17 15:53:15 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/radeon: files.radeon
Log Message:
Suppress clang warning about `= {0}'.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/radeon/files.radeon
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/radeon/files.radeon
diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.5 src/sys/external/bsd/drm2/radeon/files.radeon:1.6
--- src/sys/external/bsd/drm2/radeon/files.radeon:1.5 Mon Jul 28 00:02:50 2014
+++ src/sys/external/bsd/drm2/radeon/files.radeon Wed Sep 17 15:53:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.radeon,v 1.5 2014/07/28 00:02:50 riastradh Exp $
+# $NetBSD: files.radeon,v 1.6 2014/09/17 15:53:15 riastradh Exp $
define radeonfbbus { }
device radeon: drmkms, drmkms_pci, drmkms_ttm, radeonfbbus, firmload
@@ -16,7 +16,7 @@ makeoptions radeon CWARNFLAGS.atombios_
makeoptions radeon CWARNFLAGS.atombios_i2c.c+=-Wno-missing-prototypes
makeoptions radeon CWARNFLAGS.btc_dpm.c+=-Wno-missing-prototypes
makeoptions radeon CWARNFLAGS.ci_dpm.c+=-Wno-missing-field-initializers
-makeoptions radeon CWARNFLAGS.cik.c+=-Wno-missing-prototypes
+makeoptions radeon CWARNFLAGS.cik.c+=-Wno-missing-prototypes -Wno-missing-field-initializers
makeoptions radeon CWARNFLAGS.cik_sdma.c+=-Wno-missing-prototypes
makeoptions radeon CWARNFLAGS.dce6_afmt.c+=-Wno-missing-prototypes
makeoptions radeon CWARNFLAGS.evergreen.c+=-Wno-missing-prototypes
CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon
Module Name:src
Committed By: riastradh
Date: Wed Sep 17 15:54:31 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: ci_dpm.c
Log Message:
Mark some unused variables as such to shut up Clang.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c:1.2 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c Wed Sep 17 15:54:31 2014
@@ -64,7 +64,7 @@ static const struct ci_pt_defaults defau
{ 0x17C, 0x172, 0x180, 0x1BC, 0x1B3, 0x1BD, 0x206, 0x200, 0x203, 0x25D, 0x25A, 0x255, 0x2C3, 0x2C5, 0x2B4 }
};
-static const struct ci_pt_defaults defaults_bonaire_pro =
+static const struct ci_pt_defaults defaults_bonaire_pro __unused =
{
1, 0xF, 0xFD, 0x19, 5, 45, 0, 0x65062,
{ 0x8C, 0x23F, 0x244, 0xA6, 0x83, 0x85, 0x86, 0x86, 0x83, 0xDB, 0xDB, 0xDA, 0x67, 0x60, 0x5F },
@@ -78,7 +78,7 @@ static const struct ci_pt_defaults defau
{ 0x187, 0x187, 0x187, 0x1C7, 0x1C7, 0x1C7, 0x210, 0x210, 0x210, 0x266, 0x266, 0x266, 0x2C9, 0x2C9, 0x2C9 }
};
-static const struct ci_pt_defaults defaults_saturn_pro =
+static const struct ci_pt_defaults defaults_saturn_pro __unused =
{
1, 0xF, 0xFD, 0x19, 5, 55, 0, 0x3,
{ 0x96, 0x21D, 0x23B, 0xA1, 0x85, 0x87, 0x83, 0x84, 0x81, 0xE6, 0xE6, 0xE6, 0x71, 0x6A, 0x6A },
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src
Committed By: riastradh
Date: Wed Sep 17 15:59:53 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/radeon: files.radeon
Log Message:
Suppress some more missing field initializer warnings from Clang.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/radeon/files.radeon
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/radeon/files.radeon
diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.6 src/sys/external/bsd/drm2/radeon/files.radeon:1.7
--- src/sys/external/bsd/drm2/radeon/files.radeon:1.6 Wed Sep 17 15:53:15 2014
+++ src/sys/external/bsd/drm2/radeon/files.radeon Wed Sep 17 15:59:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.radeon,v 1.6 2014/09/17 15:53:15 riastradh Exp $
+# $NetBSD: files.radeon,v 1.7 2014/09/17 15:59:53 riastradh Exp $
define radeonfbbus { }
device radeon: drmkms, drmkms_pci, drmkms_ttm, radeonfbbus, firmload
@@ -18,6 +18,7 @@ makeoptions radeon CWARNFLAGS.btc_dpm.c
makeoptions radeon CWARNFLAGS.ci_dpm.c+=-Wno-missing-field-initializers
makeoptions radeon CWARNFLAGS.cik.c+=-Wno-missing-prototypes -Wno-missing-field-initializers
makeoptions radeon CWARNFLAGS.cik_sdma.c+=-Wno-missing-prototypes
+makeoptions radeon CWARNFLAGS.cypress_dpm.c+=-Wno-missing-field-initializers
makeoptions radeon CWARNFLAGS.dce6_afmt.c+=-Wno-missing-prototypes
makeoptions radeon CWARNFLAGS.evergreen.c+=-Wno-missing-prototypes
makeoptions radeon CWARNFLAGS.evergreen_cs.c+=-Wno-missing-prototypes
@@ -26,7 +27,7 @@ makeoptions radeon CWARNFLAGS.kv_dpm.c
makeoptions radeon CWARNFLAGS.kv_dpm.c+=-Wno-shadow
makeoptions radeon CWARNFLAGS.kv_dpm.c+=-Wno-type-limits
makeoptions radeon CWARNFLAGS.ni.c+=-Wno-missing-prototypes
-makeoptions radeon CWARNFLAGS.ni_dpm.c+=-Wno-missing-prototypes
+makeoptions radeon CWARNFLAGS.ni_dpm.c+=-Wno-missing-prototypes -Wno-missing-field-initializers
makeoptions radeon CWARNFLAGS.r600.c+=-Wno-missing-prototypes
makeoptions radeon CWARNFLAGS.r600_cs.c+=-Wno-missing-field-initializers
makeoptions radeon CWARNFLAGS.r600_cs.c+=-Wno-missing-prototypes
@@ -49,7 +50,7 @@ makeoptions radeonCWARNFLAGS.radeon
makeoptions radeonCWARNFLAGS.rs780_dpm.c+=-Wno-missing-prototypes
makeoptions radeonCWARNFLAGS.rv6xx_dpm.c+=-Wno-missing-prototypes
makeoptions radeonCWARNFLAGS.rv6xx_dpm.c+=-Wno-shadow
-makeoptions radeonCWARNFLAGS.rv770.c+=-Wno-missing-prototypes
+makeoptions radeonCWARNFLAGS.rv770.c+=-Wno-missing-prototypes -Wno-missing-field-initializers
makeoptions radeonCWARNFLAGS.rv770_dpm.c+=-Wno-missing-prototypes
makeoptions radeonCWARNFLAGS.si.c+=-Wno-missing-prototypes
makeoptions radeonCWARNFLAGS.si_dpm.c+=-Wno-missing-field-initializers
CVS commit: src/sys/external/bsd/drm2/dist/uapi/drm
Module Name:src Committed By: riastradh Date: Wed Sep 17 16:10:41 UTC 2014 Modified Files: src/sys/external/bsd/drm2/dist/uapi/drm: drm.h Log Message: Kludgily define __user in kernel here too. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/uapi/drm/drm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/uapi/drm/drm.h diff -u src/sys/external/bsd/drm2/dist/uapi/drm/drm.h:1.5 src/sys/external/bsd/drm2/dist/uapi/drm/drm.h:1.6 --- src/sys/external/bsd/drm2/dist/uapi/drm/drm.h:1.5 Wed Sep 17 15:36:04 2014 +++ src/sys/external/bsd/drm2/dist/uapi/drm/drm.h Wed Sep 17 16:10:41 2014 @@ -62,11 +62,11 @@ typedef int32_t __s32; typedef uint32_t __u32; typedef int64_t __s64; typedef uint64_t __u64; +#endif # ifndef __user #define __user # endif #endif -#endif #define DRM_NAME drm /** Name in kernel, /dev, and /proc */ #define DRM_MIN_ORDER 5 /** At least 2^5 bytes = 32 bytes */
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Wed Sep 17 16:16:33 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_cmd_parser.c
Log Message:
Avoid missing field initializers.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c:1.3 Fri Jul 18 19:34:59 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c Wed Sep 17 16:16:33 2014
@@ -370,7 +370,8 @@ int i915_parse_cmds(struct intel_ring_bu
{
int ret = 0;
u32 *cmd, *batch_base, *batch_end;
- struct drm_i915_cmd_descriptor default_desc = { 0 };
+ static const struct drm_i915_cmd_descriptor zero_default_desc;
+ struct drm_i915_cmd_descriptor default_desc = zero_default_desc;
int needs_clflush = 0;
ret = i915_gem_obj_prepare_shmem_read(batch_obj, needs_clflush);
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Wed Sep 17 16:35:39 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c
Log Message:
Avoid container_of-inspired obj-base == NULL nonsense.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.15 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.16
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.15 Wed Aug 20 13:48:08 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Wed Sep 17 16:35:39 2014
@@ -809,6 +809,7 @@ i915_gem_pread_ioctl(struct drm_device *
struct drm_file *file)
{
struct drm_i915_gem_pread *args = data;
+ struct drm_gem_object *gobj;
struct drm_i915_gem_object *obj;
int ret = 0;
@@ -824,11 +825,12 @@ i915_gem_pread_ioctl(struct drm_device *
if (ret)
return ret;
- obj = to_intel_bo(drm_gem_object_lookup(dev, file, args-handle));
- if (obj-base == NULL) {
+ gobj = drm_gem_object_lookup(dev, file, args-handle);
+ if (gobj == NULL) {
ret = -ENOENT;
goto unlock;
}
+ obj = to_intel_bo(gobj);
/* Bounds check source. */
if (args-offset obj-base.size ||
@@ -1201,6 +1203,7 @@ i915_gem_pwrite_ioctl(struct drm_device
struct drm_file *file)
{
struct drm_i915_gem_pwrite *args = data;
+ struct drm_gem_object *gobj;
struct drm_i915_gem_object *obj;
int ret;
@@ -1225,11 +1228,12 @@ i915_gem_pwrite_ioctl(struct drm_device
if (ret)
return ret;
- obj = to_intel_bo(drm_gem_object_lookup(dev, file, args-handle));
- if (obj-base == NULL) {
+ gobj = drm_gem_object_lookup(dev, file, args-handle);
+ if (gobj == NULL) {
ret = -ENOENT;
goto unlock;
}
+ obj = to_intel_bo(gobj);
/* Bounds check destination. */
if (args-offset obj-base.size ||
@@ -1661,6 +1665,7 @@ i915_gem_set_domain_ioctl(struct drm_dev
struct drm_file *file)
{
struct drm_i915_gem_set_domain *args = data;
+ struct drm_gem_object *gobj;
struct drm_i915_gem_object *obj;
uint32_t read_domains = args-read_domains;
uint32_t write_domain = args-write_domain;
@@ -1683,11 +1688,12 @@ i915_gem_set_domain_ioctl(struct drm_dev
if (ret)
return ret;
- obj = to_intel_bo(drm_gem_object_lookup(dev, file, args-handle));
- if (obj-base == NULL) {
+ gobj = drm_gem_object_lookup(dev, file, args-handle);
+ if (gobj == NULL) {
ret = -ENOENT;
goto unlock;
}
+ obj = to_intel_bo(gobj);
/* Try to flush the object off the GPU without holding the lock.
* We will repeat the flush holding the lock in the normal manner
@@ -1727,6 +1733,7 @@ i915_gem_sw_finish_ioctl(struct drm_devi
struct drm_file *file)
{
struct drm_i915_gem_sw_finish *args = data;
+ struct drm_gem_object *gobj;
struct drm_i915_gem_object *obj;
int ret = 0;
@@ -1734,11 +1741,12 @@ i915_gem_sw_finish_ioctl(struct drm_devi
if (ret)
return ret;
- obj = to_intel_bo(drm_gem_object_lookup(dev, file, args-handle));
- if (obj-base == NULL) {
+ gobj = drm_gem_object_lookup(dev, file, args-handle);
+ if (gobj == NULL) {
ret = -ENOENT;
goto unlock;
}
+ obj = to_intel_bo(gobj);
/* Pinned buffers may be scanout, so flush the cache */
if (obj-pin_display)
@@ -2266,6 +2274,7 @@ i915_gem_mmap_gtt(struct drm_file *file,
uint64_t *offset)
{
struct drm_i915_private *dev_priv = dev-dev_private;
+ struct drm_gem_object *gobj;
struct drm_i915_gem_object *obj;
int ret;
@@ -2273,11 +2282,12 @@ i915_gem_mmap_gtt(struct drm_file *file,
if (ret)
return ret;
- obj = to_intel_bo(drm_gem_object_lookup(dev, file, handle));
- if (obj-base == NULL) {
+ gobj = drm_gem_object_lookup(dev, file, handle);
+ if (gobj == NULL) {
ret = -ENOENT;
goto unlock;
}
+ obj = to_intel_bo(gobj);
if (obj-base.size dev_priv-gtt.mappable_end) {
ret = -E2BIG;
@@ -3356,6 +3366,7 @@ i915_gem_wait_ioctl(struct drm_device *d
{
struct drm_i915_private *dev_priv = dev-dev_private;
struct drm_i915_gem_wait *args = data;
+ struct drm_gem_object *gobj;
struct drm_i915_gem_object *obj;
struct intel_ring_buffer *ring = NULL;
struct timespec timeout_stack, *timeout = NULL;
@@ -3372,11 +3383,12 @@ i915_gem_wait_ioctl(struct drm_device *d
if (ret)
return ret;
- obj = to_intel_bo(drm_gem_object_lookup(dev, file, args-bo_handle));
- if (obj-base == NULL) {
+ gobj = drm_gem_object_lookup(dev, file, args-bo_handle);
+ if (gobj == NULL) {
mutex_unlock(dev-struct_mutex);
return -ENOENT;
}
+ obj = to_intel_bo(gobj);
/* Need to make sure the object gets inactive eventually. */
ret = i915_gem_object_flush_active(obj);
@@ -4319,6 +4331,7 @@ int i915_gem_get_caching_ioctl(struct dr
struct drm_file *file)
{
struct drm_i915_gem_caching *args =
CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon
Module Name:src
Committed By: riastradh
Date: Wed Sep 17 16:43:31 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: kv_dpm.c
Log Message:
Ifdef out nonsensical comparison until we update from upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/radeon/kv_dpm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/kv_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/kv_dpm.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/kv_dpm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/kv_dpm.c:1.2 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/kv_dpm.c Wed Sep 17 16:43:31 2014
@@ -1445,8 +1445,10 @@ static u8 kv_get_vce_boot_level(struct r
rdev-pm.dpm.dyn_state.vce_clock_voltage_dependency_table;
for (i = 0; i table-count; i++) {
+#if 0 /* XXX Upstream has changed this to make sense. */
if (table-entries[i].evclk = 0) /* XXX */
break;
+#endif
}
return i;
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: joerg Date: Wed Sep 17 16:49:20 UTC 2014 Modified Files: src/sys/arch/mips/include: asm.h Log Message: Normal spelling is .asciz, so use that on MIPS too. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/arch/mips/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/asm.h diff -u src/sys/arch/mips/include/asm.h:1.47 src/sys/arch/mips/include/asm.h:1.48 --- src/sys/arch/mips/include/asm.h:1.47 Fri May 30 11:46:48 2014 +++ src/sys/arch/mips/include/asm.h Wed Sep 17 16:49:20 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.47 2014/05/30 11:46:48 joerg Exp $ */ +/* $NetBSD: asm.h,v 1.48 2014/09/17 16:49:20 joerg Exp $ */ /* * Copyright (c) 1992, 1993 @@ -259,11 +259,11 @@ _C_LABEL(x): #define MSG(msg) \ .rdata;\ -9: .asciiz msg; \ +9: .asciz msg; \ .text #define ASMSTR(str) \ - .asciiz str; \ + .asciz str; \ .align 3 #define RCSID(name) .pushsection .ident; .asciz name; .popsection
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: reinoud
Date: Wed Sep 17 19:47:05 UTC 2014
Modified Files:
src/sys/fs/udf: udf.h udf_subr.c
Log Message:
As pointed out by wiz@ prevent a possible attack or corruption that results in
an endless loop of indirect descriptors being processed.
The number of indirect descriptors followed is now maximized.
While here, also fix a use-after-free bug!
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/fs/udf/udf.h
cvs rdiff -u -r1.125 -r1.126 src/sys/fs/udf/udf_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/udf/udf.h
diff -u src/sys/fs/udf/udf.h:1.46 src/sys/fs/udf/udf.h:1.47
--- src/sys/fs/udf/udf.h:1.46 Fri Oct 18 19:56:55 2013
+++ src/sys/fs/udf/udf.h Wed Sep 17 19:47:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.h,v 1.46 2013/10/18 19:56:55 christos Exp $ */
+/* $NetBSD: udf.h,v 1.47 2014/09/17 19:47:05 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -128,6 +128,8 @@ extern int udf_verbose;
#define UDF_DISC_SLACK (128) /* picked, at least 64 kb or 128 */
#define UDF_ISO_VRS_SIZE (32*2048) /* 32 ISO `sectors' */
+#define UDF_MAX_INDIRS_FOLLOW 1024 /* picked */
+
/* structure space */
#define UDF_ANCHORS 4 /* 256, 512, N-256, N */
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.125 src/sys/fs/udf/udf_subr.c:1.126
--- src/sys/fs/udf/udf_subr.c:1.125 Tue Jul 29 15:36:43 2014
+++ src/sys/fs/udf/udf_subr.c Wed Sep 17 19:47:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.125 2014/07/29 15:36:43 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.126 2014/09/17 19:47:05 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.125 2014/07/29 15:36:43 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.126 2014/09/17 19:47:05 reinoud Exp $);
#endif /* not lint */
@@ -5290,6 +5290,7 @@ udf_get_node(struct udf_mount *ump, stru
uint32_t lb_size, sector, dummy;
int udf_file_type, dscr_type, strat, strat4096, needs_indirect;
int slot, eof, error;
+ int num_indir_followed = 0;
DPRINTF(NODE, (udf_get_node called\n));
*udf_noderes = udf_node = NULL;
@@ -5392,8 +5393,12 @@ udf_get_node(struct udf_mount *ump, stru
/* if dealing with an indirect entry, follow the link */
if (dscr_type == TAGID_INDIRECTENTRY) {
needs_indirect = 0;
- udf_free_logvol_dscr(ump, icb_loc, dscr);
icb_loc = dscr-inde.indirect_icb;
+ udf_free_logvol_dscr(ump, icb_loc, dscr);
+ if (++num_indir_followed UDF_MAX_INDIRS_FOLLOW) {
+error = EMLINK;
+break;
+ }
continue;
}
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: reinoud
Date: Wed Sep 17 21:18:43 UTC 2014
Modified Files:
src/sys/fs/udf: udf_subr.c
Log Message:
Fix bug introduced in last patch
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/fs/udf/udf_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.126 src/sys/fs/udf/udf_subr.c:1.127
--- src/sys/fs/udf/udf_subr.c:1.126 Wed Sep 17 19:47:05 2014
+++ src/sys/fs/udf/udf_subr.c Wed Sep 17 21:18:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.126 2014/09/17 19:47:05 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.127 2014/09/17 21:18:43 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.126 2014/09/17 19:47:05 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.127 2014/09/17 21:18:43 reinoud Exp $);
#endif /* not lint */
@@ -5285,7 +5285,7 @@ udf_get_node(struct udf_mount *ump, stru
union dscrptr *dscr;
struct udf_node *udf_node;
struct vnode*nvp;
- struct long_ad icb_loc, last_fe_icb_loc;
+ struct long_ad icb_loc, next_icb_loc, last_fe_icb_loc;
uint64_t file_size;
uint32_t lb_size, sector, dummy;
int udf_file_type, dscr_type, strat, strat4096, needs_indirect;
@@ -5393,8 +5393,9 @@ udf_get_node(struct udf_mount *ump, stru
/* if dealing with an indirect entry, follow the link */
if (dscr_type == TAGID_INDIRECTENTRY) {
needs_indirect = 0;
- icb_loc = dscr-inde.indirect_icb;
+ next_icb_loc = dscr-inde.indirect_icb;
udf_free_logvol_dscr(ump, icb_loc, dscr);
+ icb_loc = next_icb_loc;
if (++num_indir_followed UDF_MAX_INDIRS_FOLLOW) {
error = EMLINK;
break;
CVS commit: src/lib/libutil
Module Name:src Committed By: christos Date: Wed Sep 17 23:54:42 UTC 2014 Modified Files: src/lib/libutil: getdiskrawname.c Log Message: KNF, sign cast. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libutil/getdiskrawname.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/getdiskrawname.c diff -u src/lib/libutil/getdiskrawname.c:1.4 src/lib/libutil/getdiskrawname.c:1.5 --- src/lib/libutil/getdiskrawname.c:1.4 Fri Sep 12 07:38:23 2014 +++ src/lib/libutil/getdiskrawname.c Wed Sep 17 19:54:42 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: getdiskrawname.c,v 1.4 2014/09/12 11:38:23 mlelstv Exp $ */ +/* $NetBSD: getdiskrawname.c,v 1.5 2014/09/17 23:54:42 christos Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: getdiskrawname.c,v 1.4 2014/09/12 11:38:23 mlelstv Exp $); +__RCSID($NetBSD: getdiskrawname.c,v 1.5 2014/09/17 23:54:42 christos Exp $); #include sys/stat.h @@ -47,7 +47,7 @@ resolve_link(char *buf, size_t bufsiz, c size_t nlen; ssize_t dlen; - dlen = readlink(name, buf, bufsiz-1); + dlen = readlink(name, buf, bufsiz - 1); if (dlen == -1) return name; @@ -62,7 +62,7 @@ resolve_link(char *buf, size_t bufsiz, c if (nlen + dlen + 1 bufsiz) return NULL; - memmove(buf+nlen, buf, dlen+1); + memmove(buf + nlen, buf, (size_t)dlen + 1); memcpy(buf, name, nlen); } }
CVS commit: othersrc/external/bsd/netdiff/dist
Module Name:othersrc
Committed By: agc
Date: Thu Sep 18 01:47:13 UTC 2014
Modified Files:
othersrc/external/bsd/netdiff/dist: diff.c mem.c qdiff.c
Log Message:
fixes for WARNS=5 with gcc-4.8
Mainly variable set but not used errors
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 othersrc/external/bsd/netdiff/dist/diff.c
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/netdiff/dist/mem.c
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/netdiff/dist/qdiff.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/netdiff/dist/diff.c
diff -u othersrc/external/bsd/netdiff/dist/diff.c:1.5 othersrc/external/bsd/netdiff/dist/diff.c:1.6
--- othersrc/external/bsd/netdiff/dist/diff.c:1.5 Wed Jan 16 01:50:19 2013
+++ othersrc/external/bsd/netdiff/dist/diff.c Thu Sep 18 01:47:13 2014
@@ -340,7 +340,6 @@ main(int argc, char **argv)
{
diff_t diff;
char **oargv;
- char *line_format, *group_format;
char *prog;
int ch, lastch, prevoptind, newarg;
int oargc;
@@ -455,7 +454,6 @@ main(int argc, char **argv)
case OPT_UNCHGD_GF:
/* XXX To do: Complete --GTYPE-group-format. */
diff.format = D_GF;
- group_format = optarg;
break;
case OPT_NEW_LF:
case OPT_OLD_LF:
@@ -463,7 +461,6 @@ main(int argc, char **argv)
case OPT_LF:
/* XXX To do: Complete --line-format. */
diff.format = D_LF;
- line_format = optarg;
break;
case OPT_NORMAL:
diff.format = D_NORMAL;
Index: othersrc/external/bsd/netdiff/dist/mem.c
diff -u othersrc/external/bsd/netdiff/dist/mem.c:1.2 othersrc/external/bsd/netdiff/dist/mem.c:1.3
--- othersrc/external/bsd/netdiff/dist/mem.c:1.2 Wed Jan 16 01:50:19 2013
+++ othersrc/external/bsd/netdiff/dist/mem.c Thu Sep 18 01:47:13 2014
@@ -279,6 +279,7 @@ read_excludes_file(diff_t *diff, char *f
char *buf, *pattern;
size_t len;
+ pattern = NULL;
if (strcmp(file, -) == 0) {
fp = stdin;
} else if ((fp = fopen(file, r)) == NULL) {
@@ -380,7 +381,6 @@ main(int argc, char **argv)
{
diff_t diff;
char **oargv;
- char *line_format, *group_format;
char *prog;
int ch, lastch, prevoptind, newarg;
int oargc;
@@ -495,7 +495,6 @@ main(int argc, char **argv)
case OPT_UNCHGD_GF:
/* XXX To do: Complete --GTYPE-group-format. */
diff.format = D_GF;
- group_format = optarg;
break;
case OPT_NEW_LF:
case OPT_OLD_LF:
@@ -503,7 +502,6 @@ main(int argc, char **argv)
case OPT_LF:
/* XXX To do: Complete --line-format. */
diff.format = D_LF;
- line_format = optarg;
break;
case OPT_NORMAL:
diff.format = D_NORMAL;
Index: othersrc/external/bsd/netdiff/dist/qdiff.c
diff -u othersrc/external/bsd/netdiff/dist/qdiff.c:1.3 othersrc/external/bsd/netdiff/dist/qdiff.c:1.4
--- othersrc/external/bsd/netdiff/dist/qdiff.c:1.3 Wed Jan 16 01:50:20 2013
+++ othersrc/external/bsd/netdiff/dist/qdiff.c Thu Sep 18 01:47:13 2014
@@ -278,18 +278,21 @@ read_excludes_file(diff_t *diff, char *f
char *buf, *pattern;
size_t len;
- if (strcmp(file, -) == 0)
+ pattern = NULL;
+ if (strcmp(file, -) == 0) {
fp = stdin;
- else if ((fp = fopen(file, r)) == NULL)
+ } else if ((fp = fopen(file, r)) == NULL) {
err(2, %s, file);
+ }
while ((buf = fgetln(fp, len)) != NULL) {
if (buf[len - 1] == '\n') {
len--;
}
push_excludes(diff, pattern, len);
}
- if (strcmp(file, -) != 0)
+ if (strcmp(file, -) != 0) {
fclose(fp);
+ }
}
static int
@@ -334,8 +337,6 @@ main(int argc, char **argv)
{
diff_t diff;
size_t cc;
- char *line_format;
- char *group_format;
char **oargv;
char *prog;
char *s;
@@ -449,7 +450,6 @@ main(int argc, char **argv)
case OPT_UNCHGD_GF:
/* XXX To do: Complete --GTYPE-group-format. */
diff.format = D_GF;
- group_format = optarg;
break;
case OPT_NEW_LF:
case OPT_OLD_LF:
@@ -457,7 +457,6 @@ main(int argc, char **argv)
case OPT_LF:
/* XXX To do: Complete --line-format. */
diff.format = D_LF;
- line_format = optarg;
break;
case OPT_NORMAL:
diff.format = D_NORMAL;
CVS commit: othersrc/external/bsd/netdiff/dist
Module Name:othersrc
Committed By: agc
Date: Thu Sep 18 02:35:32 UTC 2014
Modified Files:
othersrc/external/bsd/netdiff/dist: mem.c qdiff.c
Log Message:
use the correct variable to push a file to exclude onto the stack.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/netdiff/dist/mem.c
cvs rdiff -u -r1.4 -r1.5 othersrc/external/bsd/netdiff/dist/qdiff.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/netdiff/dist/mem.c
diff -u othersrc/external/bsd/netdiff/dist/mem.c:1.3 othersrc/external/bsd/netdiff/dist/mem.c:1.4
--- othersrc/external/bsd/netdiff/dist/mem.c:1.3 Thu Sep 18 01:47:13 2014
+++ othersrc/external/bsd/netdiff/dist/mem.c Thu Sep 18 02:35:32 2014
@@ -276,10 +276,9 @@ static int
read_excludes_file(diff_t *diff, char *file)
{
FILE *fp;
- char *buf, *pattern;
+ char *buf;
size_t len;
- pattern = NULL;
if (strcmp(file, -) == 0) {
fp = stdin;
} else if ((fp = fopen(file, r)) == NULL) {
@@ -290,7 +289,7 @@ read_excludes_file(diff_t *diff, char *f
if (buf[len - 1] == '\n') {
len--;
}
- if (!push_excludes(diff, pattern, len)) {
+ if (!push_excludes(diff, buf, len)) {
return 0;
}
}
Index: othersrc/external/bsd/netdiff/dist/qdiff.c
diff -u othersrc/external/bsd/netdiff/dist/qdiff.c:1.4 othersrc/external/bsd/netdiff/dist/qdiff.c:1.5
--- othersrc/external/bsd/netdiff/dist/qdiff.c:1.4 Thu Sep 18 01:47:13 2014
+++ othersrc/external/bsd/netdiff/dist/qdiff.c Thu Sep 18 02:35:32 2014
@@ -275,10 +275,9 @@ static void
read_excludes_file(diff_t *diff, char *file)
{
FILE *fp;
- char *buf, *pattern;
+ char *buf;
size_t len;
- pattern = NULL;
if (strcmp(file, -) == 0) {
fp = stdin;
} else if ((fp = fopen(file, r)) == NULL) {
@@ -288,7 +287,7 @@ read_excludes_file(diff_t *diff, char *f
if (buf[len - 1] == '\n') {
len--;
}
- push_excludes(diff, pattern, len);
+ push_excludes(diff, buf, len);
}
if (strcmp(file, -) != 0) {
fclose(fp);
