diff options
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/backend-cache.c | 6 | ||||
| -rw-r--r-- | kbx/backend-kbx.c | 2 | ||||
| -rw-r--r-- | kbx/backend-sqlite.c | 6 | ||||
| -rw-r--r-- | kbx/backend.h | 2 | ||||
| -rw-r--r-- | kbx/frontend.c | 2 | ||||
| -rw-r--r-- | kbx/kbxserver.c | 2 | ||||
| -rw-r--r-- | kbx/keybox-blob.c | 2 | ||||
| -rw-r--r-- | kbx/keybox-search.c | 2 | ||||
| -rw-r--r-- | kbx/keyboxd.c | 4 |
9 files changed, 14 insertions, 14 deletions
diff --git a/kbx/backend-cache.c b/kbx/backend-cache.c index 45e5c7158..eaef01cf4 100644 --- a/kbx/backend-cache.c +++ b/kbx/backend-cache.c @@ -421,7 +421,7 @@ key_item_unref (key_item_t ki) /* Given the hash value and the search info, find the key item in the - * bucket. Return NULL if not found or the key item if fount. Always + * bucket. Return NULL if not found or the key item if found. Always * returns the the number of items searched, which is in the case of a * not-found the length of the chain. Note that FPR may only be NULL * if FPRLEN is 0. */ @@ -624,7 +624,7 @@ maybe_flush_some_key_buckets (unsigned int hash, unsigned int count) } -/* Thsi is the core of +/* This is the core of * key_table_put, * key_table_put_no_fpr, * key_table_put_no_kid. @@ -680,7 +680,7 @@ do_key_table_put (u32 kid_h, u32 kid_l, /* If the bucket is full remove a couple of items. */ if (maybe_flush_some_key_buckets (hash, count)) { - /* During the fucntion call another thread might have changed + /* During the function call another thread might have changed * the bucket. Thus we need to start over. */ do_find_again = 1; } diff --git a/kbx/backend-kbx.c b/kbx/backend-kbx.c index 1c4b04226..d70b76097 100644 --- a/kbx/backend-kbx.c +++ b/kbx/backend-kbx.c @@ -117,7 +117,7 @@ create_keybox (const char *filename) /* Make sure that at least one record is in a new keybox file, so * that the detection magic will work the next time it is used. - * We always set the OpenPGP blobs maybe availabale flag. */ + * We always set the OpenPGP blobs maybe available flag. */ fp = es_fopen (filename, "w+b,mode=-rw-------"); if (!fp) { diff --git a/kbx/backend-sqlite.c b/kbx/backend-sqlite.c index 5f716e22c..935811fd5 100644 --- a/kbx/backend-sqlite.c +++ b/kbx/backend-sqlite.c @@ -107,7 +107,7 @@ static struct /* The actual data; either X.509 certificates or OpenPGP * keyblocks. */ { "CREATE TABLE IF NOT EXISTS pubkey (" - /* The 20 octet truncted primary-fpr */ + /* The 20 octet truncated primary-fpr */ "ubid BLOB NOT NULL PRIMARY KEY," /* The type of the public key: 1 = openpgp, 2 = X.509. */ "type INTEGER NOT NULL," @@ -486,7 +486,7 @@ run_sql_statement (const char *sqlstr) } -/* Create and intitialize a new SQL database file if it does not +/* Create and initialize a new SQL database file if it does not * exists; else open it and check that all required objects are * available. */ static gpg_error_t @@ -1085,7 +1085,7 @@ store_into_userid (const unsigned char *ubid, enum pubkey_types pktype, } -/* Store (BLOB,BLOBLEN) into the database. UBID is the UBID macthing +/* Store (BLOB,BLOBLEN) into the database. UBID is the UBID matching * that blob. BACKEND_HD is the handle for this backend and REQUEST * is the current database request object. MODE is the store * mode. */ diff --git a/kbx/backend.h b/kbx/backend.h index 092f490bc..70988419a 100644 --- a/kbx/backend.h +++ b/kbx/backend.h @@ -30,7 +30,7 @@ typedef struct keybox_handle *KEYBOX_HANDLE; /* The types of the backends. */ enum database_types { - DB_TYPE_NONE, /* No database at all (unitialized etc.). */ + DB_TYPE_NONE, /* No database at all (uninitialized etc.). */ DB_TYPE_CACHE, /* The cache backend (backend-cache.c). */ DB_TYPE_KBX, /* Keybox type database (backend-kbx.c). */ DB_TYPE_SQLITE /* SQLite type database (backend-sqlite.c).*/ diff --git a/kbx/frontend.c b/kbx/frontend.c index 508bbc072..ea7d2e23f 100644 --- a/kbx/frontend.c +++ b/kbx/frontend.c @@ -223,7 +223,7 @@ kbxd_search (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, unsigned int ndesc, } /* If requested do a reset. Using the reset flag is faster than - * letting the caller do a separate call for an intial reset. */ + * letting the caller do a separate call for an initial reset. */ if (!desc || reset) { switch (the_database.db_type) diff --git a/kbx/kbxserver.c b/kbx/kbxserver.c index 5e603320a..4a5e1f48a 100644 --- a/kbx/kbxserver.c +++ b/kbx/kbxserver.c @@ -406,7 +406,7 @@ cmd_search (assuan_context_t ctx, char *line) static const char hlp_next[] = "NEXT [--no-data]\n" "\n" - "Get the next search result from a previus search."; + "Get the next search result from a previous search."; static gpg_error_t cmd_next (assuan_context_t ctx, char *line) { diff --git a/kbx/keybox-blob.c b/kbx/keybox-blob.c index b953e8c57..1210f3773 100644 --- a/kbx/keybox-blob.c +++ b/kbx/keybox-blob.c @@ -759,7 +759,7 @@ _keybox_create_openpgp_blob (KEYBOXBLOB *r_blob, /* Check whether we need a blob with 32 bit fingerprints. We could - * use this always but for backward compatiblity we do this only for + * use this always but for backward compatibility we do this only for * v5 keys. */ if (info->primary.version == 5) need_fpr32 = 1; diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c index 91d2a1735..66a383bef 100644 --- a/kbx/keybox-search.c +++ b/kbx/keybox-search.c @@ -917,7 +917,7 @@ keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc, if (!hd) return gpg_error (GPG_ERR_INV_VALUE); - /* Clear last found result but reord the offset of the last found + /* Clear last found result but record the offset of the last found * blob which we may need later. */ if (hd->found.blob) { diff --git a/kbx/keyboxd.c b/kbx/keyboxd.c index 9b46565c6..cae86efdf 100644 --- a/kbx/keyboxd.c +++ b/kbx/keyboxd.c @@ -391,7 +391,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) case oLogFile: if (!reread) - return 0; /* not handeld */ + return 0; /* not handled */ if (!current_logfile || !pargs->r.ret_str || strcmp (current_logfile, pargs->r.ret_str)) { @@ -1018,7 +1018,7 @@ kbxd_deinit_default_ctrl (ctrl_t ctrl) * Fixme: Due to the way the argument parsing works, we create a * memory leak here for all string type arguments. There is currently * no clean way to tell whether the memory for the argument has been - * allocated or points into the process' original arguments. Unless + * allocated or points into the process's original arguments. Unless * we have a mechanism to tell this, we need to live on with this. */ static void reread_configuration (void) |