summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Middleton <zturtleman@gmail.com>2012-06-18 16:31:16 +0000
committerTim Angus <tim@ngus.net>2013-01-12 20:31:33 +0000
commit3a8f5c5225a6eefb1613f082c078670c643cc7e8 (patch)
tree65202e3a0580ca3e4edde6b5d5f53e71c70c3b38
parentbe7a6f69aa019960319e5701cb6793292be34cfd (diff)
REFACTOR [a vs an]
From /dev/humancontroller.
-rw-r--r--src/client/cl_main.c2
-rw-r--r--src/client/snd_openal.c2
-rw-r--r--src/qcommon/huffman.c2
-rw-r--r--src/qcommon/md4.c2
-rw-r--r--src/qcommon/unzip.c4
-rw-r--r--src/qcommon/unzip.h4
-rw-r--r--src/qcommon/vm_local.h2
-rw-r--r--src/qcommon/vm_powerpc_asm.c12
-rw-r--r--src/renderer/tr_image_png.c8
-rw-r--r--src/tools/lcc/doc/4.html4
-rw-r--r--src/tools/lcc/doc/install.html4
-rw-r--r--src/tools/lcc/src/list.c2
12 files changed, 24 insertions, 24 deletions
diff --git a/src/client/cl_main.c b/src/client/cl_main.c
index dd342387..84f49983 100644
--- a/src/client/cl_main.c
+++ b/src/client/cl_main.c
@@ -4001,7 +4001,7 @@ int CL_ServerStatus( char *serverAddress, char *serverStatusString, int maxLen )
// if this server status request has the same address
if ( NET_CompareAdr( to, serverStatus->address) ) {
- // if we recieved an response for this server status request
+ // if we received a response for this server status request
if (!serverStatus->pending) {
Q_strncpyz(serverStatusString, serverStatus->string, maxLen);
serverStatus->retrieved = qtrue;
diff --git a/src/client/snd_openal.c b/src/client/snd_openal.c
index 28a7d2ee..88eaa0e9 100644
--- a/src/client/snd_openal.c
+++ b/src/client/snd_openal.c
@@ -510,7 +510,7 @@ int S_AL_SoundDuration( sfxHandle_t sfx )
=================
S_AL_BufferGet
-Return's an sfx's buffer
+Return's a sfx's buffer
=================
*/
static
diff --git a/src/qcommon/huffman.c b/src/qcommon/huffman.c
index f230c96a..7bd433d3 100644
--- a/src/qcommon/huffman.c
+++ b/src/qcommon/huffman.c
@@ -363,7 +363,7 @@ void Huff_Decompress(msg_t *mbuf, int offset) {
for ( j = 0; j < cch; j++ ) {
ch = 0;
// don't overflow reading from the messages
- // FIXME: would it be better to have a overflow check in get_bit ?
+ // FIXME: would it be better to have an overflow check in get_bit ?
if ( (bloc >> 3) > size ) {
seq[j] = 0;
break;
diff --git a/src/qcommon/md4.c b/src/qcommon/md4.c
index 838b062e..b37c87b4 100644
--- a/src/qcommon/md4.c
+++ b/src/qcommon/md4.c
@@ -38,7 +38,7 @@ struct mdfour {
/* NOTE: This code makes no attempt to be fast!
- It assumes that a int is at least 32 bits long
+ It assumes that an int is at least 32 bits long
*/
static struct mdfour *m;
diff --git a/src/qcommon/unzip.c b/src/qcommon/unzip.c
index 128502ce..2dd0bf83 100644
--- a/src/qcommon/unzip.c
+++ b/src/qcommon/unzip.c
@@ -376,11 +376,11 @@ local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
/*
Open a Zip file. path contain the full pathname (by example,
- on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
+ on a Windows NT computer "c:\\test\\zlib114.zip" or on a Unix computer
"zlib/zlib114.zip".
If the zipfile cannot be opened (file doesn't exist or in not valid), the
return value is NULL.
- Else, the return value is a unzFile Handle, usable with other function
+ Else, the return value is an unzFile Handle, usable with other function
of this unzip package.
*/
extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
diff --git a/src/qcommon/unzip.h b/src/qcommon/unzip.h
index b4a839b3..b22b72ea 100644
--- a/src/qcommon/unzip.h
+++ b/src/qcommon/unzip.h
@@ -136,11 +136,11 @@ extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
extern unzFile ZEXPORT unzOpen OF((const char *path));
/*
Open a Zip file. path contain the full pathname (by example,
- on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
+ on a Windows XP computer "c:\\zlib\\zlib113.zip" or on a Unix computer
"zlib/zlib113.zip".
If the zipfile cannot be opened (file don't exist or in not valid), the
return value is NULL.
- Else, the return value is a unzFile Handle, usable with other function
+ Else, the return value is an unzFile Handle, usable with other function
of this unzip package.
*/
diff --git a/src/qcommon/vm_local.h b/src/qcommon/vm_local.h
index 8f23a25e..7560832c 100644
--- a/src/qcommon/vm_local.h
+++ b/src/qcommon/vm_local.h
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define OPSTACK_MASK (OPSTACK_SIZE-1)
// don't change
-// Hardcoded in q3asm an reserved at end of bss
+// Hardcoded in q3asm a reserved at end of bss
#define PROGRAM_STACK_SIZE 0x10000
#define PROGRAM_STACK_MASK (PROGRAM_STACK_SIZE-1)
diff --git a/src/qcommon/vm_powerpc_asm.c b/src/qcommon/vm_powerpc_asm.c
index 19199321..dcb7e273 100644
--- a/src/qcommon/vm_powerpc_asm.c
+++ b/src/qcommon/vm_powerpc_asm.c
@@ -374,7 +374,7 @@ static const struct powerpc_operand powerpc_operands[] =
/* The SH field in an X or M form instruction. */
#define SH RS + 1
#define SH_MASK (0x1f << 11)
- /* The other UIMM field in a EVX form instruction. */
+ /* The other UIMM field in an EVX form instruction. */
#define EVUIMM SH
{ 0x1f, 11, NULL, 0 },
@@ -657,19 +657,19 @@ insert_rbs (unsigned long insn,
#define SC(op, sa, lk) (OP (op) | ((((unsigned long)(sa)) & 1) << 1) | ((lk) & 1))
#define SC_MASK (OP_MASK | (((unsigned long)0x3ff) << 16) | (((unsigned long)1) << 1) | 1)
-/* An VX form instruction. */
+/* A VX form instruction. */
#define VX(op, xop) (OP (op) | (((unsigned long)(xop)) & 0x7ff))
-/* The mask for an VX form instruction. */
+/* The mask for a VX form instruction. */
#define VX_MASK VX(0x3f, 0x7ff)
-/* An VA form instruction. */
+/* A VA form instruction. */
#define VXA(op, xop) (OP (op) | (((unsigned long)(xop)) & 0x03f))
-/* The mask for an VA form instruction. */
+/* The mask for a VA form instruction. */
#define VXA_MASK VXA(0x3f, 0x3f)
-/* An VXR form instruction. */
+/* A VXR form instruction. */
#define VXR(op, xop, rc) (OP (op) | (((rc) & 1) << 10) | (((unsigned long)(xop)) & 0x3ff))
/* The mask for a VXR form instruction. */
diff --git a/src/renderer/tr_image_png.c b/src/renderer/tr_image_png.c
index 4dc9d9bb..b30c7fea 100644
--- a/src/renderer/tr_image_png.c
+++ b/src/renderer/tr_image_png.c
@@ -962,7 +962,7 @@ static qboolean UnfilterImage(uint8_t *DecompressedData,
PixelLeft = DecompPtr;
/*
- * We only have a upleft pixel if we are on the second line or above.
+ * We only have an upleft pixel if we are on the second line or above.
*/
if(h > 0)
@@ -2131,7 +2131,7 @@ void R_LoadPNG(const char *name, byte **pic, int *width, int *height)
ChunkHeaderType = BigLong(CH->Type);
/*
- * Check if the chunk is an PLTE.
+ * Check if the chunk is a PLTE.
*/
if(!(ChunkHeaderType == PNG_ChunkType_PLTE))
@@ -2202,7 +2202,7 @@ void R_LoadPNG(const char *name, byte **pic, int *width, int *height)
}
/*
- * transparency information is sometimes stored in an tRNS chunk
+ * transparency information is sometimes stored in a tRNS chunk
*/
/*
@@ -2233,7 +2233,7 @@ void R_LoadPNG(const char *name, byte **pic, int *width, int *height)
ChunkHeaderType = BigLong(CH->Type);
/*
- * Check if the chunk is an tRNS.
+ * Check if the chunk is a tRNS.
*/
if(!(ChunkHeaderType == PNG_ChunkType_tRNS))
diff --git a/src/tools/lcc/doc/4.html b/src/tools/lcc/doc/4.html
index c36f280b..0b4b36d2 100644
--- a/src/tools/lcc/doc/4.html
+++ b/src/tools/lcc/doc/4.html
@@ -99,7 +99,7 @@ the symbol's <code>type</code> field.</p>
<h2><a NAME="operators">5.5 Dag Operators</a></h2>
-<p>The <code>op</code> field a of <code>node</code> structure holds a dag operator, which
+<p>The <code>op</code> field of a <code>node</code> structure holds a dag operator, which
consists of a generic operator, a type suffix, and a size indicator. The type suffixes
are:</p>
@@ -516,7 +516,7 @@ e.g.,</p>
<p>The type suffix for a conversion operator denotes the type of the result and the size
indicator gives the size of the result. For example, <code>CVUI4</code> converts an
unsigned (<code>U</code>) to a 4-byte signed integer (<code>I4</code>). The <code>syms[0]</code>
-field points to a symbol-table entry for a integer constant that gives the size of the
+field points to a symbol-table entry for an integer constant that gives the size of the
source operand. For example, if <code>syms[0]</code> in a <code>CVUI4</code> points to a
symbol-table entry for 2, the conversion widens a 2-byte unsigned integer to a 4-byte
signed integer. Conversions that widen unsigned integers zero-extend; those that widen
diff --git a/src/tools/lcc/doc/install.html b/src/tools/lcc/doc/install.html
index 3cc59a8f..3410e8f1 100644
--- a/src/tools/lcc/doc/install.html
+++ b/src/tools/lcc/doc/install.html
@@ -722,7 +722,7 @@ C:\dist\lcc\4.1&gt;copy %BUILDDIR%\bprint.exe \bin
<h2><a NAME="bugs">Reporting Bugs</a></h2>
<p>lcc is a large, complex program. We find and repair errors routinely. If you think that
-you've found a error, follow the steps below, which are adapted from the instructions in
+you've found an error, follow the steps below, which are adapted from the instructions in
Chapter 1 of <cite>A Retargetable C Compiler: Design and Implementation</cite>.
<ol>
@@ -751,7 +751,7 @@ Chapter 1 of <cite>A Retargetable C Compiler: Design and Implementation</cite>.
HREF="ftp://ftp.cs.princeton.edu/pub/lcc"><code>pub/lcc</code></a>. A <a
HREF="ftp://ftp.cs.princeton.edu/pub/lcc/README"><code>README</code></a> file there gives
acquistion details, and the <a HREF="../LOG"><code>LOG</code></a> file reports what errors
- were fixed and when they were fixed. If you report a error that's been fixed, you might
+ were fixed and when they were fixed. If you report an error that's been fixed, you might
get a canned reply.</li>
<li>Send your program by electronic mail to <code>lcc-bugs@cs.princeton.edu</code>. Please
send only valid C programs; put all remarks in C comments so that we can process reports
diff --git a/src/tools/lcc/src/list.c b/src/tools/lcc/src/list.c
index 29e660ab..9c3ec9f6 100644
--- a/src/tools/lcc/src/list.c
+++ b/src/tools/lcc/src/list.c
@@ -33,7 +33,7 @@ int length(List list) {
return n;
}
-/* ltov - convert list to an NULL-terminated vector allocated in arena */
+/* ltov - convert list to a NULL-terminated vector allocated in arena */
void *ltov(List *list, unsigned arena) {
int i = 0;
void **array = newarray(length(*list) + 1, sizeof array[0], arena);