diff options
author | Werner Koch <[email protected]> | 2012-06-05 17:29:22 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2012-06-05 17:29:22 +0000 |
commit | 096e7457ec636bcfcf128678660eb2f2e19f113a (patch) | |
tree | b54df55112f195895d6d952ce3cfb3f4c98e7683 /kbx | |
parent | Print the hash algorithm in colon mode key listing. (diff) | |
download | gnupg-096e7457ec636bcfcf128678660eb2f2e19f113a.tar.gz gnupg-096e7457ec636bcfcf128678660eb2f2e19f113a.zip |
Change all quotes in strings and comments to the new GNU standard.
The asymmetric quotes used by GNU in the past (`...') don't render
nicely on modern systems. We now use two \x27 characters ('...').
The proper solution would be to use the correct Unicode symmetric
quotes here. However this has the disadvantage that the system
requires Unicode support. We don't want that today. If Unicode is
available a generated po file can be used to output proper quotes. A
simple sed script like the one used for en@quote is sufficient to
change them.
The changes have been done by applying
sed -i "s/\`\([^'\`]*\)'/'\1'/g"
to most files and fixing obvious problems by hand. The msgid strings in
the po files were fixed with a similar command.
Diffstat (limited to 'kbx')
-rw-r--r-- | kbx/kbxutil.c | 8 | ||||
-rw-r--r-- | kbx/keybox-defs.h | 6 | ||||
-rw-r--r-- | kbx/keybox-dump.c | 14 | ||||
-rw-r--r-- | kbx/keybox-update.c | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index 9762add2a..c9d56819b 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -258,7 +258,7 @@ read_file (const char *fname, size_t *r_length) nread = fread (buf+buflen, 1, NCHUNK, fp); if (nread < NCHUNK && ferror (fp)) { - log_error ("error reading `[stdin]': %s\n", strerror (errno)); + log_error ("error reading '[stdin]': %s\n", strerror (errno)); xfree (buf); return NULL; } @@ -275,13 +275,13 @@ read_file (const char *fname, size_t *r_length) fp = fopen (fname, "rb"); if (!fp) { - log_error ("can't open `%s': %s\n", fname, strerror (errno)); + log_error ("can't open '%s': %s\n", fname, strerror (errno)); return NULL; } if (fstat (fileno(fp), &st)) { - log_error ("can't stat `%s': %s\n", fname, strerror (errno)); + log_error ("can't stat '%s': %s\n", fname, strerror (errno)); fclose (fp); return NULL; } @@ -292,7 +292,7 @@ read_file (const char *fname, size_t *r_length) log_fatal ("can't allocate buffer: %s\n", strerror (errno)); if (fread (buf, buflen, 1, fp) != 1) { - log_error ("error reading `%s': %s\n", fname, strerror (errno)); + log_error ("error reading '%s': %s\n", fname, strerror (errno)); fclose (fp); xfree (buf); return NULL; diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h index 9a2930239..ee48ca390 100644 --- a/kbx/keybox-defs.h +++ b/kbx/keybox-defs.h @@ -223,19 +223,19 @@ void _keybox_free (void *p); #define return_if_fail(expr) do { \ if (!(expr)) { \ - fprintf (stderr, "%s:%d: assertion `%s' failed\n", \ + fprintf (stderr, "%s:%d: assertion '%s' failed\n", \ __FILE__, __LINE__, #expr ); \ return; \ } } while (0) #define return_null_if_fail(expr) do { \ if (!(expr)) { \ - fprintf (stderr, "%s:%d: assertion `%s' failed\n", \ + fprintf (stderr, "%s:%d: assertion '%s' failed\n", \ __FILE__, __LINE__, #expr ); \ return NULL; \ } } while (0) #define return_val_if_fail(expr,val) do { \ if (!(expr)) { \ - fprintf (stderr, "%s:%d: assertion `%s' failed\n", \ + fprintf (stderr, "%s:%d: assertion '%s' failed\n", \ __FILE__, __LINE__, #expr ); \ return (val); \ } } while (0) diff --git a/kbx/keybox-dump.c b/kbx/keybox-dump.c index f0cd0a5b8..c5f518e0f 100644 --- a/kbx/keybox-dump.c +++ b/kbx/keybox-dump.c @@ -471,7 +471,7 @@ open_file (const char **filename, FILE *outfp) if (!fp) { int save_errno = errno; - fprintf (outfp, "can't open `%s': %s\n", *filename, strerror(errno)); + fprintf (outfp, "can't open '%s': %s\n", *filename, strerror(errno)); gpg_err_set_errno (save_errno); } return fp; @@ -511,7 +511,7 @@ _keybox_dump_file (const char *filename, int stats_only, FILE *outfp) if (rc == -1) rc = 0; if (rc) - fprintf (outfp, "error reading `%s': %s\n", filename, gpg_strerror (rc)); + fprintf (outfp, "error reading '%s': %s\n", filename, gpg_strerror (rc)); if (fp != stdin) fclose (fp); @@ -592,7 +592,7 @@ _keybox_dump_find_dups (const char *filename, int print_them, FILE *outfp) if (!dupitems) { gpg_error_t tmperr = gpg_error_from_syserror (); - fprintf (outfp, "error allocating array for `%s': %s\n", + fprintf (outfp, "error allocating array for '%s': %s\n", filename, strerror(errno)); return tmperr; } @@ -603,7 +603,7 @@ _keybox_dump_find_dups (const char *filename, int print_them, FILE *outfp) unsigned char digest[20]; if (hash_blob_rawdata (blob, digest)) - fprintf (outfp, "error in blob %ld of `%s'\n", recno, filename); + fprintf (outfp, "error in blob %ld of '%s'\n", recno, filename); else if (memcmp (digest, zerodigest, 20)) { if (dupitems_count >= dupitems_size) @@ -615,7 +615,7 @@ _keybox_dump_find_dups (const char *filename, int print_them, FILE *outfp) if (!tmp) { gpg_error_t tmperr = gpg_error_from_syserror (); - fprintf (outfp, "error reallocating array for `%s': %s\n", + fprintf (outfp, "error reallocating array for '%s': %s\n", filename, strerror(errno)); free (dupitems); return tmperr; @@ -632,7 +632,7 @@ _keybox_dump_find_dups (const char *filename, int print_them, FILE *outfp) if (rc == -1) rc = 0; if (rc) - fprintf (outfp, "error reading `%s': %s\n", filename, gpg_strerror (rc)); + fprintf (outfp, "error reading '%s': %s\n", filename, gpg_strerror (rc)); if (fp != stdin) fclose (fp); @@ -691,7 +691,7 @@ _keybox_dump_cut_records (const char *filename, unsigned long from, if (rc == -1) rc = 0; if (rc) - fprintf (stderr, "error reading `%s': %s\n", filename, gpg_strerror (rc)); + fprintf (stderr, "error reading '%s': %s\n", filename, gpg_strerror (rc)); leave: if (fp != stdin) fclose (fp); diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c index 106e1ab0d..0d052c926 100644 --- a/kbx/keybox-update.c +++ b/kbx/keybox-update.c @@ -159,7 +159,7 @@ rename_tmp_file (const char *bakfname, const char *tmpfname, /* { */ /* if (chmod (tmpfname, S_IRUSR | S_IWUSR) ) */ /* { */ -/* log_debug ("chmod of `%s' failed: %s\n", */ +/* log_debug ("chmod of '%s' failed: %s\n", */ /* tmpfname, strerror(errno) ); */ /* return KEYBOX_Write_File; */ /* } */ |