diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog-2011 | 58 | ||||
| -rw-r--r-- | src/argparse.c | 6 | ||||
| -rw-r--r-- | src/cJSON.h | 2 | ||||
| -rw-r--r-- | src/data-fd.c | 2 | ||||
| -rw-r--r-- | src/data-identify.c | 4 | ||||
| -rw-r--r-- | src/data.c | 2 | ||||
| -rw-r--r-- | src/data.h | 2 | ||||
| -rw-r--r-- | src/engine-gpg.c | 2 | ||||
| -rw-r--r-- | src/engine-gpgconf.c | 2 | ||||
| -rw-r--r-- | src/engine-gpgsm.c | 2 | ||||
| -rw-r--r-- | src/gpgme-json.c | 12 | ||||
| -rw-r--r-- | src/sign.c | 2 | ||||
| -rw-r--r-- | src/trustlist.c | 2 | ||||
| -rw-r--r-- | src/verify.c | 2 | ||||
| -rw-r--r-- | src/w32-io.c | 14 |
15 files changed, 57 insertions, 57 deletions
diff --git a/src/ChangeLog-2011 b/src/ChangeLog-2011 index c1a901a2..112d1328 100644 --- a/src/ChangeLog-2011 +++ b/src/ChangeLog-2011 @@ -514,7 +514,7 @@ * engine-backend.h (struct engine_ops): Add PASSWD. * engine-gpgsm.c (gpgsm_passwd): New. (_gpgme_engine_ops_gpgsm): Register. - (gpgsm_reset): Reset only if we have a conenction. + (gpgsm_reset): Reset only if we have a connection. * gpgme.h.in (GPGME_PK_ECDSA, GPGME_PK_ECDH): New. * gpgme.c (gpgme_pubkey_algo_name): Add them. @@ -934,7 +934,7 @@ * engine-backend.h: Define with [ENABLE_ASSUAN] instead of [ENABLE_GPGSM]. * posix-io.c (_gpgme_io_waitpid): Make non-static. - * util.h (ENABLE_ASSUAN): Declar _gpgme_assuan_system_hooks, + * util.h (ENABLE_ASSUAN): Declare _gpgme_assuan_system_hooks, _gpgme_assuan_malloc_hooks, _gpgme_assuan_log_cb. * engine-gpgsm.c: Don't map assuan error codes. Use assuan_release instead of assuan_disconnect. @@ -1401,7 +1401,7 @@ 2008-06-19 Werner Koch <[email protected]> * gpgme.h (GPGME_CONF_PATHNAME): Replace by GPGME_CONF_FILENAME, - change all callers and provide compatibilty macro. + change all callers and provide compatibility macro. (gpgme_conf_type_t): Add complex types 34..37. * engine-gpgconf.c (gpgconf_parse_option, arg_to_data) (_gpgme_conf_arg_new, _gpgme_conf_arg_release): Add new types. @@ -1806,7 +1806,7 @@ 2007-07-12 Marcus Brinkmann <[email protected]> - * Makefile.am: Replace implicite rule by suffix rule. Add + * Makefile.am: Replace implicit rule by suffix rule. Add SUFFIXES for that. 2007-07-12 Werner Koch <[email protected]> @@ -2029,7 +2029,7 @@ 2006-03-06 Marcus Brinkmann <[email protected]> - * gpgme-config.in (cflags_pth): Revert accidential removal of + * gpgme-config.in (cflags_pth): Revert accidental removal of pthread support with last change. 2006-02-28 Marcus Brinkmann <[email protected]> @@ -2052,7 +2052,7 @@ 2006-02-15 Marcus Brinkmann <[email protected]> - * w32-io.c (create_writer): Make C->have_data a manually resetted + * w32-io.c (create_writer): Make C->have_data a manually reset event. (writer): Move code from end of if block to beginning, so it is also run the first time. @@ -2368,7 +2368,7 @@ * gpgme.def: New. * versioninfo.rc.in: New. - * Makefile.am: Addes support for building a W32 DLL. + * Makefile.am: Adds support for building a W32 DLL. * ttyname_r.c (ttyname_r) [W32]: Return error. * ath-compat.c [W32]: select and co are not yet supported; return @@ -2779,7 +2779,7 @@ 2004-03-03 Werner Koch <[email protected]> * engine-gpgsm.c (gpgsm_export_ext): Properly insert a space - beween patterns. + between patterns. 2004-02-18 Werner Koch <[email protected]> @@ -3132,23 +3132,23 @@ * engine.h: Likewise for _gpgme_engine_op_export and _gpgme_engine_op_export_ext. * engine-backend.h (struct engine_ops): Change second argument of - prototype of export to const char *, and add reserverd int as + prototype of export to const char *, and add reserved int as third argument. Add prototype for export_ext. * engine.c (_gpgme_engine_op_export_ext): New function. (_gpgme_engine_op_export): Change second argument of prototype of - export to const char *, and add reserverd int as third argument. + export to const char *, and add reserved int as third argument. * rungpg.c (gpg_export): Change second argument of prototype of - export to const char *, and add reserverd int as third argument. + export to const char *, and add reserved int as third argument. (gpg_export_ext): New function. (gpg_keylist_ext): Break loop at error. (_gpgme_engine_ops_gpg): Add gpg_export_ext. * engine-gpgsm.c (gpgsm_export): Change second argument of - prototype of export to const char *, and add reserverd int as + prototype of export to const char *, and add reserved int as third argument. (gpgsm_export_ext): New function. (_gpgme_engine_ops_gpgsm): Add gpgsm_export_ext. * export.c (export_start): Change second argument of prototype of - export to const char *, and add reserverd int as third argument. + export to const char *, and add reserved int as third argument. (gpgme_op_export_start): Likewise. (export_ext_start): New function. (gpgme_op_export_ext_start): Likewise. @@ -5109,7 +5109,7 @@ * key.h (struct certsig_s): New. Use it in gpgme_key_s. * key.c (gpgme_key_release): Release it. We need to add more code of course. - (_gpgme_key_append_name): Use memset to intialize the struct. + (_gpgme_key_append_name): Use memset to initialize the struct. * gpgme.h (GPGME_KEYLIST_MODE_SIGS): New. * rungpg.c (_gpgme_gpg_op_keylist): Include sigs in listing depending non the list mode. @@ -5217,7 +5217,7 @@ 2002-07-27 Marcus Brinkmann <[email protected]> - * delete.c (delete_problem): New case ambigious specification. + * delete.c (delete_problem): New case ambiguous specification. (delete_status_handler): Handle new case (poorly). 2002-07-25 Marcus Brinkmann <[email protected]> @@ -5338,8 +5338,8 @@ * import.c (append_xml_impinfo): Kludge to print fingerprint instead of keyid for use with gpgsm. (import_status_handler): Set a flag to know whether any import - occured. - (gpgme_op_import): Reurn -1 if no certificate ewas imported. + occurred. + (gpgme_op_import): Return -1 if no certificate ewas imported. 2002-06-25 Werner Koch <[email protected]> @@ -5364,7 +5364,7 @@ (gpgsm_status_handler): Use parse_status. (gpgsm_assuan_simple_command): Accept new arguments STATUS_FNC and STATUS_FNC_VALUE and process status messages. - (gpgsm_set_recipients): Pass new arugments to gpgsm_assuan_simple_command. + (gpgsm_set_recipients): Pass new arguments to gpgsm_assuan_simple_command. (gpgsm_set_fd): Likewise. (_gpgme_gpgsm_op_keylist): Likewise. (_gpgme_gpgsm_op_keylist_ext): Likewise. @@ -5397,7 +5397,7 @@ 2002-06-13 Werner Koch <[email protected]> * verify.c (gpgme_op_verify): Make sure that we never access an - unitialized result structure. + uninitialized result structure. 2002-06-12 Werner Koch <[email protected]> @@ -5701,7 +5701,7 @@ (_gpgme_key_cache_get): Likewise. (gpgme_key_ref, gpgme_key_release): Lock the key_ref_lock. * import.c (append_xml_impinfo): Make IMPORTED_FIELDS and - IMPORT_RES_FIELDS very const. Make FIELD and FIELD_NAME a litle + IMPORT_RES_FIELDS very const. Make FIELD and FIELD_NAME a little const. * engine.c (_gpgme_engine_get_info): New variable ENGINE_INFO_LOCK. Take lock while determining engine info. @@ -6058,7 +6058,7 @@ flagged and EOF is not received. One problem is that the engine status handlers don't have access to the context, a horrible kludge works around this for now. All errors that happen during a - pending operation should be catched and reported in ctx->error, + pending operation should be caught and reported in ctx->error, including out-of-core and cancellation. This rounds up neatly a couple of loose ends, and makes it possible to pass up any errors in the communication with the backend as well. As a bonus, there @@ -6424,7 +6424,7 @@ (gpgsm_assuan_simple_command): Removed underscore from assuan_write_line. (_gpgme_gpgsm_start): Ditto. - (gpgsm_assuan_simple_command): Replaced interal Assuan read + (gpgsm_assuan_simple_command): Replaced internal Assuan read function by the new assuan_read_line. Removed the use of the internal header. (gpgsm_status_handler): Ditto. Use the new assuan_pending_line. @@ -6516,7 +6516,7 @@ 2001-11-22 Marcus Brinkmann <[email protected]> * engine-gpgsm.c: Shuffle around header inclusion a bit, to still - keep them seperate. + keep them separate. (_gpgme_set_status_handler) [!ENABLE_GPGSM]: New function. 2001-11-22 Werner Koch <[email protected]> @@ -6726,7 +6726,7 @@ passphrase result. (_gpgme_release_decrypt_result): Don't release removed members. (decrypt_status_handler): Call _gpgme_passphrase_status_handler, - and don't handle the cases catched there. + and don't handle the cases caught there. (command_handler): Removed. (gpgme_op_decrypt_start): Don't set command handler, but invoke _gpgme_passphrase_start which does it. @@ -6739,7 +6739,7 @@ passphrase result. (_gpgme_release_sign_result): Don't release removed members. (sign_status_handler): Call _gpgme_passphrase_status_handler, - and don't handle the cases catched there. + and don't handle the cases caught there. (command_handler): Removed. (gpgme_op_sign_start): Don't set command handler, but invoke _gpgme_passphrase_start which does it. @@ -6976,7 +6976,7 @@ * key.h: New keyflags for capabilities. * keylist.c (set_mainkey_capability, set_subkey_capability): New. (keylist_colon_handler): Parse them. - * gpgme.h: New attribute values for capabilties. + * gpgme.h: New attribute values for capabilities. * key.c (gpgme_key_get_string_attr): Return them. (capabilities_to_string): New. (gpgme_key_get_ulong_attr): Return the global caps. @@ -7006,9 +7006,9 @@ * w32-io.c (destroy_reader): Set stop_me flag. (writer,create_writer,destroy_writer,find_writer,kill_writer): New. - (_gpgme_io_write): Use a writer thread to avaoid blocking. + (_gpgme_io_write): Use a writer thread to avoid blocking. (_gpgme_io_close): Cleanup a writer thread - (_gpgme_io_select): Repalce tthe faked wait on writing by a real + (_gpgme_io_select): Repalce the faked wait on writing by a real waiting which is now possible due to the use of a writer thread. 2001-02-20 Werner Koch <[email protected]> @@ -7109,7 +7109,7 @@ * w32-io.c: Does now use reader threads, so that we can use WaitForMultipleObjects. - * sema.h, posix-sema.c, w32-sema.c: Support for Critcial sections. + * sema.h, posix-sema.c, w32-sema.c: Support for Critical sections. Does currently only work for W32. * debug.c, util.h : New. Changed all fprintfs to use this new diff --git a/src/argparse.c b/src/argparse.c index f3a5a485..fcefbba3 100644 --- a/src/argparse.c +++ b/src/argparse.c @@ -417,7 +417,7 @@ static void store_alias( ARGPARSE_ARGS *arg, char *name, char *value ) { /* TODO: replace this dummy function with a rea one - * and fix the probelms IRIX has with (ALIAS_DEV)arg.. + * and fix the problems IRIX has with (ALIAS_DEV)arg.. * used as lvalue */ (void)arg; @@ -448,7 +448,7 @@ ignore_invalid_option_p (ARGPARSE_ARGS *arg, const char *keyword) /* Add the keywords up to the next LF to the list of to be ignored options. After returning FP will either be at EOF or the next - character read wll be the first of a new line. The function + character read will be the first of a new line. The function returns 0 on success or true on malloc failure. */ static int ignore_invalid_option_add (ARGPARSE_ARGS *arg, FILE *fp) @@ -1230,7 +1230,7 @@ long_opt_strlen( ARGPARSE_OPTS *o ) * this option * - a description,ine which starts with a '@' and is followed by * any other characters is printed as is; this may be used for examples - * ans such. + * as such. * - A description which starts with a '|' outputs the string between this * bar and the next one as arguments of the long option. */ diff --git a/src/cJSON.h b/src/cJSON.h index a200c318..3a97c20a 100644 --- a/src/cJSON.h +++ b/src/cJSON.h @@ -145,7 +145,7 @@ extern void cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item); extern void cJSON_AddItemReferenceToObject(cJSON *object, const char *string,cJSON *item); -/* Remove/Detatch items from Arrays/Objects. */ +/* Remove/Detach items from Arrays/Objects. */ extern cJSON *cJSON_DetachItemFromArray(cJSON *array,int which); extern void cJSON_DeleteItemFromArray(cJSON *array,int which); extern cJSON *cJSON_DetachItemFromObject(cJSON *object,const char *string); diff --git a/src/data-fd.c b/src/data-fd.c index cf17f00e..dec52af7 100644 --- a/src/data-fd.c +++ b/src/data-fd.c @@ -1,4 +1,4 @@ -/* data-fd.c - A file descripor based data object. +/* data-fd.c - A file descriptor based data object. Copyright (C) 2002, 2004 g10 Code GmbH This file is part of GPGME. diff --git a/src/data-identify.c b/src/data-identify.c index 857d06c1..826c427a 100644 --- a/src/data-identify.c +++ b/src/data-identify.c @@ -258,7 +258,7 @@ pgp_binary_detection (const void *image_arg, size_t imagelen) case PKT_COMPRESSED: /* If this is the first packet we assume that that a signed * packet follows. We do not want to uncompress it here due - * to the need of a lot of code and the potentail DoS. */ + * to the need of a lot of code and the potential DoS. */ if (!anypacket) return GPGME_DATA_TYPE_PGP_SIGNED; return GPGME_DATA_TYPE_PGP_OTHER; @@ -479,7 +479,7 @@ basic_detection (char *data, size_t datalen) file pointer but there is no guarantee that it will work. FIXME: We may want to add internal buffering so that this function - can be implemented for allmost all kind of data objects. + can be implemented for almost all kind of data objects. */ gpgme_data_type_t gpgme_data_identify (gpgme_data_t dh, int reserved) @@ -409,7 +409,7 @@ gpgme_data_write (gpgme_data_t dh, const void *buffer, size_t size) /* Set the current position from where the next read or write starts - in the data object with the handle DH to OFFSET, relativ to + in the data object with the handle DH to OFFSET, relative to WHENCE. */ gpgme_off_t gpgme_data_seek (gpgme_data_t dh, gpgme_off_t offset, int whence) @@ -49,7 +49,7 @@ typedef gpgme_ssize_t (*gpgme_data_write_cb) (gpgme_data_t dh, size_t size); /* Set the current position from where the next read or write starts - in the data object with the handle DH to OFFSET, relativ to + in the data object with the handle DH to OFFSET, relative to WHENCE. */ typedef gpgme_off_t (*gpgme_data_seek_cb) (gpgme_data_t dh, gpgme_off_t offset, diff --git a/src/engine-gpg.c b/src/engine-gpg.c index 17fba809..2785bf20 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -745,7 +745,7 @@ gpg_set_status_cb (void *engine, gpgme_status_cb_t cb, void *cb_value) } -/* Note, that the status_handler is allowed to modifiy the args +/* Note, that the status_handler is allowed to modify the args value. */ static void gpg_set_status_handler (void *engine, engine_status_handler_t fnc, diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c index 24867c74..33a1da01 100644 --- a/src/engine-gpgconf.c +++ b/src/engine-gpgconf.c @@ -1041,7 +1041,7 @@ gpgconf_conf_dir (void *engine, const char *what, char **result) /* Parse a line received from gpgconf --query-swdb. This function may - * modify LINE. The result is stored at RESUL. */ + * modify LINE. The result is stored at RESULT. */ static gpg_error_t parse_swdb_line (char *line, gpgme_query_swdb_result_t result) { diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c index 6e6df469..5700990b 100644 --- a/src/engine-gpgsm.c +++ b/src/engine-gpgsm.c @@ -1661,7 +1661,7 @@ gpgsm_import (void *engine, gpgme_data_t keydata, gpgme_key_t *keyarray) && *keyarray[idx]->subkeys->fpr) buflen += strlen (keyarray[idx]->subkeys->fpr) + 1; } - /* Allocate a bufer with extra space for the trailing Nul + /* Allocate a buffer with extra space for the trailing Nul introduced by the use of stpcpy. */ buffer = malloc (buflen+1); if (!buffer) diff --git a/src/gpgme-json.c b/src/gpgme-json.c index 7809d814..ba80f081 100644 --- a/src/gpgme-json.c +++ b/src/gpgme-json.c @@ -52,7 +52,7 @@ int main (void){fputs ("Build with Libgpg-error >= 1.28!\n", stderr);return 1;} #define MIN_REPLY_CHUNK_SIZE 30 /* If no chunksize is provided we print everything. Changing - * this to a positive value will result in all messages beeing + * this to a positive value will result in all messages being * chunked. */ #define DEF_REPLY_CHUNK_SIZE 0 #define MAX_REPLY_CHUNK_SIZE (10 * 1024 * 1024) @@ -720,7 +720,7 @@ create_keylist_patterns (cjson_t request, const char *name) ret[i++] = xstrdup (tmp); tmp = p + 1; } - /* The last key is not newline delimted. */ + /* The last key is not newline delimited. */ ret[i] = *tmp ? xstrdup (tmp) : NULL; xfree (keystring); @@ -1499,11 +1499,11 @@ make_data_object (cjson_t result, gpgme_data_t data, /* Encode and chunk response. * - * If neccessary this base64 encodes and chunks the repsonse + * If necessary this base64 encodes and chunks the response * for getmore so that we always return valid json independent * of the chunksize. * - * A chunked repsonse contains the base64 encoded chunk + * A chunked response contains the base64 encoded chunk * as a string and a boolean if there is still more data * available for getmore like: * { @@ -3681,7 +3681,7 @@ native_messaging_repl (void) for (;;) { - /* Read length. Note that the protocol uses native endianess. + /* Read length. Note that the protocol uses native endianness. * Is it allowed to call such a thing a well thought out * protocol? */ if (es_read (es_stdin, &nrequest, sizeof nrequest, &n)) @@ -3702,7 +3702,7 @@ native_messaging_repl (void) log_error ("error reading request: request too long (%zu MiB)\n", (size_t)nrequest / (1024*1024)); /* Fixme: Shall we read the request to the bit bucket and - * return an error reponse or just return an error reponse + * return an error response or just return an error response * and terminate? Needs some testing. */ break; } @@ -337,7 +337,7 @@ _gpgme_sign_status_handler (void *priv, gpgme_status_code_t code, char *args) case GPGME_STATUS_INV_RECP: if (opd->inv_sgnr_seen && opd->ignore_inv_recp) break; - /* FALLTROUGH */ + /* FALLTHROUGH */ case GPGME_STATUS_INV_SGNR: if (code == GPGME_STATUS_INV_SGNR) opd->inv_sgnr_seen = 1; diff --git a/src/trustlist.c b/src/trustlist.c index d7eb4c6e..ee09e6e0 100644 --- a/src/trustlist.c +++ b/src/trustlist.c @@ -65,7 +65,7 @@ trustlist_status_handler (void *priv, gpgme_status_code_t code, char *args) With TYPE = U for a user ID K for a key The RECNO is either the one of the dir record or the one of the uid - record. OT is the the usual trust letter and only availabel on K + record. OT is the the usual trust letter and only available on K lines. VAL is the calculated validity MC is the marginal trust counter and only available on U lines CC is the same for the complete count NAME ist the username and only printed on U diff --git a/src/verify.c b/src/verify.c index 26b205aa..bd35346f 100644 --- a/src/verify.c +++ b/src/verify.c @@ -1024,7 +1024,7 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args) * a GPGME user can do a keylisting with the address * normalisation. * So when a duplicated TOFU_USER line is encountered - * we ignore the conflicting tofu stats emited afterwards. + * we ignore the conflicting tofu stats emitted afterwards. */ if (gpg_err_code (err) == GPG_ERR_DUP_VALUE) { diff --git a/src/w32-io.c b/src/w32-io.c index a6dfdbcf..b4a03448 100644 --- a/src/w32-io.c +++ b/src/w32-io.c @@ -143,7 +143,7 @@ static struct /* The context of an associated writer object or NULL. */ struct writer_context_s *writer; - /* A notification hanlder. Noet that we current support only one + /* A notification handler. Noet that we current support only one * callback per fd. */ struct { _gpgme_close_notify_handler_t handler; @@ -230,7 +230,7 @@ release_hddesc (hddesc_t hdd) hdd->refcount--; if (hdd->refcount < 1) { - /* Holds a valid handle or was never intialized (in which case + /* Holds a valid handle or was never initialized (in which case * REFCOUNT would be -1 here). */ TRACE_BEG3 (DEBUG_SYSIO, "gpgme:release_hddesc", hdd, "hd=%p, sock=%d, refcount=%d", @@ -257,7 +257,7 @@ release_hddesc (hddesc_t hdd) /* Returns our FD or -1 on resource limit. The returned integer - * references a new object which has not been intialized but can be + * references a new object which has not been initialized but can be * release with release_fd. */ static int new_fd (void) @@ -1247,12 +1247,12 @@ _gpgme_io_close (int fd) fd_table[fd].writer = NULL; } - /* The handler may not use any fd fucntion because the table is + /* The handler may not use any fd function because the table is * locked. Can we avoid this? */ handler = fd_table[fd].notify.handler; value = fd_table[fd].notify.value; - /* Release our reference to the handle descripor. Note that if no + /* Release our reference to the handle descriptor. Note that if no * reader or writer threads were used this release will also take * care that the handle descriptor is closed * (i.e. CloseHandle(hdd->hd) is called). */ @@ -1272,8 +1272,8 @@ _gpgme_io_close (int fd) /* Set a close notification callback which is called right after FD - * has been closed but before its slot (ie. the FD number) is beeing - * released. Tha HANDLER may thus use the provided value of the FD + * has been closed but before its slot (ie. the FD number) is being + * released. The HANDLER may thus use the provided value of the FD * but it may not pass it to any I/O functions. Note: Only the last * handler set for an FD is used. */ int |