aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/argparse.c6
-rw-r--r--common/convert.c2
-rw-r--r--common/dotlock.c2
-rw-r--r--common/iobuf.c4
-rw-r--r--common/openpgp-oid.c4
-rw-r--r--common/percent.c2
-rw-r--r--common/sexputil.c2
-rw-r--r--common/simple-pwquery.c2
-rw-r--r--common/stringhelp.c2
-rw-r--r--common/t-exechelp.c2
10 files changed, 14 insertions, 14 deletions
diff --git a/common/argparse.c b/common/argparse.c
index 331998bb2..db0b7e079 100644
--- a/common/argparse.c
+++ b/common/argparse.c
@@ -408,7 +408,7 @@ static void
store_alias( ARGPARSE_ARGS *arg, char *name, char *value )
{
/* TODO: replace this dummy function with a rea one
- * and fix the probelms IRIX has with (ALIAS_DEV)arg..
+ * and fix the problems IRIX has with (ALIAS_DEV)arg..
* used as lvalue
*/
(void)arg;
@@ -439,7 +439,7 @@ ignore_invalid_option_p (ARGPARSE_ARGS *arg, const char *keyword)
/* Add the keywords up to the next LF to the list of to be ignored
options. After returning FP will either be at EOF or the next
- character read wll be the first of a new line. The function
+ character read will be the first of a new line. The function
returns 0 on success or true on malloc failure. */
static int
ignore_invalid_option_add (ARGPARSE_ARGS *arg, FILE *fp)
@@ -1280,7 +1280,7 @@ long_opt_strlen( ARGPARSE_OPTS *o )
* this option
* - a description,ine which starts with a '@' and is followed by
* any other characters is printed as is; this may be used for examples
- * ans such.
+ * and such.
* - A description which starts with a '|' outputs the string between this
* bar and the next one as arguments of the long option.
*/
diff --git a/common/convert.c b/common/convert.c
index 6d03adc3d..40fb4eecf 100644
--- a/common/convert.c
+++ b/common/convert.c
@@ -177,7 +177,7 @@ bin2hexcolon (const void *buffer, size_t length, char *stringbuf)
string or a white space character. The function makes sure that
the resulting string in BUFFER is terminated by a Nul byte. Note
that the returned string may include embedded Nul bytes; the extra
- Nul byte at the end is used to make sure tha the result can always
+ Nul byte at the end is used to make sure that the result can always
be used as a C-string.
BUFSIZE is the available length of BUFFER; if the converted result
diff --git a/common/dotlock.c b/common/dotlock.c
index 5227bb64e..1bc31d8a6 100644
--- a/common/dotlock.c
+++ b/common/dotlock.c
@@ -140,7 +140,7 @@
you pass (0) instead of (-1) the function does not wait in case the
file is already locked but returns -1 and sets ERRNO to EACCES.
Any other positive value for the second parameter is considered a
- timeout valuie in milliseconds.
+ timeout value in milliseconds.
To release the lock you call:
diff --git a/common/iobuf.c b/common/iobuf.c
index 8f52f7f5c..18a458e0a 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -68,8 +68,8 @@
/*-- End configurable part. --*/
-/* The size of the iobuffers. This can be chnages using the
- * iobuf_set_buffer_size fucntion. */
+/* The size of the iobuffers. This can be changed using the
+ * iobuf_set_buffer_size function. */
static unsigned int iobuf_buffer_size = DEFAULT_IOBUF_BUFFER_SIZE;
diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c
index d800e7d57..86885e0aa 100644
--- a/common/openpgp-oid.c
+++ b/common/openpgp-oid.c
@@ -184,7 +184,7 @@ openpgp_oid_from_str (const char *string, gcry_mpi_t *r_mpi)
}
-/* Return a malloced string represenation of the OID in the opaque MPI
+/* Return a malloced string representation of the OID in the opaque MPI
A. In case of an error NULL is returned and ERRNO is set. */
char *
openpgp_oid_to_str (gcry_mpi_t a)
@@ -221,7 +221,7 @@ openpgp_oid_to_str (gcry_mpi_t a)
/* To calculate the length of the string we can safely assume an
upper limit of 3 decimal characters per byte. Two extra bytes
- account for the special first octect */
+ account for the special first octet */
string = p = xtrymalloc (length*(1+3)+2+1);
if (!string)
return NULL;
diff --git a/common/percent.c b/common/percent.c
index eeb026fbe..7b817684d 100644
--- a/common/percent.c
+++ b/common/percent.c
@@ -42,7 +42,7 @@
failure.
Note that we also escape the quote character to work around a bug
- in the mingw32 runtime which does not correcty handle command line
+ in the mingw32 runtime which does not correctly handle command line
quoting. We correctly double the quote mark when calling a program
(i.e. gpg-protect-tool), but the pre-main code does not notice the
double quote as an escaped quote. We do this also on POSIX systems
diff --git a/common/sexputil.c b/common/sexputil.c
index f30790aa1..02e52d0ed 100644
--- a/common/sexputil.c
+++ b/common/sexputil.c
@@ -303,7 +303,7 @@ make_simple_sexp_from_hexstr (const char *line, size_t *nscanned)
for (; n > 1; n -=2, s += 2)
*p++ = xtoi_2 (s);
*p++ = ')';
- *p = 0; /* (Not really neaded.) */
+ *p = 0; /* (Not really needed.) */
return buf;
}
diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c
index b8ada4214..7688c846d 100644
--- a/common/simple-pwquery.c
+++ b/common/simple-pwquery.c
@@ -75,7 +75,7 @@
/* Name of the socket to be used. This is a kludge to keep on using
- the existsing code despite that we only support a standard socket. */
+ the existing code despite that we only support a standard socket. */
static char *default_gpg_agent_info;
diff --git a/common/stringhelp.c b/common/stringhelp.c
index 0abac8ae5..751e5711f 100644
--- a/common/stringhelp.c
+++ b/common/stringhelp.c
@@ -1400,7 +1400,7 @@ parse_version_number (const char *s, int *number)
/* This function breaks up the complete string-representation of the
- version number S, which is of the following struture: <major
+ version number S, which is of the following structure: <major
number>.<minor number>[.<micro number>]<patch level>. The major,
minor, and micro number components will be stored in *MAJOR, *MINOR
and *MICRO. If MICRO is not given 0 is used instead.
diff --git a/common/t-exechelp.c b/common/t-exechelp.c
index cf967fcc7..3bf082bbb 100644
--- a/common/t-exechelp.c
+++ b/common/t-exechelp.c
@@ -131,7 +131,7 @@ test_close_all_fds (void)
free (array);
/* Now let's check the realloc we use. We do this and the next
- tests only if we are allowed to open enought descriptors. */
+ tests only if we are allowed to open enough descriptors. */
if (get_max_fds () > 32)
{
int except[] = { 20, 23, 24, -1 };