diff options
Diffstat (limited to 'libkdenetwork/libgpgme-copy/gpgme')
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/ChangeLog | 8 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/io.h | 2 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/memrchr.c | 10 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/posix-io.c | 4 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/priv-io.h | 2 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/rungpg.c | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/libkdenetwork/libgpgme-copy/gpgme/ChangeLog b/libkdenetwork/libgpgme-copy/gpgme/ChangeLog index 4f1038fb3..85fd28d30 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/ChangeLog +++ b/libkdenetwork/libgpgme-copy/gpgme/ChangeLog @@ -2648,11 +2648,11 @@ 2002-11-25 Marcus Brinkmann <marcus@g10code.de> - * rungpg.c (_gpgme_gpg_spawn): Do not set tqparent fds to -1. + * rungpg.c (_gpgme_gpg_spawn): Do not set parent fds to -1. * posix-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead close - for tqparent fds. + for parent fds. * w32-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead - CloseHandle for tqparent fds. + CloseHandle for parent fds. 2002-11-22 Marcus Brinkmann <marcus@g10code.de> @@ -4634,7 +4634,7 @@ 2001-11-23 Marcus Brinkmann <marcus@g10code.de> - * engine-gpgsm.c (_gpgme_gpgsm_new): Set CLOEXEC flag for tqparent + * engine-gpgsm.c (_gpgme_gpgsm_new): Set CLOEXEC flag for parent ends of the pipe. 2001-11-22 Marcus Brinkmann <marcus@g10code.de> diff --git a/libkdenetwork/libgpgme-copy/gpgme/io.h b/libkdenetwork/libgpgme-copy/gpgme/io.h index 33dc5d9a1..47b748f8b 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/io.h +++ b/libkdenetwork/libgpgme-copy/gpgme/io.h @@ -50,7 +50,7 @@ int _gpgme_io_set_close_notify (int fd, void (*handler) (int, void *), int _gpgme_io_set_nonblocking (int fd); /* Spawn the executable PATH with ARGV as arguments, after forking - close all fds in FD_PARENT_LIST in the tqparent and close or dup all + close all fds in FD_PARENT_LIST in the parent and close or dup all fds in FD_CHILD_LIST in the child. */ int _gpgme_io_spawn (const char *path, char **argv, struct spawn_fd_item_s *fd_child_list, diff --git a/libkdenetwork/libgpgme-copy/gpgme/memrchr.c b/libkdenetwork/libgpgme-copy/gpgme/memrchr.c index 83d661695..4f91ef2bd 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/memrchr.c +++ b/libkdenetwork/libgpgme-copy/gpgme/memrchr.c @@ -70,7 +70,7 @@ __memrchr (s, c_in, n) { const unsigned char *char_ptr; const unsigned long int *longword_ptr; - unsigned long int longword, magic_bits, chartqmask; + unsigned long int longword, magic_bits, charmask; unsigned reg_char c; c = (unsigned char) c_in; @@ -109,10 +109,10 @@ __memrchr (s, c_in, n) #endif /* Set up a longword, each of whose bytes is C. */ - chartqmask = c | (c << 8); - chartqmask |= chartqmask << 16; + charmask = c | (c << 8); + charmask |= charmask << 16; #if LONG_MAX > LONG_MAX_32_BITS - chartqmask |= chartqmask << 32; + charmask |= charmask << 32; #endif /* Instead of the traditional loop which tests each character, @@ -154,7 +154,7 @@ __memrchr (s, c_in, n) each of whose bytes is C. This turns each byte that is C into a zero. */ - longword = *--longword_ptr ^ chartqmask; + longword = *--longword_ptr ^ charmask; /* Add MAGIC_BITS to LONGWORD. */ if ((((longword + magic_bits) diff --git a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c index 3c9fa4b13..7f3b80e70 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c +++ b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c @@ -50,7 +50,7 @@ _gpgme_io_subsystem_init (void) if (act.sa_handler == SIG_DFL) { act.sa_handler = SIG_IGN; - sigemptyset (&act.sa_tqmask); + sigemptyset (&act.sa_mask); act.sa_flags = 0; sigaction (SIGPIPE, &act, NULL); } @@ -299,7 +299,7 @@ _gpgme_io_spawn (const char *path, char **argv, if (status) return -1; - /* .dup_to is not used in the tqparent list. */ + /* .dup_to is not used in the parent list. */ for (i = 0; fd_parent_list[i].fd != -1; i++) _gpgme_io_close (fd_parent_list[i].fd); diff --git a/libkdenetwork/libgpgme-copy/gpgme/priv-io.h b/libkdenetwork/libgpgme-copy/gpgme/priv-io.h index 1d05ba03f..9a908570f 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/priv-io.h +++ b/libkdenetwork/libgpgme-copy/gpgme/priv-io.h @@ -52,7 +52,7 @@ int _gpgme_io_set_close_notify (int fd, void (*handler) (int, void *), int _gpgme_io_set_nonblocking (int fd); /* Spawn the executable PATH with ARGV as arguments, after forking - close all fds in FD_PARENT_LIST in the tqparent and close or dup all + close all fds in FD_PARENT_LIST in the parent and close or dup all fds in FD_CHILD_LIST in the child. */ int _gpgme_io_spawn (const char *path, char **argv, struct spawn_fd_item_s *fd_child_list, diff --git a/libkdenetwork/libgpgme-copy/gpgme/rungpg.c b/libkdenetwork/libgpgme-copy/gpgme/rungpg.c index 1a25dac00..d09cdf3b6 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/rungpg.c +++ b/libkdenetwork/libgpgme-copy/gpgme/rungpg.c @@ -1269,7 +1269,7 @@ start (engine_gpg_t gpg) fd_child_list[n].fd = -1; fd_child_list[n].dup_to = -1; - /* Build the fd list for the tqparent. */ + /* Build the fd list for the parent. */ n = 0; if (gpg->status.fd[1] != -1) { |