Remove a bunch of unnecessary semicolons.
authorSascha Wildner <saw@online.de>
Wed, 15 Jan 2014 10:19:20 +0000 (11:19 +0100)
committerSascha Wildner <saw@online.de>
Wed, 15 Jan 2014 10:19:20 +0000 (11:19 +0100)
57 files changed:
games/larn/io.c
lib/libc/net/getservent.c
lib/libc/rpc/clnt_bcast.c
lib/libc/rpc/clnt_generic.c
lib/libfetch/http.c
lib/libncp/ncpl_subr.c
lib/libtacplus/taclib.c
sbin/dump/optr.c
sbin/mount_nfs/mount_nfs.c
sbin/mountd/mountd.c
sbin/nfsd/nfsd.c
sbin/umount/umount.c
sys/bus/u4b/net/if_mos.c
sys/dev/agp/agp_ali.c
sys/dev/agp/agp_amd.c
sys/dev/agp/agp_amd64.c
sys/dev/agp/agp_ati.c
sys/dev/agp/agp_intel.c
sys/dev/agp/agp_sis.c
sys/dev/agp/agp_via.c
sys/dev/atm/en/midway.c
sys/dev/disk/fd/fd.c
sys/dev/disk/ncr/ncr.c
sys/dev/disk/sym/sym_hipd.c
sys/dev/drm/radeon/radeon_bios.c
sys/dev/netif/ath/ath/if_ath.c
sys/dev/netif/ath/ath_hal/ar5416/ar5416_radar.c
sys/dev/netif/ix/ixgbe_common.c
sys/dev/netif/oce/oce_mbox.c
sys/dev/sound/pci/atiixp.c
sys/dev/usbmisc/ubsa/ubsa.c
sys/dev/usbmisc/urio/urio.c
sys/dev/video/bktr/bktr_core.c
sys/dev/video/bktr/bktr_os.c
sys/netgraph/pppoe/ng_pppoe.c
sys/netgraph7/deflate/ng_deflate.c
sys/netgraph7/netflow/ng_netflow.c
sys/netgraph7/netgraph/ng_base.c
sys/netgraph7/ng_ipfw.c
sys/netgraph7/ng_nat.c
sys/netgraph7/ng_pred1.c
sys/netinet/sctputil.c
sys/netproto/ncp/ncp_ncp.c
sys/netproto/smb/smb_subr.c
sys/vfs/nfs/nfs_bio.c
sys/vfs/nfs/nfs_serv.c
sys/vfs/nfs/nfs_socket.c
sys/vfs/nfs/nfs_srvcache.c
sys/vfs/nfs/nfs_subs.c
sys/vfs/nfs/nfs_syscalls.c
sys/vfs/nfs/nfsm_subs.c
sys/vfs/nwfs/nwfs_io.c
sys/vfs/nwfs/nwfs_vnops.c
sys/vfs/smbfs/smbfs_io.c
sys/vfs/smbfs/smbfs_vnops.c
usr.bin/tip/tip/cmds.c
usr.sbin/sysvipcd/shmd.c

index f068e00..55e587b 100644 (file)
@@ -282,7 +282,6 @@ lprintf(const char *fmt, ...)
                                cont = 0;
                                break;
                        }
-               ;
                fmt++;
        }
        va_end(ap);
index c171875..6599be3 100644 (file)
@@ -277,7 +277,7 @@ files_servent(void *retval, void *mdata, va_list ap)
                break;
        default:
                return NS_NOTFOUND;
-       };
+       }
 
        serv = va_arg(ap, struct servent *);
        buffer  = va_arg(ap, char *);
@@ -445,7 +445,7 @@ files_setservent(void *retval __unused, void *mdata, va_list ap)
                break;
        default:
                break;
-       };
+       }
 
        st->compat_mode_active = 0;
        return (NS_UNAVAIL);
@@ -502,7 +502,7 @@ nis_servent(void *retval, void *mdata, va_list ap)
                break;
        default:
                return NS_NOTFOUND;
-       };
+       }
 
        serv = va_arg(ap, struct servent *);
        buffer  = va_arg(ap, char *);
@@ -589,7 +589,7 @@ nis_servent(void *retval, void *mdata, va_list ap)
                                }
                        }
                        break;
-               };
+               }
 
                /* we need a room for additional \n symbol */
                if (bufsize <=
@@ -654,7 +654,7 @@ nis_setservent(void *result __unused, void *mdata, va_list ap __unused)
                break;
        default:
                break;
-       };
+       }
 
        return (NS_UNAVAIL);
 }
index ae34043..b3cbf3d 100644 (file)
@@ -459,7 +459,7 @@ rpc_broadcast_exp(
                                                      "broadcast packet");
                                                stat = RPC_CANTSEND;
                                                continue;
-                                       };
+                                       }
 #ifdef RPC_DEBUG
                                if (!__rpc_lowvers)
                                        fprintf(stderr, "Broadcast packet sent "
index d8b2996..cb208fd 100644 (file)
@@ -48,7 +48,6 @@
  * @(#)clnt_generic.c  1.40    99/04/21 SMI
  * $NetBSD: clnt_generic.c,v 1.18 2000/07/06 03:10:34 christos Exp $
  * $FreeBSD: src/lib/libc/rpc/clnt_generic.c,v 1.15 2004/10/16 06:11:34 obrien Exp $
- * $DragonFly: src/lib/libc/rpc/clnt_generic.c,v 1.4 2005/01/31 22:29:38 dillon Exp $
  */
 
 /*
@@ -416,7 +415,7 @@ clnt_tli_create(int fd, const struct netconfig *nconf,
        if (madefd) {
                CLNT_CONTROL(cl, CLSET_FD_CLOSE, NULL);
 /*             CLNT_CONTROL(cl, CLSET_POP_TIMOD, NULL);  */
-       };
+       }
 
        return (cl);
 
index 4ba912e..c564337 100644 (file)
@@ -1124,7 +1124,7 @@ CvtHex(IN HASH Bin, OUT HASHHEX Hex)
                Hex[i*2] = hexchars[j];
                j = Bin[i] & 0xf;
                Hex[i*2+1] = hexchars[j];
-       };
+       }
        Hex[HASHHEXLEN] = '\0';
 };
 
@@ -1159,7 +1159,7 @@ DigestCalcHA1(
                MD5Update(&Md5Ctx, ":", 1);
                MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce));
                MD5Final(HA1, &Md5Ctx);
-       };
+       }
        CvtHex(HA1, SessionKey);
 }
 
@@ -1193,7 +1193,7 @@ DigestCalcResponse(
        if (strcasecmp(pszQop, "auth-int") == 0) {
                MD5Update(&Md5Ctx, ":", 1);
                MD5Update(&Md5Ctx, HEntity, HASHHEXLEN);
-       };
+       }
        MD5Final(HA2, &Md5Ctx);
        CvtHex(HA2, HA2Hex);
 
@@ -1210,7 +1210,7 @@ DigestCalcResponse(
                MD5Update(&Md5Ctx, ":", 1);
                MD5Update(&Md5Ctx, pszQop, strlen(pszQop));
                MD5Update(&Md5Ctx, ":", 1);
-       };
+       }
        MD5Update(&Md5Ctx, HA2Hex, HASHHEXLEN);
        MD5Final(RespHash, &Md5Ctx);
        CvtHex(RespHash, Response);
index 0aa095d..c81cf2f 100644 (file)
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libncp/ncpl_subr.c,v 1.3 2000/01/01 14:21:31 bp Exp $
- * $DragonFly: src/lib/libncp/ncpl_subr.c,v 1.5 2008/09/30 16:57:05 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -362,7 +361,7 @@ ncp_args_parserc(struct ncp_args *na, char *sect, ncp_setopt_t *set_callback) {
                                        return EINVAL;
                                }
                                set_callback(na);
-                       };
+                       }
                        break;
                    default:
                        break;
index 600a601..cf18dd5 100644 (file)
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  *     $FreeBSD: src/lib/libtacplus/taclib.c,v 1.2.2.2 2002/10/09 08:50:42 pst Exp $
- *     $DragonFly: src/lib/libtacplus/taclib.c,v 1.3 2004/08/19 21:25:58 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -171,7 +170,7 @@ protocol_version(int msg_type, int var, int type)
                default:
                    minor = 0;
                break;
-           };
+           }
        break;
 
        case TAC_AUTHOR:
@@ -918,7 +917,7 @@ tac_config(struct tac_handle *h, const char *path)
                                retval = -1;
                                break;
                        }
-               };
+               }
 
                if (tac_add_server(h, host, port, secret, timeout,
                    options) == -1) {
index f7d50fb..3fba340 100644 (file)
@@ -28,7 +28,6 @@
  *
  * @(#)optr.c  8.2 (Berkeley) 1/6/94
  * $FreeBSD: src/sbin/dump/optr.c,v 1.9.2.5 2002/02/23 22:32:51 iedowse Exp $
- * $DragonFly: src/sbin/dump/optr.c,v 1.10 2005/08/28 04:35:12 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -385,7 +384,7 @@ lastdump(int arg)
                    dumpme = tnow > (dtwalk->dd_ddate - (tlast->tm_hour * 3600)
                                     - (tlast->tm_min * 60) - tlast->tm_sec
                                     + (dt->fs_freq * 86400));
-               };
+               }
                if (arg != 'w' || dumpme)
                        printf(
                            "%c %8s\t(%6s) Last dump: Level %c, Date %s\n",
index 404e337..05ab140 100644 (file)
@@ -1042,7 +1042,7 @@ xdr_fh(XDR *xdrsp, struct nfhret *np)
                if (!authfnd && (authcnt > 0 || np->auth != RPCAUTH_UNIX))
                        np->stat = EAUTH;
                return (1);
-       };
+       }
        return (0);
 }
 
index 2295edb..50c23d6 100644 (file)
@@ -301,7 +301,7 @@ main(int argc, char **argv)
                        break;
                default:
                        usage();
-               };
+               }
        argc -= optind;
        argv += optind;
        grphead = NULL;
@@ -731,7 +731,7 @@ xdr_fhs(XDR *xdrsp, caddr_t cp)
                if (!xdr_long(xdrsp, &len))
                        return (0);
                return (xdr_long(xdrsp, &auth));
-       };
+       }
        return (0);
 }
 
@@ -1434,7 +1434,7 @@ chk_host(struct dirlist *dp, struct sockaddr *saddr, int *defsetp,
                                        return (1);
                                }
                            break;
-                       };
+                       }
                        hp = hp->ht_next;
                }
        }
@@ -1783,7 +1783,7 @@ do_mount(struct exportlist *ep, struct grouplist *grp, int exflags,
                        if (cp)
                                *cp = savedc;
                        return (1);
-               };
+               }
 
                /*
                 * XXX:
index 5b70ab8..c01b8ff 100644 (file)
@@ -178,7 +178,7 @@ main(int argc, char **argv)
                default:
                case '?':
                        usage();
-               };
+               }
        if (!tcpflag && !udpflag)
                udpflag = 1;
        argv += optind;
index ee6cdab..bb13d08 100644 (file)
@@ -336,7 +336,7 @@ checkname(char *name, char **typelist)
                                if (mntfromname == NULL && mntonname == NULL) {
                                        strcpy(name, origname);
                                        if (umountfs(NULL, origname,
-                                           none) == 0) {;
+                                           none) == 0) {
                                                warnx("%s not found in "
                                                    "mount table, "
                                                    "unmounted it anyway",
index 7e1c826..a6512bc 100644 (file)
@@ -603,7 +603,7 @@ mos_setmulti(struct usb_ether *ue)
                if (ifma->ifma_addr->sa_family != AF_LINK) {
                        allmulti = 1;
                        continue;
-               };
+               }
                h = ether_crc32_be(LLADDR((struct sockaddr_dl *)
                    ifma->ifma_addr), ETHER_ADDR_LEN) >> 26;
                hashtbl[h / 8] |= 1 << (h % 8);
index a1ab36a..7a18869 100644 (file)
@@ -65,7 +65,7 @@ agp_ali_match(device_t dev)
                return ("Ali M1541 host to AGP bridge");
        case 0x162110b9:
                return ("Ali M1621 host to AGP bridge");
-       };
+       }
 
        return NULL;
 }
index 6afe985..84ebb32 100644 (file)
@@ -167,7 +167,7 @@ agp_amd_match(device_t dev)
                return ("AMD 761 host to AGP bridge");
        case 0x700c1022:
                return ("AMD 762 host to AGP bridge");
-       };
+       }
 
        return NULL;
 }
index b9e798d..3d19e64 100644 (file)
@@ -109,7 +109,7 @@ agp_amd64_match(device_t dev)
                return ("VIA K8T800Pro host to PCI bridge");
        case 0x31881106:
                return ("VIA 8385 host to PCI bridge");
-       };
+       }
 
        return (NULL);
 }
index 027de15..cb57dcd 100644 (file)
@@ -95,7 +95,7 @@ agp_ati_match(device_t dev)
                return ("ATI RS300_166 AGP bridge");
        case 0x58331002:
                return ("ATI RS300_200 AGP bridge");
-       };
+       }
 
        return NULL;
 }
@@ -196,7 +196,7 @@ agp_ati_attach(device_t dev)
        default:
                /* Unknown chipset */
                return EINVAL;
-       };
+       }
 
        rid = ATI_GART_MMADDR;
        sc->regs = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
index 39b6906..d39ed9e 100644 (file)
@@ -101,7 +101,7 @@ agp_intel_match(device_t dev)
                return ("Intel 82845G host to AGP bridge");
        case 0x35808086:
                return ("Intel 82855GM host to AGP bridge");
-       };
+       }
 
        return (NULL);
 }
index 04b2ab4..2221642 100644 (file)
@@ -97,7 +97,7 @@ agp_sis_match(device_t dev)
                return ("SiS 745 host to AGP bridge");
        case 0x07461039:
                return ("SiS 746 host to AGP bridge");
-       };
+       }
 
        return NULL;
 }
index eb58581..4a8ee16 100644 (file)
@@ -131,7 +131,7 @@ agp_via_match(device_t dev)
                return ("VIA PT880 host to PCI bridge");
        case 0xb1981106:
                return ("VIA VT83xx/VT87xx/KTxxx/Px8xx host to PCI bridge");
-       };
+       }
 
        return NULL;
 }
index 3bf5c4f..b0401ad 100644 (file)
@@ -2444,7 +2444,7 @@ en_intr(void *arg)
        m_freem(m);
       }
       EN_WRAPADD(0, MID_DTQ_N, idx, 1);
-    };
+    }
     sc->dtq_chip = MID_DTQ_REG2A(val); /* sync softc */
   }
 
@@ -2526,7 +2526,7 @@ en_intr(void *arg)
 
       }
       EN_WRAPADD(0, MID_DRQ_N, idx, 1);
-    };
+    }
     sc->drq_chip = MID_DRQ_REG2A(val); /* sync softc */
 
     if (sc->need_drqs) {       /* true if we had a DRQ shortage */
@@ -2578,7 +2578,7 @@ en_intr(void *arg)
       kprintf("%s: added VCI %d to swslist\n", sc->sc_dev.dv_xname, vci);
 #endif
       }
-    };
+    }
   }
 
   /*
index ed785c3..69003dc 100644 (file)
@@ -1469,7 +1469,7 @@ fdstrategy(struct dev_strategy_args *ap)
                bp->b_error = ENXIO;
                bp->b_flags |= B_ERROR;
                goto bad;
-       };
+       }
 
        fdblk = 128 << (fd->ft.secsize);
        if (bp->b_cmd != BUF_CMD_FORMAT) {
@@ -1624,7 +1624,7 @@ static int fdcpio(fdc_p fdc, buf_cmd_t cmd, caddr_t addr, u_int count)
                if (fdc->state != PIOREAD) {
                        fdc->state = PIOREAD;
                        return(0);
-               };
+               }
                SET_BCDR(fdc, 0, count, 0);
                bus_space_read_multi_1(fdc->portt, fdc->porth, fdc->port_off +
                    FDC_YE_DATAPORT, cptr, count);
@@ -1632,7 +1632,7 @@ static int fdcpio(fdc_p fdc, buf_cmd_t cmd, caddr_t addr, u_int count)
                bus_space_write_multi_1(fdc->portt, fdc->porth, fdc->port_off +
                    FDC_YE_DATAPORT, cptr, count);
                SET_BCDR(fdc, 0, count, 0);
-       };
+       }
        return(1);
 }
 
@@ -1960,7 +1960,7 @@ fdstate(fdc_p fdc)
                                callout_reset(&fd->tohandle, hz,
                                                fd_iotimeout, fdc);
                                return(0);      /* will return later */
-                       };
+                       }
 
                /*
                 * write (or format) operation will fall through and
index c76cfb4..94728f7 100644 (file)
@@ -2933,7 +2933,7 @@ void ncr_script_fill (struct script * scr, struct scripth * scrh)
                *p++ =RADDR (dsa);
                *p++ =SCR_CALL;
                *p++ =PADDR (trysel);
-       };
+       }
        *p++ =SCR_JUMP;
        *p++ =PADDRH(tryloop);
 
@@ -2954,7 +2954,7 @@ void ncr_script_fill (struct script * scr, struct scripth * scrh)
                *p++ =PADDR (checkatn);
                *p++ =SCR_MOVE_TBL ^ SCR_DATA_IN;
                *p++ =offsetof (struct dsb, data[i]);
-       };
+       }
 
        *p++ =SCR_CALL;
        *p++ =PADDR (checkatn);
@@ -2978,7 +2978,7 @@ void ncr_script_fill (struct script * scr, struct scripth * scrh)
                *p++ =PADDR (dispatch);
                *p++ =SCR_MOVE_TBL ^ SCR_DATA_OUT;
                *p++ =offsetof (struct dsb, data[i]);
-       };
+       }
 
        *p++ =SCR_CALL;
        *p++ =PADDR (dispatch);
@@ -3024,7 +3024,7 @@ static void ncr_script_copy_and_bind (ncb_p np, ncrcmd *src, ncrcmd *dst, int le
                        kprintf ("%s: ERROR0 IN SCRIPT at %d.\n",
                                ncr_name(np), (int) (src-start-1));
                        DELAY (1000000);
-               };
+               }
 
                if (DEBUG_FLAGS & DEBUG_SCRIPT)
                        kprintf ("%p:  <%x>\n",
@@ -3088,7 +3088,7 @@ static void ncr_script_copy_and_bind (ncb_p np, ncrcmd *src, ncrcmd *dst, int le
                default:
                        relocs = 0;
                        break;
-               };
+               }
 
                if (relocs) {
                        while (relocs--) {
@@ -3136,7 +3136,7 @@ static void ncr_script_copy_and_bind (ncb_p np, ncrcmd *src, ncrcmd *dst, int le
                        offset += 4;
                }
 
-       };
+       }
 }
 
 /*==========================================================
@@ -3646,7 +3646,7 @@ ncr_attach (device_t dev)
                        usrsync = np->maxsync;
                if (usrsync < np->minsync)
                        usrsync = np->minsync;
-       };
+       }
 
        usrwide = (SCSI_NCR_MAX_WIDE);
        if (usrwide > np->maxwide) usrwide=np->maxwide;
@@ -3751,7 +3751,7 @@ ncr_attach (device_t dev)
        if (ncr_snooptest (np)) {
                kprintf ("CACHE INCORRECTLY CONFIGURED.\n");
                return EINVAL;
-       };
+       }
 
        /*
        **      Install the interrupt handler.
@@ -3837,7 +3837,7 @@ ncr_intr(void *vnp)
                } while (INB(nc_istat) & (INTF|SIP|DIP));
 
                np->ticks = 100;
-       };
+       }
 
        if (DEBUG_FLAGS & DEBUG_TINY) kprintf ("]\n");
 
@@ -3907,7 +3907,7 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
                        xpt_done(ccb);
                        crit_exit();
                        return;
-               };
+               }
                
                cp->ccb = ccb;
                
@@ -3938,8 +3938,8 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
                                    != tp->tinfo.goal.offset)) {
                                tp->nego_cp = cp;
                                nego = NS_SYNC;
-                       };
-               };
+                       }
+               }
 
                /*---------------------------------------------------
                **
@@ -3965,11 +3965,11 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
                                if (DEBUG_FLAGS & DEBUG_TAGS) {
                                        PRINT_ADDR(ccb);
                                        kprintf ("using tag #%d.\n", cp->tag);
-                               };
-                       };
+                               }
+                       }
                } else {
                        cp->tag=0;
-               };
+               }
 
                /*----------------------------------------------------
                **
@@ -4016,7 +4016,7 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
                                kprintf (".\n");
                        };
                        break;
-               };
+               }
 
                /*----------------------------------------------------
                **
@@ -4481,7 +4481,7 @@ ncr_complete (ncb_p np, nccb_p cp)
                */
                tp->tinfo.goal.period = 0;
                tp->tinfo.goal.offset = 0;
-       };
+       }
 
        /*
        **      Check for extended errors.
@@ -4499,10 +4499,10 @@ ncr_complete (ncb_p np, nccb_p cp)
                default:
                        kprintf ("extended error %d.\n", cp->xerr_status);
                        break;
-               };
+               }
                if (cp->host_status==HS_COMPLETE)
                        cp->host_status = HS_FAIL;
-       };
+       }
 
        /*
        **      Check the status.
@@ -4625,9 +4625,9 @@ ncr_wakeup (ncb_p np, u_long code)
                default:
                        ncr_complete (np, cp);
                        break;
-               };
+               }
                cp = cp -> link_nccb;
-       };
+       }
 }
 
 static void
@@ -5004,7 +5004,7 @@ ncr_setsync(ncb_p np, nccb_p cp, u_char scntl3, u_char sxfer, u_char period)
                if (cp->ccb->ccb_h.target_id != target) continue;
                cp->sync_status = sxfer;
                cp->wide_status = scntl3;
-       };
+       }
 }
 
 /*==========================================================
@@ -5083,7 +5083,7 @@ static void ncr_setwide (ncb_p np, nccb_p cp, u_char wide, u_char ack)
                if (cp->ccb->ccb_h.target_id != target) continue;
                cp->sync_status = sxfer;
                cp->wide_status = scntl3;
-       };
+       }
 }
 
 /*==========================================================
@@ -5140,7 +5140,7 @@ ncr_timeout (void *arg)
                        **      Let's try to wake it up.
                        */
                        OUTB (nc_istat, SIGP);
-               };
+               }
 
                /*----------------------------------------------------
                **
@@ -5168,7 +5168,7 @@ ncr_timeout (void *arg)
                                        ncr_name (np), cp);
                                cp->phys.header.launch.l_paddr
                                = NCB_SCRIPT_PHYS (np, skip);
-                       };
+                       }
 
                        switch (cp->host_status) {
 
@@ -5177,14 +5177,14 @@ ncr_timeout (void *arg)
                                /* fall through */
                        case HS_DISCONNECT:
                                cp->host_status=HS_TIMEOUT;
-                       };
+                       }
                        cp->tag = 0;
 
                        /*
                        **      wakeup this nccb.
                        */
                        ncr_complete (np, cp);
-               };
+               }
                crit_exit();
        }
 
@@ -5201,7 +5201,7 @@ ncr_timeout (void *arg)
                ncr_exception (np);
                if (DEBUG_FLAGS & DEBUG_TINY) kprintf ("}");
                crit_exit();
-       };
+       }
 }
 
 /*==========================================================
@@ -5305,7 +5305,7 @@ void ncr_exception (ncb_p np)
                OUTB (nc_istat, INTF);
                np->profile.num_fly++;
                ncr_wakeup (np, 0);
-       };
+       }
        if (!(istat & (SIP|DIP))) {
                return;
        }
@@ -5341,7 +5341,7 @@ void ncr_exception (ncb_p np)
        if (sist & RST) {
                ncr_init (np, bootverbose ? "scsi reset" : NULL, HS_RESET);
                return;
-       };
+       }
 
        /*-------------------------------------------
        **      selection timeout
@@ -5356,7 +5356,7 @@ void ncr_exception (ncb_p np)
                !(dstat & (MDPE|BF|ABRT|SIR))) {
                ncr_int_sto (np);
                return;
-       };
+       }
 
        /*-------------------------------------------
        **      Phase mismatch.
@@ -5368,7 +5368,7 @@ void ncr_exception (ncb_p np)
                !(dstat & (MDPE|BF|ABRT|SIR|IID))) {
                ncr_int_ma (np, dstat);
                return;
-       };
+       }
 
        /*----------------------------------------
        **      move command with length 0
@@ -5385,7 +5385,7 @@ void ncr_exception (ncb_p np)
                */
                OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, no_data));
                return;
-       };
+       }
 
        /*-------------------------------------------
        **      Programmed interrupt
@@ -5398,7 +5398,7 @@ void ncr_exception (ncb_p np)
                (INB(nc_dsps) <= SIR_MAX)) {
                ncr_int_sir (np);
                return;
-       };
+       }
 
        /*========================================
        **      log message for real hard errors
@@ -5419,7 +5419,7 @@ void ncr_exception (ncb_p np)
                        ((volatile char*)&np->regdump)[i] = INB_OFF(i);
                np->regdump.nc_dstat = dstat;
                np->regdump.nc_sist  = sist;
-       };
+       }
 
 
        /*----------------------------------------
@@ -5463,7 +5463,7 @@ void ncr_exception (ncb_p np)
                OUTB (nc_scr0, HS_UNEXPECTED);
                OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, cleanup));
                return;
-       };
+       }
 
        /*----------------------------------------
        **      cannot disconnect
@@ -5489,7 +5489,7 @@ void ncr_exception (ncb_p np)
                        kprintf ("%s: INFO: LDSC while IID.\n",
                                ncr_name (np));
                        return;
-               };
+               }
                kprintf ("%s: target %d doesn't release the bus.\n",
                        ncr_name (np), INB (nc_sdid)&0x0f);
                /*
@@ -5497,7 +5497,7 @@ void ncr_exception (ncb_p np)
                **      timeout will do the real work.
                */
                return;
-       };
+       }
 
        /*----------------------------------------
        **      single step
@@ -5509,7 +5509,7 @@ void ncr_exception (ncb_p np)
                !(dstat & (MDPE|BF|ABRT|SIR|IID))) {
                OUTB (nc_dcntl, np->rv_dcntl | STD);
                return;
-       };
+       }
 
 /*
 **     @RECOVER@ HTH, SGE, ABRT.
@@ -5543,11 +5543,11 @@ void ncr_exception (ncb_p np)
                        case 12:
                                kprintf (" ");
                                break;
-                       };
+                       }
                        val = bus_space_read_1(np->bst, np->bsh, i);
                        kprintf (" %x%x", val/16, val%16);
                        if (i%16==15) kprintf (".\n");
-               };
+               }
 
                callout_stop(&np->timeout_ch);
 
@@ -5557,7 +5557,7 @@ void ncr_exception (ncb_p np)
                */
                OUTB (nc_istat,  SRST);
                return;
-       };
+       }
 
 #ifdef NCR_FREEZE
        /*
@@ -5609,7 +5609,7 @@ void ncr_int_sto (ncb_p np)
        if (cp) {
                cp-> host_status = HS_SEL_TIMEOUT;
                ncr_complete (np, cp);
-       };
+       }
 
        /*
        **      repair start queue
@@ -5624,7 +5624,7 @@ void ncr_int_sto (ncb_p np)
                WRITESCRIPT(startpos[0], scratcha);
                OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, start));
                return;
-       };
+       }
        ncr_init (np, "selection timeout", HS_FAIL);
 }
 
@@ -5687,7 +5687,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
        if (INB(nc_scntl3) & EWS) {
                if (ss2 & OLF1) rest++;
                if (ss2 & ORF1) rest++;
-       };
+       }
        OUTB (nc_ctest3, np->rv_ctest3 | CLF);  /* clear dma fifo  */
        OUTB (nc_stest3, TE|CSF);               /* clear scsi fifo */
 
@@ -5733,7 +5733,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
                vdsp_base = np->scripth;
                vdsp_off = dsp - np->p_scripth - 8;
                nxtdsp = dsp;
-       };
+       }
 
        /*
        **      log the information
@@ -5742,13 +5742,13 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
                kprintf ("P%x%x ",cmd&7, sbcl&7);
                kprintf ("RL=%d D=%d SS0=%x ",
                        (unsigned) rest, (unsigned) delta, ss0);
-       };
+       }
        if (DEBUG_FLAGS & DEBUG_PHASE) {
                kprintf ("\nCP=%p CP2=%p DSP=%x NXT=%x VDSP=%p CMD=%x ",
                        cp, np->header.cp,
                        dsp,
                        nxtdsp, (volatile char*)vdsp_base+vdsp_off, cmd);
-       };
+       }
 
        /*
        **      get old startaddress and old length.
@@ -5763,7 +5763,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
        } else {
                tblp = NULL;
                olen = READSCRIPT_OFF(vdsp_base, vdsp_off) & 0xffffff;
-       };
+       }
 
        if (DEBUG_FLAGS & DEBUG_PHASE) {
                kprintf ("OCMD=%x\nTBLP=%p OLEN=%lx OADR=%lx\n",
@@ -5771,7 +5771,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
                        (void *) tblp,
                        (u_long) olen,
                        (u_long) oadr);
-       };
+       }
 
        /*
        **      if old phase not dataphase, leave here.
@@ -5793,7 +5793,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
 
                OUTB (nc_dcntl, np->rv_dcntl | STD);
                return;
-       };
+       }
 
        /*
        **      choose the correct patch area.
@@ -5850,12 +5850,12 @@ static int ncr_show_msg (u_char * msg)
                for (i=1;i<8;i++) {
                        if (i-1>msg[1]) break;
                        kprintf ("-%x",msg[i]);
-               };
+               }
                return (i+1);
        } else if ((*msg & 0xf0) == 0x20) {
                kprintf ("-%x",msg[1]);
                return (2);
-       };
+       }
        return (1);
 }
 
@@ -5924,7 +5924,7 @@ void ncr_int_sir (ncb_p np)
                                break;
                        if (DEBUG_FLAGS & DEBUG_RESTART) kprintf ("- (remove)");
                        tp->hold_cp = cp = (nccb_p) 0;
-               };
+               }
 
                if (cp) {
                        if (DEBUG_FLAGS & DEBUG_RESTART)
@@ -5932,7 +5932,7 @@ void ncr_int_sir (ncb_p np)
                        OUTL (nc_dsa, CCB_PHYS (cp, phys));
                        OUTL (nc_dsp, NCB_SCRIPTH_PHYS (np, getcc));
                        return;
-               };
+               }
 
                /*
                **      no job, resume normal processing
@@ -6052,7 +6052,7 @@ void ncr_int_sir (ncb_p np)
                        PRINT_ADDR(cp->ccb);
                        kprintf ("negotiation failed sir=%x status=%x.\n",
                                num, cp->nego_status);
-               };
+               }
 
                /*
                **      any error in negotiation:
@@ -6068,7 +6068,7 @@ void ncr_int_sir (ncb_p np)
                        ncr_setwide (np, cp, 0, 0);
                        break;
 
-               };
+               }
                np->msgin [0] = MSG_NOOP;
                np->msgout[0] = MSG_NOOP;
                cp->nego_status = 0;
@@ -6085,7 +6085,7 @@ void ncr_int_sir (ncb_p np)
                        kprintf ("sync msgin: ");
                        (void) ncr_show_msg (np->msgin);
                        kprintf (".\n");
-               };
+               }
 
                /*
                **      get requested values.
@@ -6151,14 +6151,14 @@ void ncr_int_sir (ncb_p np)
                                        */
                                        ncr_setsync (np,cp,scntl3,(fak<<5)|ofs, per);
                                        OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, clrack));
-                               };
+                               }
                                return;
 
                        case NS_WIDE:
                                ncr_setwide (np, cp, 0, 0);
                                break;
-                       };
-               };
+                       }
+               }
 
                /*
                **      It was a request. Set value and
@@ -6199,7 +6199,7 @@ void ncr_int_sir (ncb_p np)
                        kprintf ("wide msgin: ");
                        (void) ncr_show_msg (np->msgin);
                        kprintf (".\n");
-               };
+               }
 
                /*
                **      get requested values.
@@ -6240,14 +6240,14 @@ void ncr_int_sir (ncb_p np)
                                        */
                                        ncr_setwide (np, cp, wide, 1);
                                        OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, clrack));
-                               };
+                               }
                                return;
 
                        case NS_SYNC:
                                ncr_setsync (np, cp, 0, 0xe0, 0);
                                break;
-                       };
-               };
+                       }
+               }
 
                /*
                **      It was a request, set value and
@@ -6389,7 +6389,7 @@ void ncr_int_sir (ncb_p np)
                        */
                        OUTL (nc_dsp, NCB_SCRIPT_PHYS (np, reselect));
                        return;
-               };
+               }
 
                /*
                **      else remove the interrupt.
@@ -6398,7 +6398,7 @@ void ncr_int_sir (ncb_p np)
                kprintf ("%s: queue empty.\n", ncr_name (np));
                WRITESCRIPT(start1[0], SCR_INT ^ IFFALSE (0));
                break;
-       };
+       }
 
 out:
        OUTB (nc_dcntl, np->rv_dcntl | STD);
@@ -6694,7 +6694,7 @@ static    int     ncr_scatter
                        csize   -= size;
                        datalen -= size;
                        paddr    = vtophys (vaddr);
-               };
+               }
 
                if(DEBUG_FLAGS & DEBUG_SCATTER)
                        kprintf ("\tseg #%d  addr=%x  size=%d  (rest=%d).\n",
@@ -6712,7 +6712,7 @@ static    int     ncr_scatter
                kprintf("ncr?: scatter/gather failed (residue=%d).\n",
                        (unsigned) datalen);
                return (-1);
-       };
+       }
 
        return (segment);
 }
@@ -6748,7 +6748,7 @@ static int ncr_regtest (struct ncb* np)
                kprintf ("CACHE TEST FAILED: reg dstat-sstat2 readback %x.\n",
                        (unsigned) data);
                return (0x10);
-       };
+       }
        return (0);
 }
 #endif
@@ -6804,7 +6804,7 @@ static int ncr_snooptest (struct ncb* np)
        if (i>=NCR_SNOOP_TIMEOUT) {
                kprintf ("CACHE TEST FAILED: timeout.\n");
                return (0x20);
-       };
+       }
        /*
        **      Check termination position.
        */
@@ -6814,7 +6814,7 @@ static int ncr_snooptest (struct ncb* np)
                        (u_long) NCB_SCRIPTH_PHYS (np, snooptest), (u_long) pc,
                        (u_long) NCB_SCRIPTH_PHYS (np, snoopend) +8);
                return (0x40);
-       };
+       }
        /*
        **      Show results.
        */
@@ -6822,17 +6822,17 @@ static int ncr_snooptest (struct ncb* np)
                kprintf ("CACHE TEST FAILED: host wrote %d, ncr read %d.\n",
                        (int) host_wr, (int) ncr_rd);
                err |= 1;
-       };
+       }
        if (host_rd != ncr_wr) {
                kprintf ("CACHE TEST FAILED: ncr wrote %d, host read %d.\n",
                        (int) ncr_wr, (int) host_rd);
                err |= 2;
-       };
+       }
        if (ncr_bk != ncr_wr) {
                kprintf ("CACHE TEST FAILED: ncr wrote %d, read back %d.\n",
                        (int) ncr_wr, (int) ncr_bk);
                err |= 4;
-       };
+       }
        return (err);
 }
 
index 6c2925c..3d64e89 100644 (file)
@@ -2045,7 +2045,7 @@ static void sym_fw_bind_script (hcb_p np, u32 *start, int len)
                        MDELAY (10000);
                        ++cur;
                        continue;
-               };
+               }
 
                /*
                 *  We use the bogus value 0xf00ff00f ;-)
@@ -2134,7 +2134,7 @@ static void sym_fw_bind_script (hcb_p np, u32 *start, int len)
                default:
                        relocs = 0;
                        break;
-               };
+               }
 
                /*
                 *  Scriptify:) the opcode.
@@ -2190,7 +2190,7 @@ static void sym_fw_bind_script (hcb_p np, u32 *start, int len)
 
                        *cur++ = cpu_to_scr(new);
                }
-       };
+       }
 }
 
 /*---------------------------------------------------------------------------*/
@@ -2898,7 +2898,7 @@ static int sym_prepare_nego(hcb_p np, ccb_p cp, int nego, u_char *msgptr)
                msgptr[msglen++] = tp->tinfo.goal.width;
                msgptr[msglen++] = tp->tinfo.goal.options & PPR_OPT_DT;
                break;
-       };
+       }
 
        cp->nego_status = nego;
 
@@ -2908,8 +2908,8 @@ static int sym_prepare_nego(hcb_p np, ccb_p cp, int nego, u_char *msgptr)
                        sym_print_msg(cp, nego == NS_SYNC ? "sync msgout" :
                                          nego == NS_WIDE ? "wide msgout" :
                                          "ppr msgout", msgptr);
-               };
-       };
+               }
+       }
 
        return msglen;
 }
@@ -3861,7 +3861,7 @@ static void sym_intr1 (hcb_p np)
                istat = INB (nc_istat);         /* DUMMY READ */
                if (DEBUG_FLAGS & DEBUG_TINY) kprintf ("F ");
                (void)sym_wakeup_done (np);
-       };
+       }
 
        if (!(istat & (SIP|DIP)))
                return;
@@ -3926,7 +3926,7 @@ static void sym_intr1 (hcb_p np)
                else if (dstat & SSI)   OUTONB_STD ();
                else                    goto unknown_int;
                return;
-       };
+       }
 
        /*
         *  Now, interrupts that donnot happen in normal
@@ -3944,7 +3944,7 @@ static void sym_intr1 (hcb_p np)
                kprintf("SCSI BUS reset detected.\n");
                sym_init (np, 1);
                return;
-       };
+       }
 
        OUTB (nc_ctest3, np->rv_ctest3 | CLF);  /* clear dma fifo  */
        OUTB (nc_stest3, TE|CSF);               /* clear scsi fifo */
@@ -3956,7 +3956,7 @@ static void sym_intr1 (hcb_p np)
                else if (sist & UDC)    sym_int_udc (np);
                else                    goto unknown_int;
                return;
-       };
+       }
 
        /*
         *  Now, interrupts we are not able to recover cleanly.
@@ -3971,7 +3971,7 @@ static void sym_intr1 (hcb_p np)
                (dstat & (MDPE|BF|ABRT|IID))) {
                sym_start_reset(np);
                return;
-       };
+       }
 
 unknown_int:
        /*
@@ -4309,7 +4309,7 @@ static void sym_int_ma (hcb_p np)
                        if (ss2 & OLF1) rest++;
                        if (!(np->features & FE_C10))
                                if (ss2 & ORF1) rest++;
-               };
+               }
 
                /*
                 *  Clear fifos.
@@ -4348,7 +4348,7 @@ static void sym_int_ma (hcb_p np)
        if (DEBUG_FLAGS & DEBUG_PHASE) {
                kprintf ("\nCP=%p DSP=%x NXT=%x VDSP=%p CMD=%x ",
                        cp, (unsigned)dsp, (unsigned)nxtdsp, vdsp, cmd);
-       };
+       }
 
        if (!vdsp) {
                kprintf ("%s: interrupted SCRIPT address not found.\n",
@@ -4374,7 +4374,7 @@ static void sym_int_ma (hcb_p np)
        } else {
                tblp = NULL;
                olen = scr_to_cpu(vdsp[0]) & 0xffffff;
-       };
+       }
 
        if (DEBUG_FLAGS & DEBUG_PHASE) {
                kprintf ("OCMD=%x\nTBLP=%p OLEN=%x OADR=%x\n",
@@ -4382,7 +4382,7 @@ static void sym_int_ma (hcb_p np)
                        tblp,
                        (unsigned) olen,
                        (unsigned) oadr);
-       };
+       }
 
        /*
         *  check cmd against assumed interrupted script command.
@@ -4395,7 +4395,7 @@ static void sym_int_ma (hcb_p np)
                        (unsigned)cmd, (unsigned)scr_to_cpu(vdsp[0]) >> 24);
 
                goto reset_all;
-       };
+       }
 
        /*
         *  if old phase not dataphase, leave here.
@@ -4406,7 +4406,7 @@ static void sym_int_ma (hcb_p np)
                        cmd&7, INB(nc_sbcl)&7, (unsigned)olen,
                        (unsigned)oadr, (unsigned)rest);
                goto unexpected_phase;
-       };
+       }
 
        /*
         *  Choose the correct PM save area.
@@ -5580,12 +5580,12 @@ static int sym_show_msg (u_char * msg)
                for (i=1;i<8;i++) {
                        if (i-1>msg[1]) break;
                        kprintf ("-%x",msg[i]);
-               };
+               }
                return (i+1);
        } else if ((*msg & 0xf0) == 0x20) {
                kprintf ("-%x",msg[1]);
                return (2);
-       };
+       }
        return (1);
 }
 
@@ -5646,7 +5646,7 @@ static void sym_sync_nego(hcb_p np, tcb_p tp, ccb_p cp)
         */
        if (DEBUG_FLAGS & DEBUG_NEGO) {
                sym_print_msg(cp, "sync msgin", np->msgin);
-       };
+       }
 
        /*
         * request or answer ?
@@ -5747,7 +5747,7 @@ static void sym_ppr_nego(hcb_p np, tcb_p tp, ccb_p cp)
         */
        if (DEBUG_FLAGS & DEBUG_NEGO) {
                sym_print_msg(cp, "ppr msgin", np->msgin);
-       };
+       }
 
        /*
         *  get requested values.
@@ -5886,7 +5886,7 @@ static void sym_wide_nego(hcb_p np, tcb_p tp, ccb_p cp)
         */
        if (DEBUG_FLAGS & DEBUG_NEGO) {
                sym_print_msg(cp, "wide msgin", np->msgin);
-       };
+       }
 
        /*
         * Is it a request from the device?
@@ -5951,7 +5951,7 @@ static void sym_wide_nego(hcb_p np, tcb_p tp, ccb_p cp)
 
                OUTL_DSP (SCRIPTA_BA (np, clrack));
                return;
-       };
+       }
 
        /*
         *  It was a request, set value and
@@ -6011,7 +6011,7 @@ static void sym_nego_default(hcb_p np, tcb_p tp, ccb_p cp)
        case NS_WIDE:
                sym_setwide (np, cp, 0);
                break;
-       };
+       }
        np->msgin [0] = M_NOOP;
        np->msgout[0] = M_NOOP;
        cp->nego_status = 0;
@@ -6276,7 +6276,7 @@ static void sym_int_sir (hcb_p np)
        case SIR_NEGO_PROTO:
                sym_nego_default(np, tp, cp);
                goto out;
-       };
+       }
 
 out:
        OUTONB_STD ();
@@ -6778,7 +6778,7 @@ static int sym_regtest (hcb_p np)
                kprintf ("CACHE TEST FAILED: reg dstat-sstat2 readback %x.\n",
                        (unsigned) data);
                return (0x10);
-       };
+       }
        return (0);
 }
 #endif
@@ -6822,7 +6822,7 @@ restart_test:
        if (i>=SYM_SNOOP_TIMEOUT) {
                kprintf ("CACHE TEST FAILED: timeout.\n");
                return (0x20);
-       };
+       }
        /*
         *  Check for fatal DMA errors.
         */
@@ -6860,7 +6860,7 @@ restart_test:
                        (u_long) SCRIPTB0_BA (np, snooptest), (u_long) pc,
                        (u_long) SCRIPTB0_BA (np, snoopend) +8);
                return (0x40);
-       };
+       }
        /*
         *  Show results.
         */
@@ -6868,17 +6868,17 @@ restart_test:
                kprintf ("CACHE TEST FAILED: host wrote %d, chip read %d.\n",
                        (int) host_wr, (int) sym_rd);
                err |= 1;
-       };
+       }
        if (host_rd != sym_wr) {
                kprintf ("CACHE TEST FAILED: chip wrote %d, host read %d.\n",
                        (int) sym_wr, (int) host_rd);
                err |= 2;
-       };
+       }
        if (sym_bk != sym_wr) {
                kprintf ("CACHE TEST FAILED: chip wrote %d, read back %d.\n",
                        (int) sym_wr, (int) sym_bk);
                err |= 4;
-       };
+       }
 
        return (err);
 }
@@ -8859,7 +8859,7 @@ sym_pci_attach(device_t dev)
        if (sym_snooptest (np)) {
                device_printf(dev, "CACHE INCORRECTLY CONFIGURED.\n");
                goto attach_failed;
-       };
+       }
 
        /*
         *  Now deal with CAM.
index 5800d15..b405e34 100644 (file)
@@ -663,7 +663,7 @@ static bool radeon_acpi_vfct_bios(struct radeon_device *rdev)
            vhdr->DeviceID != rdev->ddev->pci_device) {
                DRM_INFO("ACPI VFCT table is not for this card\n");
                goto out_unmap;
-       };
+       }
 
        if (vfct->VBIOSImageOffset + sizeof(VFCT_IMAGE_HEADER) + vhdr->ImageLength > tbl_size) {
                DRM_ERROR("ACPI VFCT image truncated\n");
index 6333f83..92c72d6 100644 (file)
@@ -820,7 +820,6 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
                            | IEEE80211_HTCAP_MAXAMSDU_3839
                                                        /* max A-MSDU length */
                            | IEEE80211_HTCAP_SMPS_OFF; /* SM power save off */
-                       ;
 
                /*
                 * Enable short-GI for HT20 only if the hardware
index edac235..9759b74 100644 (file)
@@ -365,7 +365,7 @@ ar5416ProcessRadarEvent(struct ath_hal *ah, struct ath_rx_status *rxs,
                        /* Cannot use ctrl channel RSSI if ext channel is stronger */
                        if (ext_rssi >= (rssi + 3)) {
                                rssi = 0;
-                       };
+                       }
                        break;
                case EXT_CH_RADAR_FOUND:
                        /* Radar in extended channel */
index 1734345..bd1f5bf 100644 (file)
@@ -1903,7 +1903,7 @@ static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw)
 
                usec_delay(5);
                ixgbe_standby_eeprom(hw);
-       };
+       }
 
        /*
         * On some parts, SPI write time could vary from 0-20mSec on 3.3V
@@ -1989,7 +1989,7 @@ static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data,
                 * EEPROM
                 */
                mask = mask >> 1;
-       };
+       }
 
        /* We leave the "DI" bit set to "0" when we leave this routine. */
        eec &= ~IXGBE_EEC_DI;
index 7af9a77..1738dec 100644 (file)
@@ -2127,7 +2127,7 @@ oce_get_func_config(POCE_SOFTC sc)
                        sc->nrssqs = MIN(sc->nrssqs, max_rss);
                else
                        sc->nrssqs = max_rss;
-               sc->nrqs =  sc->nrssqs + 1; /* 1 for def RX */;
+               sc->nrqs =  sc->nrssqs + 1; /* 1 for def RX */
        }
 error:
        oce_dma_free(sc, &dma);
index be88d72..a418cfb 100644 (file)
@@ -244,7 +244,7 @@ atiixp_reset_aclink(struct atiixp_info *sc)
 
                /* have to wait at least 10 usec for it to initialise */
                DELAY(20);
-       };
+       }
 
        /* perform a soft reset */
        value  = atiixp_rd(sc, ATI_REG_CMD);
@@ -285,7 +285,7 @@ atiixp_reset_aclink(struct atiixp_info *sc)
 
                /* check if its active now */
                value = atiixp_rd(sc, ATI_REG_CMD);
-       };
+       }
 
        if (timeout == 0)
                device_printf(sc->dev, "giving up aclink reset\n");
index 3724eaf..917d56f 100644 (file)
@@ -504,7 +504,7 @@ ubsa_baudrate(struct ubsa_softc *sc, speed_t speed)
                              "baudrate, forcing default of 9600\n");
                value = B230400 / B9600;
                break;
-       };
+       }
 
        if (speed == B0) {
                ubsa_flow(sc, 0, 0);
index 2e8b0e8..616572a 100644 (file)
@@ -262,7 +262,7 @@ urioopen(struct dev_open_args *ap)
        {
                        sc->sc_pipeh_in = 0;
                        return EIO;
-       };
+       }
        if (usbd_open_pipe(sc->sc_iface,
                sc->sc_epaddr[RIO_OUT], 0, &sc->sc_pipeh_out)
                        != USBD_NORMAL_COMPLETION)
@@ -271,7 +271,7 @@ urioopen(struct dev_open_args *ap)
                        sc->sc_pipeh_in = 0;
                        sc->sc_pipeh_out = 0;
                        return EIO;
-       };
+       }
        return 0;
 }
 
index 00136f7..b11020a 100644 (file)
@@ -482,7 +482,7 @@ bktr_store_address(unit, BKTR_MEM_BUF,          buf);
                        bktr->id = BROOKTREE_879;
                        break;
                }
-       };
+       }
 
        bktr->clr_on_start = FALSE;
 
index a3e6b63..79c5e8c 100644 (file)
@@ -208,7 +208,7 @@ bktr_probe( device_t dev )
                        device_set_desc(dev, "BrookTree 879");
                        return BUS_PROBE_DEFAULT;
                }
-       };
+       }
 
         return ENXIO;
 }
index d633fd8..d3ed66f 100644 (file)
@@ -1312,7 +1312,7 @@ AAA
                        code = wh->ph.code; 
                        if ( code != PADI_CODE) {
                                LEAVE(EINVAL);
-                       };
+                       }
                        callout_stop(&neg->timeout_ch);
 
                        /*
index f40064b..1492f73 100644 (file)
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netgraph/ng_deflate.c,v 1.3 2007/01/15 05:55:56 glebius Exp $
- * $DragonFly: src/sys/netgraph7/ng_deflate.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  */
 
 /*
@@ -510,7 +509,7 @@ ng_deflate_compress(node_p node, struct mbuf *m, struct mbuf **resultp)
                if (*resultp == NULL) {
                        priv->stats.Errors++;
                        return (ENOMEM);
-               };
+               }
                priv->stats.FramesComp++;
                priv->stats.OutOctets+=outlen;
        }
@@ -629,7 +628,7 @@ ng_deflate_decompress(node_p node, struct mbuf *m, struct mbuf **resultp)
                        priv->stats.Errors++;
                        priv->seqnum = 0;
                        return (ENOMEM);
-               };
+               }
                priv->stats.FramesPlain++;
                priv->stats.OutOctets+=outlen;
 
index 141d929..7c1207d 100644 (file)
@@ -454,7 +454,7 @@ ng_netflow_rcvdata (hook_p hook, item_p item)
                 */
                log(LOG_ERR, "ng_netflow: incoming data on export hook!\n");
                ERROUT(EINVAL);
-       };
+       }
 
        if (hook == iface->out) {
                /*
index 336c22b..de193a9 100644 (file)
@@ -1976,7 +1976,7 @@ ng_acquire_read(node_p node, item_p item)
                        return (item);
                }
                cpu_spinwait();
-       };
+       }
 
        /* Queue the request for later. */
        ng_queue_rw(node, item, NGQRW_R);
index 4f2a6d2..08bc768 100644 (file)
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netgraph/ng_ipfw.c,v 1.9 2006/02/14 15:22:24 ru Exp $
- * $DragonFly: src/sys/netgraph7/ng_ipfw.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -108,7 +107,7 @@ ng_ipfw_mod_event(module_t mod, int event, void *data)
                    != 0) {
                        log(LOG_ERR, "%s: can't create ng_ipfw node", __func__);
                        break;
-               };
+               }
 
                /* Try to name node */
                if (ng_name_node(fw_node, "ipfw") != 0)
@@ -230,7 +229,7 @@ ng_ipfw_rcvdata(hook_p hook, item_p item)
            NULL)) == NULL) {
                NG_FREE_M(m);
                return (EINVAL);        /* XXX: find smth better */
-       };
+       }
 
        switch (ngit->dir) {
        case NG_IPFW_OUT:
index e8beec0..f09ece1 100644 (file)
@@ -786,7 +786,7 @@ ng_nat_shutdown(node_p node)
                struct ng_nat_rdr_lst *entry = STAILQ_FIRST(&priv->redirhead);
                STAILQ_REMOVE_HEAD(&priv->redirhead, entries);
                kfree(entry, M_NETGRAPH);
-       };
+       }
 
        /* Final free. */
        LibAliasUninit(priv->lib);
index 83af41f..15ce13b 100644 (file)
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netgraph/ng_pred1.c,v 1.3 2008/01/27 02:04:12 mav Exp $
- * $DragonFly: src/sys/netgraph7/ng_pred1.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  */
 
 /*
@@ -442,7 +441,7 @@ ng_pred1_compress(node_p node, struct mbuf *m, struct mbuf **resultp)
        if (*resultp == NULL) {
            priv->stats.Errors++;
            return (ENOMEM);
-       };
+       }
 
        priv->stats.OutOctets += outlen;
 
@@ -521,7 +520,7 @@ ng_pred1_decompress(node_p node, struct mbuf *m, struct mbuf **resultp)
                if (*resultp == NULL) {
                        priv->stats.Errors++;
                        return (ENOMEM);
-               };
+               }
 
        } else {
                priv->stats.FramesUncomp++;
index d92389d..9ebfd9c 100644 (file)
@@ -1162,7 +1162,7 @@ sctp_timeout_handler(void *t)
                }
 #endif /* SCTP_DEBUG */
                break;
-       };
+       }
 #ifdef SCTP_AUDITING_ENABLED
        sctp_audit_log(0xF1, (u_int8_t)tmr->type);
        sctp_auditing(5, inp, stcb, net);
@@ -1484,7 +1484,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 #endif /* SCTP_DEBUG */
                return (EFAULT);
                break;
-       };
+       }
        if ((to_ticks <= 0) || (tmr == NULL)) {
 #ifdef SCTP_DEBUG
                if (sctp_debug_on & SCTP_DEBUG_TIMER1) {
@@ -1630,7 +1630,7 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
                }
 #endif /* SCTP_DEBUG */
                break;
-       };
+       }
        if (tmr == NULL)
                return (EFAULT);
 
index d4f65fb..2aef79f 100644 (file)
@@ -82,7 +82,7 @@ m_dumpm(struct mbuf *m)
                        kprintf("%02x ",((int)*(p++)) & 0xff);
                }
                m=m->m_next;
-       };
+       }
        kprintf("\n");
 }
 #endif /* NCP_DATA_DEBUG */
index 633cfc8..4585837 100644 (file)
@@ -205,7 +205,7 @@ m_dumpm(struct mbuf *m) {
                        kprintf("%02x ",((int)*(p++)) & 0xff);
                }
                m=m->m_next;
-       };
+       }
        kprintf("\n");
 }
 #endif
index 6fd87f4..8902258 100644 (file)
@@ -389,7 +389,7 @@ nfs_bioread(struct vnode *vp, struct uio *uio, int ioflag)
                kprintf(" nfs_bioread: type %x unexpected\n",vp->v_type);
                n = 0;
                break;
-           };
+           }
 
            switch (vp->v_type) {
            case VREG:
@@ -1127,7 +1127,7 @@ nfs_doio(struct vnode *vp, struct bio *bio, struct thread *td)
            default:
                kprintf("nfs_doio:  type %x unexpected\n",vp->v_type);
                break;
-           };
+           }
            if (error) {
                bp->b_flags |= B_ERROR;
                bp->b_error = error;
index e1be96f..25605f4 100644 (file)
@@ -1693,7 +1693,7 @@ nfsrv_create(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
                        bcopy(cp, cverf, NFSX_V3CREATEVERF);
                        exclusive_flag = 1;
                        break;
-               };
+               }
                vap->va_type = VREG;
        } else {
                NULLOUT(sp = nfsm_dissect(&info, NFSX_V2SATTR));
@@ -1714,7 +1714,7 @@ nfsrv_create(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
                        break;
                default:
                        break;
-               };
+               }
        }
 
        /*
index 79f4239..8a9950f 100644 (file)
@@ -1676,7 +1676,7 @@ nfs_rephead(int siz, struct nfsrv_descript *nd, struct nfssvc_sock *slp,
                                    *tl = 0;
                        }
                        break;
-               };
+               }
        }
 
        if (mrq != NULL)
index a61f3b7..7214d52 100644 (file)
@@ -269,7 +269,7 @@ loop:
                rp->rc_flag |= RC_NAM;
                rp->rc_nam = dup_sockaddr(nd->nd_nam);
                break;
-       };
+       }
        rp->rc_proc = nd->nd_procnum;
        LIST_INSERT_HEAD(NFSRCHASH(nd->nd_retxid), rp, rc_hash);
        rp->rc_flag &= ~RC_LOCKED;
index 1885ce1..06e0b03 100644 (file)
@@ -1304,7 +1304,7 @@ netaddr_match(int family, union nethostaddr *haddr, struct sockaddr *nam)
                break;
        default:
                break;
-       };
+       }
        return (0);
 }
 
index d4b2ce5..6e5263e 100644 (file)
@@ -732,7 +732,7 @@ skip:
                        if (nd->nd_nam2)
                                kfree(nd->nd_nam2, M_SONAME);
                        break;
-                   };
+                   }
                    if (nd) {
                        kfree((caddr_t)nd, M_NFSRVDESC);
                        nd = NULL;
index 62cc890..f7907e4 100644 (file)
@@ -217,7 +217,7 @@ nfsm_rpchead(struct ucred *cr, int nmflag, int procid, int auth_type,
                        info.mb->m_len += siz;
                }
                break;
-       };
+       }
 
        /*
         * And the verifier...
@@ -1003,7 +1003,7 @@ nfsm_srvsattr(nfsm_info_t info, struct vattr *vap)
        case NFSV3SATTRTIME_TOSERVER:
                getnanotime(&vap->va_atime);
                break;
-       };
+       }
        NULLOUT(tl = nfsm_dissect(info, NFSX_UNSIGNED));
        switch (fxdr_unsigned(int, *tl)) {
        case NFSV3SATTRTIME_TOCLIENT:
index 0823b89..e0e1b23 100644 (file)
@@ -302,7 +302,7 @@ nwfs_doio(struct vnode *vp, struct bio *bio, struct ucred *cr, struct thread *td
            default:
                kprintf("nwfs_doio:  type %x unexpected\n",vp->v_type);
                break;
-           };
+           }
            if (error) {
                bp->b_flags |= B_ERROR;
                bp->b_error = error;
index 87a06df..d61bd7d 100644 (file)
@@ -318,7 +318,7 @@ nwfs_setattr(struct vop_setattr_args *ap)
                        break;
                default:
                        return EINVAL;
-               };
+               }
        }
        error = ncp_setattr(vp, vap, ap->a_cred, td);
        if (error && vap->va_size != VNOVAL) {
index 8e93ad1..82a8f33 100644 (file)
@@ -328,7 +328,7 @@ smbfs_doio(struct vnode *vp, struct bio *bio, struct ucred *cr, struct thread *t
            default:
                kprintf("smbfs_doio:  type %x unexpected\n",vp->v_type);
                break;
-           };
+           }
            if (error) {
                bp->b_error = error;
                bp->b_flags |= B_ERROR;
index 56dd40b..4601083 100644 (file)
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.2.2.8 2003/04/04 08:57:23 tjr Exp $
- * $DragonFly: src/sys/vfs/smbfs/smbfs_vnops.c,v 1.41 2007/11/20 21:03:50 dillon Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -326,7 +325,7 @@ smbfs_setattr(struct vop_setattr_args *ap)
                        break;
                    default:
                        return EINVAL;
-               };
+               }
                if (isreadonly)
                        return EROFS;
                doclose = 0;
index af3e334..d924c24 100644 (file)
@@ -1039,7 +1039,7 @@ expand(char *name)
        close(pivec[1]);
        l = read(pivec[0], xname, BUFSIZ);
        close(pivec[0]);
-       while (wait(&s) != pid);
+       while (wait(&s) != pid)
                ;
        s &= 0377;
        if (s != 0 && s != SIGPIPE) {
index b4df982..9bb8c1e 100644 (file)
@@ -142,7 +142,7 @@ create_sysv_file(struct shmget_msg *msg, size_t size,
                        sems->ds.sem_otime = 0;
                        //sems->ds.sem_ctime = time(NULL);
                        //semtot += nsems;
-                       sems->gen = 0;;
+                       sems->gen = 0;
 
                        /* Initialize each sem. */
                        memset(sems->ds.sem_base, 0, nsems + sizeof(struct sem));