#ifndef _h_config
#define _h_config
-/****************** System dependant compilation flags ****************/
+/****************** System dependent compilation flags ****************/
/*
* POSIX This system supports IEEE Std 1003.1-1988 (POSIX).
*/
return (fd);
}
-unsigned int max_clients = 10; /* Default, can be overriden on cmdline. */
+unsigned int max_clients = 10; /* Default, can be overridden on cmdline. */
unsigned int num_clients;
list<client_t> clients;
extern char *cdevname; /* name of device being checked */
extern long dev_bsize; /* computed value of DEV_BSIZE */
extern long secsize; /* actual disk sector size */
-extern u_int real_dev_bsize; /* actual disk sector size, not overriden */
+extern u_int real_dev_bsize; /* actual disk sector size, not overridden */
extern char nflag; /* assume a no response */
extern char yflag; /* assume a yes response */
extern int bkgrdflag; /* use a snapshot to run on an active system */
char *cdevname; /* name of device being checked */
long dev_bsize; /* computed value of DEV_BSIZE */
long secsize; /* actual disk sector size */
-u_int real_dev_bsize; /* actual disk sector size, not overriden */
+u_int real_dev_bsize; /* actual disk sector size, not overridden */
char nflag; /* assume a no response */
char yflag; /* assume a yes response */
int bkgrdflag; /* use a snapshot to run on an active system */
}
}
- /* Set some defaults to preserve compability */
+ /* Set some defaults to preserve compatibility. */
if (xi.algoname[0] == '\0' && xi.type == 0)
xi.type = IPFW_TABLE_ADDR;
if (xi.vmask == 0)
tentry_fill_key(oh, ptent, *av, add, &type, &vmask, &xi);
/*
- * compability layer: auto-create table if not exists
+ * Compatibility layer: auto-create table if not exists.
*/
if (xi.tablename[0] == '\0') {
xi.type = type;
vmask = xi->vmask;
} else {
/*
- * we're running `ipfw -n`
- * Compability layer: try to guess key type
+ * We're running `ipfw -n`
+ * Compatibility layer: try to guess key type
* before failing.
*/
if (guess_key_type(key, &type) != 0) {
oh->ntlv.name);
/*
* Table does not exist
- * Compability layer: try to guess key type before failing.
+ * Compatibility layer: try to guess key type before failing.
*/
if (guess_key_type(key, &type) != 0) {
/* Inknown key */
/*
* Create divert sockets. Use only one socket if -p was specified
* on command line. Otherwise, create separate sockets for
- * outgoing and incoming connnections.
+ * outgoing and incoming connections.
*/
if (mip->inOutPort) {
print_summary(void)
{
- printf("filesystem created succesfully\n");
+ printf("filesystem was created successfully\n");
printf("total segments: %#jx valid segments: %#jx\n", nsegments,
nsegments - bad_segments_count);
printf("total space: %ju MB free: %ju MB\n",
/*
* below are the functions that deal with creating the lists
- * from the filename's given and the dependancies and provisions
+ * from the filename's given dependencies and provisions
* in each of these files. no ordering or checking is done here.
*/
*
* NOTE: do_file() is called recursively from several places and cannot
* safely free() anything related to items that may be recursed on.
- * Circular dependancies will cause problems if we do.
+ * Circular dependencies will cause problems if we do.
*/
static void
do_file(filenode *fnode)
/* If both the month and date are specified as numbers */
if (isonlydigits(p1, 1) && isonlydigits(p2, 0)) {
- /* Now who wants to be this ambigious? :-( */
+ /* Now who wants to be this ambiguous? :-( */
int m, d;
if (strchr(p2, '*') != NULL)
strcpy(__collate_version, COLLATE_VERSION1_2);
if (fwrite(__collate_version, sizeof(__collate_version), 1, fp) != 1)
err(EX_IOERR,
- "IO error writting collate version to destination file %s",
+ "I/O error writing collate version to destination file %s",
out_file);
u32 = htonl(chain_index);
if (fwrite(&u32, sizeof(u32), 1, fp) != 1)
err(EX_IOERR,
- "IO error writting chains number to destination file %s",
+ "I/O error writing chains number to destination file %s",
out_file);
if (fwrite(__collate_substitute_table,
sizeof(__collate_substitute_table), 1, fp) != 1)
err(EX_IOERR,
- "IO error writting substitute table to destination file %s",
+ "I/O error writing substitution table to destination file %s",
out_file);
for (ch = 0; ch < UCHAR_MAX + 1; ch++) {
__collate_char_pri_table[ch].prim =
if (fwrite(__collate_char_pri_table,
sizeof(__collate_char_pri_table), 1, fp) != 1)
err(EX_IOERR,
- "IO error writting char table to destination file %s",
+ "I/O error writing char table to destination file %s",
out_file);
for (ch = 0; ch < chain_index; ch++) {
__collate_chain_pri_table[ch].prim =
sizeof(*__collate_chain_pri_table), chain_index, fp) !=
(size_t)chain_index)
err(EX_IOERR,
- "IO error writting chain table to destination file %s",
+ "I/O error writing chain table to destination file %s",
out_file);
if (fclose(fp) != 0)
- err(EX_IOERR, "IO error closing destination file %s",
+ err(EX_IOERR, "I/O error closing destination file %s",
out_file);
exit(EX_OK);
}
uint32_t bytes_written;
/**
- * Writes a C string directly to the ouput as-is. This is mainly used
+ * Writes a C string directly to the output as-is. This is mainly used
* for writing directives.
*/
void write_string(const char *c);
utility understands a substantial amount about the syntax of C, but it
has a `forgiving' parser.
It attempts to cope with the usual sorts of
-incomplete and misformed syntax.
+incomplete and malformed syntax.
In particular, the use of macros like:
.Pp
.Dl #define forever for(;;)
&& strcmp(lang, vval)) {
/*
* Appropriate environment variable set, its value
- * is valid and not overriden by LC_ALL
+ * is valid and not overridden by LC_ALL
*
* XXX: possible side effect: if both LANG and
- * overriden environment variable are set into same
+ * overridden environment variable are set into same
* value, then it'll be assumed as 'implied'
*/
printf("%s=%s\n", lcinfo[i].name, vval);
.Fl a
and
.Fl -alternative
-flags are ignored for compability.
+flags are ignored for compatibility.
.Sh SEE ALSO
.Xr grep 1 ,
.Xr sort 1
.Dl % mkimg -s mbr -b /boot/mbr -p freebsd:-'mkimg -s bsd -b /boot/boot \
-p freebsd-ufs:=root-file-system.ufs -p freebsd-swap::1G' -o mbr-bsd.img
.Pp
-To accomodate the need to have partitions named or numbered in a certain
+To accommodate the need to have partitions named or numbered in a certain
way, the
.Nm
utility allows for the specification of empty partitions.
break;
case 'p':
if (param_name != NULL) {
- warnx("Only one paramter name may be "
+ warnx("Only one parameter name may be "
"specified");
retval = 1;
goto bailout;
break;
case 's':
if (param_value != NULL) {
- warnx("Only one paramter value may be "
+ warnx("Only one parameter value may be "
"specified");
retval = 1;
goto bailout;
LINENUM fillcnt; /* #lines of missing ptrn or repl */
LINENUM fillsrc; /* index of first line to copy */
LINENUM filldst; /* index of first missing line */
- bool ptrn_spaces_eaten; /* ptrn was slightly misformed */
+ bool ptrn_spaces_eaten; /* ptrn was slightly malformed */
bool repl_could_be_missing; /* no + or ! lines in this hunk */
bool repl_missing; /* we are now backtracking */
off_t repl_backtrack_position; /* file pos of first repl line */
{
static char *place = emsg; /* option letter processing */
char *oli; /* option letter list index */
- static int delim; /* which option delimeter */
+ static int delim; /* which option delimiter */
char *p;
static char savec = '\0';
}
/*
- * Get a delimited string. P points to the delimeter of the string; d points
+ * Get a delimited string. P points to the delimiter of the string; d points
* to a buffer area. Newline and delimiter escapes are processed; other
* escapes are ignored.
*
htons(xinpcb->local_port));
break;
default:
- errx(1, "adress family %d not supported",
+ errx(1, "address family %d not supported",
xladdr->address.sa.sa_family);
}
laddr->next = NULL;
htons(xstcb->local_port));
break;
default:
- errx(1, "adress family %d not supported",
+ errx(1, "address family %d not supported",
xladdr->address.sa.sa_family);
}
laddr->next = NULL;
htons(xstcb->remote_port));
break;
default:
- errx(1, "adress family %d not supported",
+ errx(1, "address family %d not supported",
xraddr->address.sa.sa_family);
}
faddr->next = NULL;
/*
- * The following routine recognises an irregular expresion
+ * The following routine recognises an irregular expression
* with the following special characters:
*
* \? - means last match was optional
/*
* The PCI standard only allows 4 and 8 byte accesses to the MSI-X
- * table but we also allow 1 byte access to accomodate reads from
+ * table but we also allow 1 byte access to accommodate reads from
* ddb.
*/
if (size != 1 && size != 4 && size != 8)
# determine if we can use more than one column to display commands.
#
local x=$longest_cmd ncols=1
- x=$(( $x + 8 )) # Accomodate leading tab character
+ x=$(( $x + 8 )) # Accommodate leading tab character
x=$(( $x + 3 + $longest_cmd )) # Preload end of next column
while [ $x -lt $max_width ]; do
ncols=$(( $ncols + 1 ))
int f_type; /* type */
u_char f_flags; /* see below */
char *f_compilewith; /* special make rule if present */
- char *f_depends; /* additional dependancies */
+ char *f_depends; /* additional dependencies */
char *f_clean; /* File list to add to clean rule */
char *f_warn; /* warning message */
const char *f_objprefix; /* prefix string for object name */
}
/*
- * Go through the new portals, opening the sockets as neccessary.
+ * Go through the new portals, opening the sockets as necessary.
*/
TAILQ_FOREACH(newpg, &newconf->conf_portal_groups, pg_next) {
if (newpg->pg_foreign)
2) 1.5 < R < 3 Mbps: db0/db1 or db2/db3 or db4/db5 or db6/db7 is payload,
3) 3 < R < 6 Mbps: db0/db1/db2/db3 or db4/db5/db6/db7 is payload,
4) R > 6 Mbps: all db0..db7 contain the payload.
-Curently, only case (4) is supported in fwmpegts.c
+Currently, only case (4) is supported in fwmpegts.c
Each packet may contain N MPEG TS data blocks with timestamp header,
which are (4+188)B long. Experimentally, the N ranges from 0 through 3.
if (j->timeout.tv_sec == 0)
requeue(j, &sleeping);
else {
- /* File the jail in the sleep queue acording to its timeout. */
+ /* File the jail in the sleep queue according to its timeout. */
TAILQ_REMOVE(j->queue, j, tq);
TAILQ_FOREACH(tj, &sleeping, tq) {
if (!tj->timeout.tv_sec ||
#define DF_SEEN 0x01 /* Dependency has been followed */
#define DF_LIGHT 0x02 /* Implied dependency on jail existence only */
-#define DF_NOFAIL 0x04 /* Don't propigate failed jails */
+#define DF_NOFAIL 0x04 /* Don't propagate failed jails */
#define PF_VAR 0x01 /* This is a variable, not a true parameter */
#define PF_APPEND 0x02 /* Append to existing parameter list */
/*
* Parameters have a name and an optional list of value strings,
- * which may have "+=" or "=" preceeding them.
+ * which may have "+=" or "=" preceding them.
*/
param : name
{
putchar('\n');
}
- /* Fetch the jail(s) and print the paramters. */
+ /* Fetch the jail(s) and print the parameters. */
if (jid != 0 || jname != NULL) {
if (print_jail(pflags, jflags) < 0)
errx(1, "%s", jail_errmsg);
/*
- * Allocate and initalize a cd9660node
+ * Allocate and initialize a cd9660node
* @returns struct cd9660node * Pointer to new node, or NULL on error
*/
static cd9660node *
argument for the commands below takes the form of a number from 0 to the total
configurations found.
.It Cm foreign clear Op config
-Clear the specifed foreign
+Clear the specified foreign
.Ar config
or all if no
.Ar config
argument is provided.
.It Cm foreign diag Op config
-Display a diagnostic display of the specifed foreign
+Display a diagnostic display of the specified foreign
.Ar config
or all if no
.Ar config
argument is provided.
.It Cm foreign preview Op config
-Preview the specifed foreign
+Preview the specified foreign
.Ar config
after import or all if no
.Ar config
argument is provided.
.It Cm foreign import Op config
-Import the specifed foreign
+Import the specified foreign
.Ar config
or all if no
.Ar config
.El
.It Ic log
Prints activity log of the specified controller to stdout; if
-controller number is not specifed, logs for all available
+controller number is not specified, logs for all available
controllers are printed.
.It Ic stats
Print statistics of the selected controller, chip and page.
if (gargc >= 4) {
if (strcmp(gargv[2], "--loglevel") == 0 || strcmp(gargv[2],
"-l") == 0) {
- /* Set loglevel (ctrl:chip pair independant) */
+ /* Set loglevel (ctrl:chip pair independent) */
mods.field = SIM_MOD_LOG_LEVEL;
if (convert_arguint(gargv[3], &mods.new_value) != 0)
/*
* ECC layout have to end up with 0xffff, so
* we're filling buffer with 0xff. If ecc_layout is
- * defined in config file, values will be overriden.
+ * defined in config file, values will be overridden.
*/
memset((void *)&ctrl_conf.ecc_layout, 0xff,
sizeof(ctrl_conf.ecc_layout));
/*
* Bad block map have to end up with 0xffff, so
* we're filling array with 0xff. If bad block map is
- * defined in config file, values will be overriden.
+ * defined in config file, values will be overridden.
*/
memset((void *)&chip_conf.bad_block_map, 0xff,
sizeof(chip_conf.bad_block_map));
printf("%-*.*s %-*.*s %*.*s", addrwidth, addrwidth, host_buf,
llwidth, llwidth, ether_str(sdl), ifwidth, ifwidth, ifname);
- /* Print neighbor discovery specific informations */
+ /* Print neighbor discovery specific information */
nbi = getnbrinfo(&sin->sin6_addr, sdl->sdl_index, 1);
if (nbi) {
if (nbi->expire > now.tv_sec) {
/*
* Compute the pause between consecutive signals. Use a longer
* sleep time if we will be sending two signals to the same
- * deamon or process-group.
+ * daemon or process-group.
*/
secs = 0;
nextsig = SLIST_NEXT(swork, sw_nextp);
* val OP val <or>
* val OP ( <recursively>
* d) A final optional step (not implemented yet) would be
- * to insert the mathimatical precedence paran's. For
+ * to insert the mathematical precedence paran's. For
* the start we will just do the left to right evaluation and
* then later we can add this guy to add paran's to make it
* mathimatically correct... i.e instead of 1 + 2 * 3 we
ncpaddr_ntoa(&srcaddr), sport, dstip, dport);
}
return 1;
- } /* Explict match. Deny this packet */
+ } /* Explicit match. Deny this packet */
}
} else {
n++;
.Dq default
can be used for
.Ar dest
-to sepcify the default route, and
+to specify the default route, and
.Dq 0.0.0.0
is understood to be the same as
.Dq default
.Dq default
can be used for
.Ar dest
-to sepcify the default route, and
+to specify the default route, and
.Dq ::
is understood to be the same as
.Dq default
int active; /* interface status */
int probeinterval; /* interval of probe timer (if necessary) */
int probetimer; /* rest of probe timer */
- int mediareqok; /* wheter the IF supports SIOCGIFMEDIA */
+ int mediareqok; /* whether the IF supports SIOCGIFMEDIA */
int otherconfig; /* need a separate protocol for the "other"
* configuration */
int state;
"a = FORMAT:HEX,BITSTRING:00\n"
/*
* Well, there should be some other struct here, "SPCLink", but it doesn't
- * appear to be neccessary for UEFI, and I have no idea how to synthesize it,
+ * appear to be necessary for UEFI, and I have no idea how to synthesize it,
* as it uses the CHOICE type.
*/
"\n"
* Note that most software does not care about the checksum at all; perhaps
* we could just set it to 0 instead.
*
- * XXX: Endianess?
+ * XXX: Endianness?
*/
static uint32_t
compute_checksum(const struct executable *x)
if (flock(yplockfd, LOCK_EX|LOCK_NB) == -1 && errno == EWOULDBLOCK)
errx(1, "another ypbind is already running. Aborting");
- /* XXX domainname will be overriden if we use restricted mode */
+ /* XXX domainname will be overridden if we use restricted mode */
yp_get_default_domain(&domain_name);
if (domain_name[0] == '\0')
errx(1, "domainname not set. Aborting");
for MAP in ${YPMAPLIST}
do
- echo "Transfering ${MAP}..."
+ echo "Transferring ${MAP}..."
if ! ${YPXFR} -p ${YP_DIR} -h ${MASTER} -c -d ${DOMAIN} ${MAP}; then
echo "Can't transfer map ${MAP}." 1>&2
ERROR_EXISTS="YES"
projects / people / julieng / freebsd.git / commitdiff