diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:58:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:58:26 -0400 |
| commit | 21de9d46e264ceb14f3fe59d17210d82f2499637 (patch) | |
| tree | 225afa4993f268fc867d922e646f0449cedebf1c /src/or/cpuworker.c | |
| parent | 5dc3c462dcf42488055685e7f4fdb4a1a48003f1 (diff) | |
| parent | da7c60dcf310fb9914bfd1b84a34b440ab04900a (diff) | |
| download | tor-21de9d46e264ceb14f3fe59d17210d82f2499637.tar.gz tor-21de9d46e264ceb14f3fe59d17210d82f2499637.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/compat.c
src/or/main.c
Diffstat (limited to 'src/or/cpuworker.c')
| -rw-r--r-- | src/or/cpuworker.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 5597cad2a8..bf8964c29c 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -225,8 +225,8 @@ cpuworker_main(void *data) { char question[ONIONSKIN_CHALLENGE_LEN]; uint8_t question_type; - int *fdarray = data; - int fd; + tor_socket_t *fdarray = data; + tor_socket_t fd; /* variables for onion processing */ char keys[CPATH_KEY_MATERIAL_LEN]; @@ -316,12 +316,12 @@ cpuworker_main(void *data) static int spawn_cpuworker(void) { - int *fdarray; - int fd; + tor_socket_t *fdarray; + tor_socket_t fd; connection_t *conn; int err; - fdarray = tor_malloc(sizeof(int)*2); + fdarray = tor_malloc(sizeof(tor_socket_t)*2); if ((err = tor_socketpair(AF_UNIX, SOCK_STREAM, 0, fdarray)) < 0) { log_warn(LD_NET, "Couldn't construct socketpair for cpuworker: %s", tor_socket_strerror(-err)); |