summaryrefslogtreecommitdiffstats
path: root/common/helpfile.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2011-02-04 12:57:53 +0100
committerWerner Koch <wk@gnupg.org>2011-02-04 12:57:53 +0100
commitb008274afdbe375b32a7e66dbd073e200f6f0587 (patch)
tree219e239d39cf06be3f03aa82fb572080ac163a15 /common/helpfile.c
parentLet autogen.sh check the git config (diff)
downloadgnupg2-b008274afdbe375b32a7e66dbd073e200f6f0587.tar.xz
gnupg2-b008274afdbe375b32a7e66dbd073e200f6f0587.zip
Nuked almost all trailing white space.post-nuke-of-trailing-ws
We better do this once and for all instead of cluttering all future commits with diffs of trailing white spaces. In the majority of cases blank or single lines are affected and thus this change won't disturb a git blame too much. For future commits the pre-commit scripts checks that this won't happen again.
Diffstat (limited to 'common/helpfile.c')
-rw-r--r--common/helpfile.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/common/helpfile.c b/common/helpfile.c
index 34b6bdc4e..6666a800e 100644
--- a/common/helpfile.c
+++ b/common/helpfile.c
@@ -52,7 +52,7 @@ findkey_fname (const char *key, const char *fname)
while (fgets (line, DIM(line)-1, fp))
{
lnr++;
-
+
if (!*line || line[strlen(line)-1] != '\n')
{
/* Eat until end of line. */
@@ -65,7 +65,7 @@ findkey_fname (const char *key, const char *fname)
}
else
line[strlen(line)-1] = 0; /* Chop the LF. */
-
+
again:
if (!in_item)
{
@@ -96,7 +96,7 @@ findkey_fname (const char *key, const char *fname)
if (*line == '#')
continue;
if (*line == '.')
- {
+ {
if (spacep(line+1))
p = line + 2;
else
@@ -126,7 +126,7 @@ findkey_fname (const char *key, const char *fname)
log_error (_("error reading `%s', line %d: %s\n"),
fname, lnr, gpg_strerror (err));
}
-
+
fclose (fp);
if (is_membuf_ready (&mb))
{
@@ -182,7 +182,7 @@ findkey_locale (const char *key, const char *locname,
else
result = NULL;
}
-
+
if (!result && (!only_current_locale || !*locname) )
{
/* Last try: Search in file without any locale info. ("help.txt") */
@@ -204,18 +204,18 @@ findkey_locale (const char *key, const char *locname,
/etc/gnupg/help.txt
/usr/share/gnupg/help.LL.txt
/usr/share/gnupg/help.txt
-
+
Here LL denotes the two digit language code of the current locale.
If ONLY_CURRENT_LOCALE is set, the fucntion won;t fallback to the
english valiant ("help.txt") unless that locale has been requested.
-
+
The help file needs to be encoded in UTF-8, lines with a '#' in the
first column are comment lines and entirely ignored. Help keys are
identified by a key consisting of a single word with a single dot
as the first character. All key lines listed without any
intervening lines (except for comment lines) lead to the same help
text. Lines following the key lines make up the actual hep texts.
-
+
*/
char *
@@ -249,7 +249,7 @@ gnupg_get_help_string (const char *key, int only_current_locale)
if (!key || !*key)
return NULL;
- result = findkey_locale (key, locname, only_current_locale,
+ result = findkey_locale (key, locname, only_current_locale,
gnupg_sysconfdir ());
if (!result)
result = findkey_locale (key, locname, only_current_locale,