summaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2002-07-25 20:08:09 +0200
committerDavid Shaw <dshaw@jabberwocky.com>2002-07-25 20:08:09 +0200
commit9ac6821b46ddf3e7f212b6778a011c7ecce11652 (patch)
tree8efc6e4925be765c9f29956ea9d5caaae4eebfd3 /g10
parent* random.c: "warning" -> "WARNING" (diff)
downloadgnupg2-9ac6821b46ddf3e7f212b6778a011c7ecce11652.tar.xz
gnupg2-9ac6821b46ddf3e7f212b6778a011c7ecce11652.zip
* exec.c, export.c, import.c, keyedit.c, keyserver.c, misc.c: "Warning" ->
"WARNING"
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/exec.c6
-rw-r--r--g10/export.c2
-rw-r--r--g10/import.c4
-rw-r--r--g10/keyedit.c6
-rw-r--r--g10/keyserver.c4
-rw-r--r--g10/misc.c4
7 files changed, 18 insertions, 13 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 8478edce6..117ef67ce 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-25 David Shaw <dshaw@jabberwocky.com>
+
+ * exec.c, export.c, import.c, keyedit.c, keyserver.c, misc.c:
+ "Warning" -> "WARNING"
+
2002-07-24 David Shaw <dshaw@jabberwocky.com>
* main.h, import.c (parse_import_options, fix_hkp_corruption,
diff --git a/g10/exec.c b/g10/exec.c
index db440f656..6b0a10cf1 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -587,19 +587,19 @@ int exec_finish(struct exec_info *info)
if(info->tempfile_in)
{
if(unlink(info->tempfile_in)==-1)
- log_info(_("Warning: unable to remove tempfile (%s) \"%s\": %s\n"),
+ log_info(_("WARNING: unable to remove tempfile (%s) \"%s\": %s\n"),
"in",info->tempfile_in,strerror(errno));
}
if(info->tempfile_out)
{
if(unlink(info->tempfile_out)==-1)
- log_info(_("Warning: unable to remove tempfile (%s) \"%s\": %s\n"),
+ log_info(_("WARNING: unable to remove tempfile (%s) \"%s\": %s\n"),
"out",info->tempfile_out,strerror(errno));
}
if(rmdir(info->tempdir)==-1)
- log_info(_("Warning: unable to remove temp directory \"%s\": %s\n"),
+ log_info(_("WARNING: unable to remove temp directory \"%s\": %s\n"),
info->tempdir,strerror(errno));
}
diff --git a/g10/export.c b/g10/export.c
index cc9c27dc6..a77a967e3 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -315,7 +315,7 @@ do_export_stream( IOBUF out, STRLIST users, int secret,
node->pkt->pkt.secret_key->protect.sha1chk)
{
/* I hope this warning doesn't confuse people. */
- log_info("Warning: secret key %08lX does not have a "
+ log_info("WARNING: secret key %08lX does not have a "
"simple SK checksum\n",(ulong)sk_keyid[1]);
sha1_warned=1;
diff --git a/g10/import.c b/g10/import.c
index 4be313f74..bc4be7a2d 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1362,7 +1362,7 @@ revocation_present(KBNODE keyblock)
if(opt.keyserver_scheme &&
opt.keyserver_options.auto_key_retrieve)
{
- log_info(_("Warning: key %08lX may be revoked: "
+ log_info(_("WARNING: key %08lX may be revoked: "
"fetching revocation key %08lX\n"),
(ulong)keyid_from_pk(pk,NULL),
(ulong)keyid[1]);
@@ -1376,7 +1376,7 @@ revocation_present(KBNODE keyblock)
}
if(rc==G10ERR_NO_PUBKEY || rc==G10ERR_UNU_PUBKEY)
- log_info(_("Warning: key %08lX may be revoked: "
+ log_info(_("WARNING: key %08lX may be revoked: "
"revocation key %08lX not present.\n"),
(ulong)keyid_from_pk(pk,NULL),
(ulong)keyid[1]);
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 7f298c0a5..ac8ad1f51 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -374,7 +374,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
}
else if(!uidnode->pkt->pkt.user_id->created)
{
- tty_printf(_("Warning: user ID \"%s\" is not "
+ tty_printf(_("WARNING: user ID \"%s\" is not "
"self-signed.\n"),user);
}
@@ -602,12 +602,12 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
if( local )
tty_printf(
- _("\nWarning: the signature will not be marked "
+ _("\nWARNING: the signature will not be marked "
"as non-exportable.\n"));
if( nonrevocable )
tty_printf(
- _("\nWarning: the signature will not be marked "
+ _("\nWARNING: the signature will not be marked "
"as non-revocable.\n"));
}
else
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 97745f0d6..61c71569c 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -101,7 +101,7 @@ parse_keyserver_options(char *options)
#ifdef EXEC_TEMPFILE_ONLY
else if(ascii_strcasecmp(tok,"use-temp-files")==0 ||
ascii_strcasecmp(tok,"no-use-temp-files")==0)
- log_info(_("Warning: keyserver option \"%s\" is not used "
+ log_info(_("WARNING: keyserver option \"%s\" is not used "
"on this platform\n"),tok);
#else
else if(ascii_strcasecmp(tok,"use-temp-files")==0)
@@ -567,7 +567,7 @@ keyserver_spawn(int action,STRLIST list,
else if(ascii_memcasecmp(ptr,"PROGRAM ",8)==0)
{
if(ascii_memcasecmp(&ptr[8],VERSION,strlen(VERSION))!=0)
- log_info(_("Warning: keyserver handler from a different "
+ log_info(_("WARNING: keyserver handler from a different "
"version of GnuPG (%s)\n"),&ptr[8]);
}
else if(ascii_memcasecmp(ptr,"OPTION OUTOFBAND",16)==0)
diff --git a/g10/misc.c b/g10/misc.c
index c2330d959..99c6076c5 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -383,7 +383,7 @@ check_permissions(const char *path,int extension,int checkonly)
(extension && statbuf.st_uid!=0 && statbuf.st_uid!=getuid()))
{
if(!checkonly)
- log_info(_("Warning: unsafe ownership on %s \"%s\"\n"),
+ log_info(_("WARNING: unsafe ownership on %s \"%s\"\n"),
isdir?"directory":extension?"extension":"file",path);
goto end;
}
@@ -415,7 +415,7 @@ check_permissions(const char *path,int extension,int checkonly)
m_free(dir);
if(!checkonly)
- log_info(_("Warning: unsafe permissions on %s \"%s\"\n"),
+ log_info(_("WARNING: unsafe permissions on %s \"%s\"\n"),
isdir?"directory":extension?"extension":"file",path);
goto end;
}