diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/argparse.c | 4 | ||||
| -rw-r--r-- | common/asshelp.c | 2 | ||||
| -rw-r--r-- | common/dotlock.c | 6 | ||||
| -rw-r--r-- | common/iobuf.c | 2 | ||||
| -rw-r--r-- | common/membuf.c | 2 | ||||
| -rw-r--r-- | common/name-value.c | 2 | ||||
| -rw-r--r-- | common/session-env.c | 2 | ||||
| -rw-r--r-- | common/sexp-parse.h | 2 | ||||
| -rw-r--r-- | common/simple-pwquery.c | 2 | ||||
| -rw-r--r-- | common/simple-pwquery.h | 2 | ||||
| -rw-r--r-- | common/ttyio.c | 2 | ||||
| -rw-r--r-- | common/utf8conv.c | 2 | ||||
| -rw-r--r-- | common/yesno.c | 2 |
13 files changed, 16 insertions, 16 deletions
diff --git a/common/argparse.c b/common/argparse.c index b53efcebf..fbe8a37ff 100644 --- a/common/argparse.c +++ b/common/argparse.c @@ -61,7 +61,7 @@ /* GnuPG uses GPLv3+ but a standalone version of this defaults to GPLv2+ because that is the license of this file. Change this if you include it in a program which uses GPLv3. If you don't want to - set a a copyright string for your usage() you may also hardcode it + set a copyright string for your usage() you may also hardcode it here. */ #ifndef GNUPG_MAJOR_VERSION @@ -571,7 +571,7 @@ optfile_parse (FILE *fp, const char *filename, unsigned *lineno, int unread_buf[3]; /* We use an int so that we can store EOF. */ int unread_buf_count = 0; - if (!fp) /* Divert to to arg_parse() in this case. */ + if (!fp) /* Divert to arg_parse() in this case. */ return arg_parse (arg, opts); initialize (arg, filename, lineno); diff --git a/common/asshelp.c b/common/asshelp.c index 2cab3101b..f3a92f9e5 100644 --- a/common/asshelp.c +++ b/common/asshelp.c @@ -414,7 +414,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx, /* If the agent has been configured for use with a standard socket, an environment variable is not required and thus - we we can savely start the agent here. */ + we can safely start the agent here. */ i = 0; argv[i++] = "--homedir"; argv[i++] = abs_homedir; diff --git a/common/dotlock.c b/common/dotlock.c index 7ebd5231c..5fe652ec0 100644 --- a/common/dotlock.c +++ b/common/dotlock.c @@ -411,7 +411,7 @@ struct dotlock_handle }; -/* A list of of all lock handles. The volatile attribute might help +/* A list of all lock handles. The volatile attribute might help if used in an atexit handler. Note that [UN]LOCK_all_lockfiles must not change ERRNO. */ static volatile dotlock_t all_lockfiles; @@ -913,7 +913,7 @@ dotlock_create (const char *file_to_lock, unsigned int flags) -/* Convenience function to store a file descriptor (or any any other +/* Convenience function to store a file descriptor (or any other integer value) in the context of handle H. */ void dotlock_set_fd (dotlock_t h, int fd) @@ -921,7 +921,7 @@ dotlock_set_fd (dotlock_t h, int fd) h->extra_fd = fd; } -/* Convenience function to retrieve a file descriptor (or any any other +/* Convenience function to retrieve a file descriptor (or any other integer value) stored in the context of handle H. */ int dotlock_get_fd (dotlock_t h) diff --git a/common/iobuf.c b/common/iobuf.c index d346027e4..db66a7f17 100644 --- a/common/iobuf.c +++ b/common/iobuf.c @@ -2502,7 +2502,7 @@ iobuf_get_fname_nonnull (iobuf_t a) * Enable or disable partial body length mode (RFC 4880 4.2.2.4). * * If LEN is 0, this disables partial block mode by popping the - * partial body length filter, which which must be the most recently + * partial body length filter, which must be the most recently * added filter. * * If LEN is non-zero, it pushes a partial body length filter. If diff --git a/common/membuf.c b/common/membuf.c index 4c1a844d1..18a971d54 100644 --- a/common/membuf.c +++ b/common/membuf.c @@ -67,7 +67,7 @@ init_membuf_secure (membuf_t *mb, int initiallen) } -/* Shift the the content of the membuf MB by AMOUNT bytes. The next +/* Shift the content of the membuf MB by AMOUNT bytes. The next operation will then behave as if AMOUNT bytes had not been put into the buffer. If AMOUNT is greater than the actual accumulated bytes, the membuf is basically reset to its initial state. */ diff --git a/common/name-value.c b/common/name-value.c index 10186683f..5094acd03 100644 --- a/common/name-value.c +++ b/common/name-value.c @@ -59,7 +59,7 @@ struct name_value_entry /* The name. Comments and blank lines have NAME set to NULL. */ char *name; - /* The value as stored in the file. We store it when when we parse + /* The value as stored in the file. We store it when we parse a file so that we can reproduce it. */ strlist_t raw_value; diff --git a/common/session-env.c b/common/session-env.c index 1bc3a2bc9..c1eb1d959 100644 --- a/common/session-env.c +++ b/common/session-env.c @@ -317,7 +317,7 @@ session_env_getenv (session_env_t se, const char *name) long it has not been removed or updated by a call to session_env_putenv. If the variable does not exist, the function tries to return the value trough a call to getenv; if that returns - a value, this value is recorded and and used. If no value could be + a value, this value is recorded and used. If no value could be found, returns NULL. The caller must not change the returned value. */ char * diff --git a/common/sexp-parse.h b/common/sexp-parse.h index 9b14f77d7..4f77f1430 100644 --- a/common/sexp-parse.h +++ b/common/sexp-parse.h @@ -89,7 +89,7 @@ sskip (unsigned char const **buf, int *depth) } -/* Check whether the the string at the address BUF points to matches +/* Check whether the string at the address BUF points to matches the token. Return true on match and update BUF to point behind the token. Return false and do not update the buffer if it does not match. */ diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c index c74317f1a..e7f4af341 100644 --- a/common/simple-pwquery.c +++ b/common/simple-pwquery.c @@ -352,7 +352,7 @@ default_inq_cb (void *opaque, const char *line) /* Ask the gpg-agent for a passphrase and present the user with a DESCRIPTION, a PROMPT and optionally with a TRYAGAIN extra text. - If a CACHEID is not NULL it is used to locate the passphrase in in + If a CACHEID is not NULL it is used to locate the passphrase in the cache and store it under this ID. If OPT_CHECK is true gpg-agent is asked to apply some checks on the passphrase security. If ERRORCODE is not NULL it should point a variable receiving an diff --git a/common/simple-pwquery.h b/common/simple-pwquery.h index f98a396a5..772aa398c 100644 --- a/common/simple-pwquery.h +++ b/common/simple-pwquery.h @@ -42,7 +42,7 @@ /* Ask the gpg-agent for a passphrase and present the user with a DESCRIPTION, a PROMPT and optiaonlly with a TRYAGAIN extra text. - If a CACHEID is not NULL it is used to locate the passphrase in in + If a CACHEID is not NULL it is used to locate the passphrase in the cache and store it under this ID. If OPT_CHECK is true gpg-agent is asked to apply some checks on the passphrase security. If ERRORCODE is not NULL it should point a variable receiving an diff --git a/common/ttyio.c b/common/ttyio.c index 29af1b3ff..c7c9d85ab 100644 --- a/common/ttyio.c +++ b/common/ttyio.c @@ -602,7 +602,7 @@ tty_get( const char *prompt ) return do_get ( prompt, 0 ); } -/* Variable argument version of tty_get. The prompt is is actually a +/* Variable argument version of tty_get. The prompt is actually a format string with arguments. */ char * tty_getf (const char *promptfmt, ... ) diff --git a/common/utf8conv.c b/common/utf8conv.c index bce9e3ac6..d26eff005 100644 --- a/common/utf8conv.c +++ b/common/utf8conv.c @@ -160,7 +160,7 @@ set_native_charset (const char *newset) const char *aliases; /* We are a console program thus we need to use the - GetConsoleOutputCP function and not the the GetACP which + GetConsoleOutputCP function and not the GetACP which would give the codepage for a GUI program. Note this is not a bulletproof detection because GetConsoleCP might return a different one for console input. Not sure how to cope with diff --git a/common/yesno.c b/common/yesno.c index 58de63ddf..ebe8d8257 100644 --- a/common/yesno.c +++ b/common/yesno.c @@ -114,7 +114,7 @@ answer_is_yes_no_quit ( const char *s ) } /* - Return 1 for okay, 0 for for cancel or DEF_ANSWER for default. + Return 1 for okay, 0 for cancel or DEF_ANSWER for default. */ int answer_is_okay_cancel (const char *s, int def_answer) |