[svn] GnuPG - r5232 - branches/STABLE-BRANCH-1-4/g10

[svn author wk]

Author: wk
Date: 2009-12-15 12:07:43 +0100 (Tue, 15 Dec 2009)
New Revision: 5232

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/iso7816.c
   branches/STABLE-BRANCH-1-4/g10/keydb.c
Log:
minor changes for VMS


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-12-15 11:03:17 UTC (rev 5231)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-12-15 11:07:43 UTC (rev 5232)
@@ -1,5 +1,8 @@
 2009-12-15  Werner Koch  <wk at g10code.com>
 
+	* iso7816.c (do_generate_keypair): s/readonly/read_only/.
+	* keydb.c (keydb_add_resource): Ditto.
+
 	* tdbio.c (tdbio_set_dbname): Do not call log_fatal after creating
 	the directory.  Fixes bug#1169.  Reported by Daniel Leidert.
 

Modified: branches/STABLE-BRANCH-1-4/g10/iso7816.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/iso7816.c	2009-12-15 11:03:17 UTC (rev 5231)
+++ branches/STABLE-BRANCH-1-4/g10/iso7816.c	2009-12-15 11:07:43 UTC (rev 5232)
@@ -642,7 +642,7 @@
    returned.  In that case a value of -1 uses a large default
    (e.g. 4096 bytes), a value larger 256 used that value.  */
 static gpg_error_t
-do_generate_keypair (int slot, int extended_mode, int readonly,
+do_generate_keypair (int slot, int extended_mode, int read_only,
                      const unsigned char *data, size_t datalen,
                      int le, 
                      unsigned char **result, size_t *resultlen)
@@ -655,7 +655,7 @@
   *resultlen = 0;
 
   sw = apdu_send_le (slot, extended_mode,
-                     0x00, CMD_GENERATE_KEYPAIR, readonly? 0x81:0x80, 0,
+                     0x00, CMD_GENERATE_KEYPAIR, read_only? 0x81:0x80, 0,
                      datalen, (const char*)data,
                      le >= 0 && le < 256? 256:le,
                      result, resultlen);

Modified: branches/STABLE-BRANCH-1-4/g10/keydb.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/keydb.c	2009-12-15 11:03:17 UTC (rev 5231)
+++ branches/STABLE-BRANCH-1-4/g10/keydb.c	2009-12-15 11:07:43 UTC (rev 5232)
@@ -205,12 +205,12 @@
     const char *resname = url;
     char *filename = NULL;
     int force=(flags&1);
-    int readonly=!!(flags&8);
+    int read_only=!!(flags&8);
     int rc = 0;
     KeydbResourceType rt = KEYDB_RESOURCE_TYPE_NONE;
     void *token;
 
-    if (readonly)
+    if (read_only)
       force = 0;
 
     /* Do we have an URL?
@@ -240,7 +240,7 @@
     else
 	filename = xstrdup (resname);
 
-    if (!force && !readonly)
+    if (!force && !read_only)
 	force = secret? !any_secret : !any_public;
 
     /* see whether we can determine the filetype */