Date: Mon, 17 Dec 2018 15:13:58 +0000 (UTC) From: Maxim Sobolev <sobomax@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r342165 - in stable/12/stand: common i386/libi386 libsa uboot/lib Message-ID: <201812171513.wBHFDwkq022882@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sobomax Date: Mon Dec 17 15:13:58 2018 New Revision: 342165 URL: https://svnweb.freebsd.org/changeset/base/342165 Log: MFC r341253: panic() should not apply \n. Modified: stable/12/stand/common/interp_forth.c stable/12/stand/i386/libi386/biosdisk.c stable/12/stand/libsa/arp.c stable/12/stand/libsa/assert.c stable/12/stand/libsa/bzipfs.c stable/12/stand/libsa/netif.c stable/12/stand/libsa/sbrk.c stable/12/stand/uboot/lib/copy.c stable/12/stand/uboot/lib/net.c Directory Properties: stable/12/ (props changed) Modified: stable/12/stand/common/interp_forth.c ============================================================================== --- stable/12/stand/common/interp_forth.c Mon Dec 17 10:43:23 2018 (r342164) +++ stable/12/stand/common/interp_forth.c Mon Dec 17 15:13:58 2018 (r342165) @@ -144,7 +144,7 @@ bf_command(FICL_VM *vm) printf("%s\n", command_errmsg); break; case CMD_FATAL: - panic("%s\n", command_errmsg); + panic("%s", command_errmsg); } free(line); Modified: stable/12/stand/i386/libi386/biosdisk.c ============================================================================== --- stable/12/stand/i386/libi386/biosdisk.c Mon Dec 17 10:43:23 2018 (r342164) +++ stable/12/stand/i386/libi386/biosdisk.c Mon Dec 17 15:13:58 2018 (r342165) @@ -646,7 +646,7 @@ bd_realstrategy(void *devdata, int rw, daddr_t dblk, s } if (V86_IO_BUFFER_SIZE / BD(dev).bd_sectorsize == 0) - panic("BUG: Real mode buffer is too small\n"); + panic("BUG: Real mode buffer is too small"); bbuf = PTOV(V86_IO_BUFFER); rest = size; Modified: stable/12/stand/libsa/arp.c ============================================================================== --- stable/12/stand/libsa/arp.c Mon Dec 17 10:43:23 2018 (r342164) +++ stable/12/stand/libsa/arp.c Mon Dec 17 15:13:58 2018 (r342165) @@ -120,7 +120,7 @@ arpwhohas(struct iodesc *d, struct in_addr addr) arpsend, &wbuf.data, sizeof(wbuf.data), arprecv, &pkt, (void **)&ah, NULL); if (i == -1) { - panic("arp: no response for %s\n", + panic("arp: no response for %s", inet_ntoa(addr)); } Modified: stable/12/stand/libsa/assert.c ============================================================================== --- stable/12/stand/libsa/assert.c Mon Dec 17 10:43:23 2018 (r342164) +++ stable/12/stand/libsa/assert.c Mon Dec 17 15:13:58 2018 (r342165) @@ -35,10 +35,10 @@ void __assert(const char *func, const char *file, int line, const char *expression) { if (func == NULL) - panic("Assertion failed: (%s), file %s, line %d.\n", + panic("Assertion failed: (%s), file %s, line %d.", expression, file, line); else panic( - "Assertion failed: (%s), function %s, file %s, line %d.\n", + "Assertion failed: (%s), function %s, file %s, line %d.", expression, func, file, line); } Modified: stable/12/stand/libsa/bzipfs.c ============================================================================== --- stable/12/stand/libsa/bzipfs.c Mon Dec 17 10:43:23 2018 (r342164) +++ stable/12/stand/libsa/bzipfs.c Mon Dec 17 15:13:58 2018 (r342165) @@ -360,7 +360,7 @@ bzf_stat(struct open_file *f, struct stat *sb) void bz_internal_error(int errorcode) { - panic("bzipfs: critical error %d in bzip2 library occured\n", errorcode); + panic("bzipfs: critical error %d in bzip2 library occured", errorcode); } #ifdef REGRESSION Modified: stable/12/stand/libsa/netif.c ============================================================================== --- stable/12/stand/libsa/netif.c Mon Dec 17 10:43:23 2018 (r342164) +++ stable/12/stand/libsa/netif.c Mon Dec 17 15:13:58 2018 (r342165) @@ -182,7 +182,7 @@ netif_attach(struct netif *nif, struct iodesc *desc, v desc->io_netif = nif; #ifdef PARANOID if (drv->netif_init == NULL) - panic("%s%d: no netif_init support\n", drv->netif_bname, + panic("%s%d: no netif_init support", drv->netif_bname, nif->nif_unit); #endif drv->netif_init(desc, machdep_hint); @@ -201,7 +201,7 @@ netif_detach(struct netif *nif) #endif #ifdef PARANOID if (drv->netif_end == NULL) - panic("%s%d: no netif_end support\n", drv->netif_bname, + panic("%s%d: no netif_end support", drv->netif_bname, nif->nif_unit); #endif drv->netif_end(nif); @@ -222,7 +222,7 @@ netif_get(struct iodesc *desc, void **pkt, time_t timo #endif #ifdef PARANOID if (drv->netif_get == NULL) - panic("%s%d: no netif_get support\n", drv->netif_bname, + panic("%s%d: no netif_get support", drv->netif_bname, nif->nif_unit); #endif rv = drv->netif_get(desc, pkt, timo); @@ -249,7 +249,7 @@ netif_put(struct iodesc *desc, void *pkt, size_t len) #endif #ifdef PARANOID if (drv->netif_put == NULL) - panic("%s%d: no netif_put support\n", drv->netif_bname, + panic("%s%d: no netif_put support", drv->netif_bname, nif->nif_unit); #endif rv = drv->netif_put(desc, pkt, len); Modified: stable/12/stand/libsa/sbrk.c ============================================================================== --- stable/12/stand/libsa/sbrk.c Mon Dec 17 10:43:23 2018 (r342164) +++ stable/12/stand/libsa/sbrk.c Mon Dec 17 15:13:58 2018 (r342165) @@ -53,7 +53,7 @@ sbrk(int incr) char *ret; if (heapbase == 0) - panic("No heap setup\n"); + panic("No heap setup"); if ((heapsize + incr) <= maxheap) { ret = (char *)heapbase + heapsize; Modified: stable/12/stand/uboot/lib/copy.c ============================================================================== --- stable/12/stand/uboot/lib/copy.c Mon Dec 17 10:43:23 2018 (r342164) +++ stable/12/stand/uboot/lib/copy.c Mon Dec 17 15:13:58 2018 (r342165) @@ -133,7 +133,7 @@ uboot_loadaddr(u_int type, void *data, uint64_t addr) } } if (biggest_size == 0) - panic("Not enough DRAM to load kernel\n"); + panic("Not enough DRAM to load kernel"); #if 0 printf("Loading kernel into region 0x%08jx-0x%08jx (%ju MiB)\n", (uintmax_t)biggest_block, Modified: stable/12/stand/uboot/lib/net.c ============================================================================== --- stable/12/stand/uboot/lib/net.c Mon Dec 17 10:43:23 2018 (r342164) +++ stable/12/stand/uboot/lib/net.c Mon Dec 17 15:13:58 2018 (r342165) @@ -324,7 +324,7 @@ net_init(struct iodesc *desc, void *machdep_hint) sc = nif->nif_devdata = &uboot_softc; if ((err = ub_dev_open(sc->sc_handle)) != 0) - panic("%s%d: initialisation failed with error %d\n", + panic("%s%d: initialisation failed with error %d", nif->nif_driver->netif_bname, nif->nif_unit, err); /* Get MAC address */ @@ -359,6 +359,6 @@ net_end(struct netif *nif) int err; if ((err = ub_dev_close(sc->sc_handle)) != 0) - panic("%s%d: net_end failed with error %d\n", + panic("%s%d: net_end failed with error %d", nif->nif_driver->netif_bname, nif->nif_unit, err); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812171513.wBHFDwkq022882>