Skip to content

Commit b18e870

Browse files
author
H. Peter Anvin
committed
Merge remote-tracking branch 'ElyesH/typos'
2 parents 3516258 + cdf7ad0 commit b18e870

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+175
-175
lines changed

ChangeLog

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Sat Nov 10 21:55:19 2007 -0800 Charles Crayne
8787
Sat Nov 10 17:52:23 2007 -0800 Charles Crayne
8888
* Clean up a few more 32-bit bottlenecks
8989
Fri Nov 9 16:37:41 2007 -0800 Charles Crayne
90-
* Update documantation for stack relative directives
90+
* Update documentation for stack relative directives
9191
Fri Nov 9 16:33:54 2007 -0800 Charles Crayne
9292
* Merge branch 'master' of /home/chuck/development/gitnasm/
9393
Fri Nov 9 16:25:43 2007 -0800 Charles Crayne
@@ -1030,7 +1030,7 @@ Sat Nov 10 21:55:19 2007 -0800 Charles Crayne
10301030
Sat Nov 10 17:52:23 2007 -0800 Charles Crayne
10311031
* Clean up a few more 32-bit bottlenecks
10321032
Fri Nov 9 16:37:41 2007 -0800 Charles Crayne
1033-
* Update documantation for stack relative directives
1033+
* Update documentation for stack relative directives
10341034
Fri Nov 9 16:33:54 2007 -0800 Charles Crayne
10351035
* Merge branch 'master' of /home/chuck/development/gitnasm/
10361036
Fri Nov 9 16:25:43 2007 -0800 Charles Crayne
@@ -1903,7 +1903,7 @@ Sat Nov 10 21:55:19 2007 -0800 Charles Crayne
19031903
Sat Nov 10 17:52:23 2007 -0800 Charles Crayne
19041904
* Clean up a few more 32-bit bottlenecks
19051905
Fri Nov 9 16:37:41 2007 -0800 Charles Crayne
1906-
* Update documantation for stack relative directives
1906+
* Update documentation for stack relative directives
19071907
Fri Nov 9 16:33:54 2007 -0800 Charles Crayne
19081908
* Merge branch 'master' of /home/chuck/development/gitnasm/
19091909
Fri Nov 9 16:25:43 2007 -0800 Charles Crayne
@@ -2851,7 +2851,7 @@ Thu Apr 12 16:12:09 2007 +0000 H. Peter Anvin
28512851
* (*.c): added c99 data-type compliance and <inttypes.h> inclusion.
28522852
* (*.pl): added c99 data-type compliance and <inttypes.h> inclusion.
28532853
* (*.h): added c99 data-type compliance.
2854-
* (assemble.h): fixed procedure defintions to sync with respective
2854+
* (assemble.h): fixed procedure definitions to sync with respective
28552855
procedure declarations.
28562856

28572857
2002-05-16 Ed Beroset <[email protected]>

INSTALL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ $ make install_everything
6767
to install everything =)
6868

6969

70-
Thats it, enjoy!
70+
That's it, enjoy!
7171

7272

7373
2. Installing NASM from source (Windows - MS Visual C++)

asm/assemble.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3247,7 +3247,7 @@ static int process_ea(operand *input, ea *output, int bits,
32473247
/*
32483248
* The type parsed might not match one supplied by
32493249
* a caller. In this case exit with error and let
3250-
* the caller to deside how critical it is.
3250+
* the caller to decide how critical it is.
32513251
*/
32523252
if (output->type != expected)
32533253
goto err_set_msg;

asm/error.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void reset_warnings(void)
169169
*
170170
* Special pseudo-warnings:
171171
*
172-
*!other [on] any warning not specifially mentioned above
172+
*!other [on] any warning not specifically mentioned above
173173
*! specifies any warning not included in any specific warning class.
174174
*
175175
*!all [all] all possible warnings

asm/nasm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2233,7 +2233,7 @@ static void help(FILE *out)
22332233
" -o outfile write output to outfile\n"
22342234
" --keep-all output files will not be removed even if an error happens\n"
22352235
"\n"
2236-
" -Xformat specifiy error reporting format (gnu or vc)\n"
2236+
" -Xformat specify error reporting format (gnu or vc)\n"
22372237
" -s redirect error messages to stdout\n"
22382238
" -Zfile redirect error messages to file\n"
22392239
"\n"
@@ -2263,7 +2263,7 @@ static void help(FILE *out)
22632263
" -Ld show byte and repeat counts in decimal, not hex\n"
22642264
" -Le show the preprocessed output\n"
22652265
" -Lf ignore .nolist (force output)\n"
2266-
" -Lm show multi-line macro calls with expanded parmeters\n"
2266+
" -Lm show multi-line macro calls with expanded parameters\n"
22672267
" -Lp output a list file every pass, in case of errors\n"
22682268
" -Ls show all single-line macro definitions\n"
22692269
" -Lw flush the output after every line (very slow!)\n"

asm/pptok.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268

269269
my %tasmtokens = ();
270270
foreach $pt (@tasm) {
271-
# TASM compatiblity token
271+
# TASM compatibility token
272272
$nasmt = '%'.$pt;
273273
if (!defined($tokens{$nasmt})) {
274274
die "$in: TASM compat token $pt does not have a ".

asm/preproc.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@ hash_findix(struct hash_table *hash, const char *str)
11181118
}
11191119

11201120
/*
1121-
* read line from standart macros set,
1121+
* read line from standard macros set,
11221122
* if there no more left -- return NULL
11231123
*/
11241124
static char *line_from_stdmac(void)
@@ -2781,7 +2781,7 @@ smacro_expand_default(const SMacro *s, Token **params, int nparams)
27812781
}
27822782

27832783
/*
2784-
* Emit a macro defintion or undef to the listing file or debug format
2784+
* Emit a macro definition or undef to the listing file or debug format
27852785
* if desired. This is similar to detoken(), but it handles the
27862786
* reverse expansion list, does not expand %! or local variable
27872787
* tokens, and does some special handling for macro parameters.
@@ -3272,7 +3272,7 @@ static bool parse_mmacro_spec(Token *tline, MMacro *def, const char *directive)
32723272
*comma = NULL;
32733273
def->ndefs--;
32743274
nasm_warn(WARN_MACRO_PARAMS_LEGACY,
3275-
"dropping trailing empty default parameter in defintion of multi-line macro `%s'",
3275+
"dropping trailing empty default parameter in definition of multi-line macro `%s'",
32763276
def->name);
32773277
}
32783278
} else {
@@ -3486,7 +3486,7 @@ static int line_directive(Token *origline, Token *tline)
34863486
const char *fname;
34873487
/*
34883488
* If this is a quoted string, ignore anything after
3489-
* it; this allows for compatiblity with gcc's
3489+
* it; this allows for compatibility with gcc's
34903490
* additional flags options.
34913491
*/
34923492

@@ -3608,7 +3608,7 @@ static int do_directive(Token *tline, Token **output)
36083608
*output = NULL; /* No output generated */
36093609
origline = tline;
36103610

3611-
/* cpp-like line directive, must not be preceeded by whitespace */
3611+
/* cpp-like line directive, must not be preceded by whitespace */
36123612
if (tok_is(tline, '#'))
36133613
return line_directive(origline, tline);
36143614

@@ -3761,7 +3761,7 @@ static int do_directive(Token *tline, Token **output)
37613761
const char *arg;
37623762

37633763
/* Directive to tell NASM what the default stack size is. The
3764-
* default is for a 16-bit stack, and this can be overriden with
3764+
* default is for a 16-bit stack, and this can be overridden with
37653765
* %stacksize large.
37663766
*/
37673767
tline = skip_white(tline->next);
@@ -4947,7 +4947,7 @@ static inline bool pp_concat_match(const Token *t, enum concat_flags mask)
49474947
}
49484948

49494949
/*
4950-
* This routines walks over tokens strem and handles tokens
4950+
* This routines walks over tokens stream and handles tokens
49514951
* pasting, if @handle_explicit passed then explicit pasting
49524952
* term is handled, otherwise -- implicit pastings only.
49534953
* The @m array can contain a series of token types which are
@@ -6370,7 +6370,7 @@ static void list_mmacro_call(const MMacro *m)
63706370
*p++ = ',';
63716371
}
63726372

6373-
*--p = '\0'; /* Replace last delimeter with null */
6373+
*--p = '\0'; /* Replace last delimiter with null */
63746374
lfmt->line(LIST_MACRO, -1, buf);
63756375
nasm_free(buf);
63766376
}
@@ -6971,7 +6971,7 @@ static void pp_reset_stdmac(enum preproc_mode mode)
69716971
* 0 = dependencies only
69726972
* 1 = preparatory passes
69736973
* 2 = final pass
6974-
* 3 = preproces only
6974+
* 3 = preprocess only
69756975
*/
69766976
switch (mode) {
69776977
case PP_NORMAL:

asm/quote.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ size_t nasm_unquote(char *str, char **ep)
481481
}
482482

483483
/*
484-
* Unquote a string indended to be used as a C string; most control
484+
* Unquote a string intended to be used as a C string; most control
485485
* characters are rejected, including whitespace characters that
486486
* would imply line endings and so on.
487487
*/

asm/warnings.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ sub find_warnings {
8585
doc => [], file => $infile, line => $nline};
8686

8787
if (defined(my $that = $aliases{$name})) {
88-
# Duplicate defintion?!
88+
# Duplicate definition?!
8989
printf STDERR "%s:%s: warning %s previously defined at %s:%s\n",
9090
$infile, $nline, $name, $that->{file}, $that->{line};
9191
} else {

autoconf/m4/pa_c_typeof.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dnl --------------------------------------------------------------------------
22
dnl PA_C_TYPEOF
33
dnl
4-
dnl Find if typeof() exists, or an equvalent (__typeof__, decltype,
4+
dnl Find if typeof() exists, or an equivalent (__typeof__, decltype,
55
dnl __decltype__)
66
dnl --------------------------------------------------------------------------
77
AC_DEFUN([PA_C_TYPEOF],

0 commit comments

Comments
 (0)