Date: Sat, 18 May 2002 23:56:55 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 11529 for review Message-ID: <200205190656.g4J6utc58559@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11529 Change 11529 by peter@peter_daintree on 2002/05/18 23:56:53 IFC @11527 Affected files ... ... //depot/projects/ia64/bin/sh/error.c#4 integrate ... //depot/projects/ia64/bin/sh/eval.c#3 integrate ... //depot/projects/ia64/bin/sh/jobs.c#3 integrate ... //depot/projects/ia64/bin/sh/nodetypes#2 integrate ... //depot/projects/ia64/bin/sh/parser.c#3 integrate ... //depot/projects/ia64/bin/sh/redir.c#3 integrate ... //depot/projects/ia64/bin/sh/sh.1#4 integrate ... //depot/projects/ia64/bin/sh/show.c#3 integrate ... //depot/projects/ia64/sys/dev/acpica/Osd/OsdInterrupt.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#6 integrate ... //depot/projects/ia64/sys/dev/acpica/Osd/OsdSynch.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi.c#11 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_button.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_cpu.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#5 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_lid.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_powerres.c#3 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#3 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_thermal.c#5 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#6 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/feeder.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/sound.c#5 integrate ... //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#6 integrate ... //depot/projects/ia64/sys/ia64/ia64/ski.c#3 integrate ... //depot/projects/ia64/sys/ia64/include/mca.h#5 integrate Differences ... ==== //depot/projects/ia64/bin/sh/error.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)error.c 8.2 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/error.c,v 1.19 2002/05/16 01:57:20 trhodes Exp $"; + "$FreeBSD: src/bin/sh/error.c,v 1.20 2002/05/19 06:03:05 tjr Exp $"; #endif /* not lint */ /* @@ -247,6 +247,7 @@ #ifdef ELIBACC { ELIBACC, E_EXEC, "shared library missing" }, #endif + { EEXIST, E_CREAT, "file exists" }, { 0, 0, NULL }, }; ==== //depot/projects/ia64/bin/sh/eval.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/eval.c,v 1.31 2002/02/02 06:50:46 imp Exp $"; + "$FreeBSD: src/bin/sh/eval.c,v 1.32 2002/05/19 06:03:05 tjr Exp $"; #endif /* not lint */ #include <signal.h> @@ -448,6 +448,7 @@ case NTO: case NFROMTO: case NAPPEND: + case NCLOBBER: expandarg(redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR); redir->nfile.expfname = fn.list->text; break; ==== //depot/projects/ia64/bin/sh/jobs.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/jobs.c,v 1.32 2002/02/02 06:50:46 imp Exp $"; + "$FreeBSD: src/bin/sh/jobs.c,v 1.33 2002/05/19 06:03:05 tjr Exp $"; #endif /* not lint */ #include <fcntl.h> @@ -1057,6 +1057,8 @@ p = ">>"; i = 1; goto redir; case NTOFD: p = ">&"; i = 1; goto redir; + case NCLOBBER: + p = ">|"; i = 1; goto redir; case NFROM: p = "<"; i = 0; goto redir; case NFROMTO: ==== //depot/projects/ia64/bin/sh/nodetypes#2 (text+ko) ==== @@ -34,7 +34,7 @@ # SUCH DAMAGE. # # @(#)nodetypes 8.2 (Berkeley) 5/4/95 -# $FreeBSD: src/bin/sh/nodetypes,v 1.7 2000/10/03 23:13:14 brian Exp $ +# $FreeBSD: src/bin/sh/nodetypes,v 1.8 2002/05/19 06:03:05 tjr Exp $ # This file describes the nodes used in parse trees. Unindented lines # contain a node type followed by a structure tag. Subsequent indented @@ -120,6 +120,7 @@ NFROM nfile # fd< fname NFROMTO nfile # fd<> fname NAPPEND nfile # fd>> fname +NCLOBBER nfile # fd>| fname type int next nodeptr # next redirection in list fd int # file descriptor being redirected ==== //depot/projects/ia64/bin/sh/parser.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/parser.c,v 1.38 2002/02/02 06:50:47 imp Exp $"; + "$FreeBSD: src/bin/sh/parser.c,v 1.39 2002/05/19 06:03:05 tjr Exp $"; #endif /* not lint */ #include <stdlib.h> @@ -1145,6 +1145,8 @@ np->type = NAPPEND; else if (c == '&') np->type = NTOFD; + else if (c == '|') + np->type = NCLOBBER; else { np->type = NTO; pungetc(); ==== //depot/projects/ia64/bin/sh/redir.c#3 (text+ko) ==== @@ -39,10 +39,11 @@ static char sccsid[] = "@(#)redir.c 8.2 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/redir.c,v 1.17 2002/02/02 06:50:47 imp Exp $"; + "$FreeBSD: src/bin/sh/redir.c,v 1.18 2002/05/19 06:03:05 tjr Exp $"; #endif /* not lint */ #include <sys/types.h> +#include <sys/stat.h> #include <signal.h> #include <string.h> #include <fcntl.h> @@ -62,6 +63,7 @@ #include "output.h" #include "memalloc.h" #include "error.h" +#include "options.h" #define EMPTY -2 /* marks an unused slot in redirtab */ @@ -161,6 +163,7 @@ STATIC void openredirect(union node *redir, char memory[10]) { + struct stat sb; int fd = redir->nfile.fd; char *fname; int f; @@ -207,6 +210,9 @@ goto movefd; case NTO: fname = redir->nfile.expfname; + if (Cflag && stat(fname, &sb) != -1 && S_ISREG(sb.st_mode)) + error("cannot create %s: %s", fname, + errmsg(EEXIST, E_CREAT)); #ifdef O_CREAT if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0) error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); @@ -215,6 +221,11 @@ error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); #endif goto movefd; + case NCLOBBER: + fname = redir->nfile.expfname; + if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0) + error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); + goto movefd; case NAPPEND: fname = redir->nfile.expfname; #ifdef O_APPEND ==== //depot/projects/ia64/bin/sh/sh.1#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.58 2001/11/20 18:41:01 knu Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.59 2002/05/19 06:03:05 tjr Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -195,7 +195,6 @@ .It Fl C Li noclobber Do not overwrite existing files with .Dq Li > . -(UNIMPLEMENTED) .It Fl E Li emacs Enable the builtin .Xr emacs 1 ==== //depot/projects/ia64/bin/sh/show.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)show.c 8.3 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/show.c,v 1.15 2002/02/02 06:50:47 imp Exp $"; + "$FreeBSD: src/bin/sh/show.c,v 1.16 2002/05/19 06:03:05 tjr Exp $"; #endif /* not lint */ #include <stdio.h> @@ -142,6 +142,7 @@ case NTO: s = ">"; dftfd = 1; break; case NAPPEND: s = ">>"; dftfd = 1; break; case NTOFD: s = ">&"; dftfd = 1; break; + case NCLOBBER: s = ">|"; dftfd = 1; break; case NFROM: s = "<"; dftfd = 0; break; case NFROMTO: s = "<>"; dftfd = 0; break; case NFROMFD: s = "<&"; dftfd = 0; break; ==== //depot/projects/ia64/sys/dev/acpica/Osd/OsdInterrupt.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.10 2002/02/23 05:31:38 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.11 2002/05/19 06:16:47 peter Exp $ */ /* @@ -55,7 +55,7 @@ { struct acpi_softc *sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if ((sc = devclass_get_softc(devclass_find("acpi"), 0)) == NULL) panic("can't find ACPI device to register interrupt"); @@ -101,7 +101,7 @@ { struct acpi_softc *sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if ((InterruptNumber < 0) || (InterruptNumber > 255)) return_ACPI_STATUS(AE_BAD_PARAMETER); ==== //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.19 2002/04/04 21:03:13 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.20 2002/05/19 06:16:47 peter Exp $ */ /* @@ -164,7 +164,7 @@ struct acpi_task *at; int pri; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (Function == NULL) return_ACPI_STATUS(AE_BAD_PARAMETER); @@ -207,7 +207,7 @@ OSD_EXECUTION_CALLBACK Function; void *Context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); at = (struct acpi_task *)arg; atq = NULL; @@ -248,7 +248,7 @@ int timo; static int dummy; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); timo = (Seconds * hz) + Milliseconds * hz / 1000; if (timo == 0) @@ -260,7 +260,7 @@ void AcpiOsStall (UINT32 Microseconds) { - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); DELAY(Microseconds); return_VOID; ==== //depot/projects/ia64/sys/dev/acpica/Osd/OsdSynch.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.12 2002/04/04 21:03:14 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.13 2002/05/19 06:16:47 peter Exp $ */ /* @@ -74,7 +74,7 @@ #ifndef ACPI_NO_SEMAPHORES struct acpi_semaphore *as; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (OutHandle == NULL) return(AE_BAD_PARAMETER); @@ -108,7 +108,7 @@ #ifndef ACPI_NO_SEMAPHORES struct acpi_semaphore *as = (struct acpi_semaphore *)Handle; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "destroyed semaphore %p\n", as)); mtx_destroy(&as->as_mtx); @@ -133,7 +133,7 @@ int rv, tmo; struct timeval timeouttv, currenttv, timelefttv; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (as == NULL) return_ACPI_STATUS(AE_BAD_PARAMETER); @@ -288,7 +288,7 @@ #ifndef ACPI_NO_SEMAPHORES struct acpi_semaphore *as = (struct acpi_semaphore *)Handle; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (as == NULL) return_ACPI_STATUS(AE_BAD_PARAMETER); ==== //depot/projects/ia64/sys/dev/acpica/acpi.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.62 2002/05/09 21:13:37 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.63 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" @@ -213,7 +213,7 @@ char *debugpoint; #endif - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if(!cold){ printf("Don't load this driver from userland!!\n"); @@ -296,7 +296,7 @@ ACPI_STATUS status; int error; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (power_pm_get_type() != POWER_PM_TYPE_NONE && power_pm_get_type() != POWER_PM_TYPE_ACPI) { @@ -330,7 +330,7 @@ char *debugpoint; #endif - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_LOCK; sc = device_get_softc(dev); bzero(sc, sizeof(*sc)); @@ -732,7 +732,7 @@ ACPI_STATUS error; u_int32_t pnpid; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); pnpid = 0; ACPI_LOCK; @@ -757,7 +757,7 @@ int result; u_int32_t pnpid; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* * ISA-style drivers attached to ACPI may persist and @@ -792,7 +792,7 @@ static char *scopes[] = {"\\_PR_", "\\_TZ_", "\\_SI", "\\_SB_", NULL}; int i; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; /* @@ -842,7 +842,7 @@ ACPI_OBJECT_TYPE type; device_t child, bus = (device_t)context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* * Skip this device if we think we'll have trouble with it. @@ -1312,7 +1312,7 @@ UINT8 TypeA; UINT8 TypeB; - ACPI_FUNCTION_TRACE_U32(__func__, state); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); ACPI_ASSERTLOCK; if (sc->acpi_sstate != ACPI_STATE_S0) @@ -1411,7 +1411,7 @@ ACPI_STATUS status; u_int32_t flags; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; flags = ACPI_NO_ADDRESS_SPACE_INIT | ACPI_NO_HARDWARE_INIT | @@ -1431,7 +1431,7 @@ { ACPI_STATUS status; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; if (sc->acpi_enabled) { @@ -1453,7 +1453,7 @@ static void acpi_system_eventhandler_sleep(void *arg, int state) { - ACPI_FUNCTION_TRACE_U32(__func__, state); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); ACPI_LOCK; if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX) @@ -1465,7 +1465,7 @@ static void acpi_system_eventhandler_wakeup(void *arg, int state) { - ACPI_FUNCTION_TRACE_U32(__func__, state); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); /* Well, what to do? :-) */ @@ -1483,7 +1483,7 @@ { struct acpi_softc *sc = (struct acpi_softc *)context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); EVENTHANDLER_INVOKE(acpi_sleep_event, sc->acpi_power_button_sx); @@ -1495,7 +1495,7 @@ { struct acpi_softc *sc = (struct acpi_softc *)context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); EVENTHANDLER_INVOKE(acpi_wakeup_event, sc->acpi_power_button_sx); @@ -1507,7 +1507,7 @@ { struct acpi_softc *sc = (struct acpi_softc *)context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); EVENTHANDLER_INVOKE(acpi_sleep_event, sc->acpi_sleep_button_sx); @@ -1519,7 +1519,7 @@ { struct acpi_softc *sc = (struct acpi_softc *)context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); EVENTHANDLER_INVOKE(acpi_wakeup_event, sc->acpi_sleep_button_sx); ==== //depot/projects/ia64/sys/dev/acpica/acpi_button.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.8 2002/02/23 05:22:49 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.9 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" @@ -103,7 +103,7 @@ struct acpi_button_softc *sc; ACPI_STATUS status; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); sc->button_dev = dev; @@ -123,7 +123,7 @@ struct acpi_button_softc *sc; struct acpi_softc *acpi_sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_button_softc *)arg; acpi_sc = acpi_device_get_parent_softc(sc->button_dev); @@ -154,7 +154,7 @@ struct acpi_button_softc *sc; struct acpi_softc *acpi_sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_button_softc *)arg; acpi_sc = acpi_device_get_parent_softc(sc->button_dev); @@ -188,7 +188,7 @@ { struct acpi_button_softc *sc = (struct acpi_button_softc *)context; - ACPI_FUNCTION_TRACE_U32(__func__, notify); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, notify); switch (notify) { case ACPI_NOTIFY_BUTTON_PRESSED_FOR_SLEEP: ==== //depot/projects/ia64/sys/dev/acpica/acpi_cpu.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.12 2002/03/04 18:45:46 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.13 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" @@ -144,7 +144,7 @@ u_int32_t duty_end; int rid; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; ==== //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.24 2002/02/23 05:26:31 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.25 2002/05/19 06:16:45 peter Exp $ */ /****************************************************************************** * @@ -322,7 +322,7 @@ static void acpi_ec_identify(driver_t driver, device_t bus) { - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* XXX implement - need an ACPI 2.0 system to test this */ @@ -358,7 +358,7 @@ ACPI_STATUS Status; int errval = 0; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* * Fetch/initialise softc @@ -457,7 +457,7 @@ ACPI_STATUS Status; char qxx[5]; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); for (;;) { @@ -548,7 +548,7 @@ EcSpaceSetup(ACPI_HANDLE Region, UINT32 Function, void *Context, void **RegionContext) { - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* * Just pass the context through, there's nothing to do here. @@ -567,7 +567,7 @@ EC_REQUEST EcRequest; int i; - ACPI_FUNCTION_TRACE_U32(__func__, (UINT32)Address); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, (UINT32)Address); if ((Address > 0xFF) || (width % 8 != 0) || (Value == NULL) || (Context == NULL)) return_ACPI_STATUS(AE_BAD_PARAMETER); @@ -615,7 +615,7 @@ EC_STATUS EcStatus; int i; - ACPI_FUNCTION_TRACE_U32(__func__, (UINT32)Event); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, (UINT32)Event); /* XXX this should test whether interrupts are available some other way */ if(cold) ==== //depot/projects/ia64/sys/dev/acpica/acpi_lid.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.9 2002/02/23 05:26:45 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.10 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" @@ -92,7 +92,7 @@ { struct acpi_lid_softc *sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); sc->lid_dev = dev; @@ -111,7 +111,7 @@ struct acpi_lid_softc *sc; struct acpi_softc *acpi_sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_lid_softc *)arg; @@ -148,7 +148,7 @@ { struct acpi_lid_softc *sc = (struct acpi_lid_softc *)context; - ACPI_FUNCTION_TRACE_U32(__func__, notify); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, notify); switch (notify) { case ACPI_NOTIFY_STATUS_CHANGED: ==== //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.20 2002/03/21 02:02:31 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.21 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" #include <sys/param.h> @@ -128,7 +128,7 @@ ACPI_STATUS status; int result; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); sc->ap_dev = dev; @@ -310,7 +310,7 @@ int i; uintptr_t up; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); crsbuf.Pointer = NULL; prsbuf.Pointer = NULL; ==== //depot/projects/ia64/sys/dev/acpica/acpi_powerres.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.11 2002/02/23 05:28:08 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.12 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" /* XXX trim includes */ @@ -148,7 +148,7 @@ ACPI_OBJECT *obj; struct acpi_powerresource *rp, *srp; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); rp = NULL; buf.Pointer = NULL; @@ -212,7 +212,7 @@ { struct acpi_powerresource *rp; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); rp = NULL; @@ -243,7 +243,7 @@ { struct acpi_powerconsumer *pc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* check to see whether we know about this consumer already */ if ((pc = acpi_pwr_find_consumer(consumer)) != NULL) @@ -274,7 +274,7 @@ { struct acpi_powerconsumer *pc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* find the consumer */ if ((pc = acpi_pwr_find_consumer(consumer)) == NULL) @@ -307,7 +307,7 @@ char *method_name, *reslist_name; int res_changed; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* find the consumer */ if ((pc = acpi_pwr_find_consumer(consumer)) == NULL) { @@ -482,7 +482,7 @@ ACPI_HANDLE res; ACPI_STATUS status; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* check the object type */ if (obj->Type != ACPI_TYPE_STRING) { @@ -540,7 +540,7 @@ ACPI_STATUS status; int cur; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* * Sweep the list forwards turning things on. @@ -620,7 +620,7 @@ { struct acpi_powerresource *rp; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); TAILQ_FOREACH(rp, &acpi_powerresources, ap_link) if (rp->ap_resource == res) @@ -636,7 +636,7 @@ { struct acpi_powerconsumer *pc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); TAILQ_FOREACH(pc, &acpi_powerconsumers, ac_link) if (pc->ac_consumer == consumer) ==== //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.13 2002/02/23 05:28:22 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.14 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" @@ -65,7 +65,7 @@ ACPI_STATUS status; void *context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* * Special-case some devices that abuse _PRS/_CRS to mean ==== //depot/projects/ia64/sys/dev/acpica/acpi_thermal.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.24 2002/03/04 18:45:46 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.25 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" @@ -172,7 +172,7 @@ int error; char oidname[8]; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_LOCK; @@ -288,7 +288,7 @@ int i; char nbuf[8]; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -380,7 +380,7 @@ struct timespec curtime; ACPI_STATUS status; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -499,7 +499,7 @@ { int i; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -531,7 +531,7 @@ { ACPI_HANDLE cooler; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -571,7 +571,7 @@ ACPI_HANDLE cooler; ACPI_STATUS status; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -613,7 +613,7 @@ acpi_tz_getparam(struct acpi_tz_softc *sc, char *node, int *data) { - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -683,7 +683,7 @@ { struct acpi_tz_softc *sc = (struct acpi_tz_softc *)context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -781,7 +781,7 @@ device_t *devs; int devcount, i; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); devs = NULL; ==== //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.18 2002/04/30 19:34:30 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.19 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" #include <sys/param.h> @@ -147,7 +147,7 @@ char desc[40]; int rid, i, j; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (acpi_disabled("timer")) return_VOID; ==== //depot/projects/ia64/sys/dev/sound/pcm/feeder.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.21 2002/01/26 22:13:24 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.22 2002/05/19 06:31:56 peter Exp $"); MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); @@ -273,9 +273,9 @@ SLIST_FOREACH(fte, &feedertab, link) { if (fte->desc == NULL) - goto no; + continue; if (fte->desc->type != FEEDER_FMT) - goto no; + continue; if (fte->desc->in == source->desc->out) { try = feeder_create(fte->feederclass, fte->desc); if (try) { @@ -286,7 +286,6 @@ feeder_destroy(try); } } -no: } /* printf("giving up %s...\n", source->class->name); */ ==== //depot/projects/ia64/sys/dev/sound/pcm/sound.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.72 2002/04/28 22:59:45 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.73 2002/05/19 06:31:56 peter Exp $"); struct snddev_channel { SLIST_ENTRY(snddev_channel) link; @@ -280,10 +280,9 @@ err = vchan_destroy(c); if (err) device_printf(d->dev, "vchan_destroy(%s) == %d\n", c->name, err); - goto restart; + break; /* restart */ } } -restart: } } } >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205190656.g4J6utc58559>