Skip to content

Commit

Permalink
Fix typos.
Browse files Browse the repository at this point in the history
  • Loading branch information
waywardmonkeys authored and bnoordhuis committed Nov 30, 2011
1 parent fce9065 commit d513d9b
Show file tree
Hide file tree
Showing 22 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion README.md
@@ -1,7 +1,7 @@
# libuv

libuv is a new platform layer for Node. Its purpose is to abstract IOCP on
windows and libev on Unix systems. We intend to eventually contain all
Windows and libev on Unix systems. We intend to eventually contain all
platform differences in this library.

http://nodejs.org/
Expand Down
18 changes: 9 additions & 9 deletions include/uv.h
Expand Up @@ -106,7 +106,7 @@ typedef intptr_t ssize_t;
XX( 35, ENOSYS, "function not implemented") \
XX( 36, EPIPE, "broken pipe") \
XX( 37, EPROTO, "protocol error") \
XX( 38, EPROTONOSUPPORT, "protocol not suppored") \
XX( 38, EPROTONOSUPPORT, "protocol not supported") \
XX( 39, EPROTOTYPE, "protocol wrong type for socket") \
XX( 40, ETIMEDOUT, "connection timed out") \
XX( 41, ECHARSET, "") \
Expand Down Expand Up @@ -263,7 +263,7 @@ typedef void (*uv_after_work_cb)(uv_work_t* req);
* This will be called repeatedly after the uv_fs_event_t is initialized.
* If uv_fs_event_t was initialized with a directory the filename parameter
* will be a relative path to a file contained in the directory.
* The events paramenter is an ORed mask of enum uv_fs_event elements.
* The events parameter is an ORed mask of enum uv_fs_event elements.
*/
typedef void (*uv_fs_event_cb)(uv_fs_event_t* handle, const char* filename,
int events, int status);
Expand Down Expand Up @@ -315,8 +315,8 @@ UV_PRIVATE_REQ_TYPES
*
* Shutdown the outgoing (write) side of a duplex stream. It waits for
* pending write requests to complete. The handle should refer to a
* initialized stream. req should be an uninitalized shutdown request
* struct. The cb is a called after shutdown is complete.
* initialized stream. req should be an uninitialized shutdown request
* struct. The cb is called after shutdown is complete.
*/
UV_EXTERN int uv_shutdown(uv_shutdown_t* req, uv_stream_t* handle,
uv_shutdown_cb cb);
Expand Down Expand Up @@ -509,7 +509,7 @@ UV_EXTERN int uv_tcp_getpeername(uv_tcp_t* handle, struct sockaddr* name,
* uv_tcp_connect, uv_tcp_connect6
* These functions establish IPv4 and IPv6 TCP connections. Provide an
* initialized TCP handle and an uninitialized uv_connect_t*. The callback
* will be made when the connection is estabished.
* will be made when the connection is established.
*/
UV_EXTERN int uv_tcp_connect(uv_connect_t* req, uv_tcp_t* handle,
struct sockaddr_in address, uv_connect_cb cb);
Expand Down Expand Up @@ -884,7 +884,7 @@ UV_EXTERN int uv_timer_again(uv_timer_t* timer);

/*
* Set the repeat value. Note that if the repeat value is set from a timer
* callback it does not immediately take effect. If the timer was nonrepeating
* callback it does not immediately take effect. If the timer was non-repeating
* before, it will have been stopped. If it was repeating, then the old repeat
* value will have been used to schedule the next timeout.
*/
Expand Down Expand Up @@ -938,7 +938,7 @@ typedef struct uv_process_options_s {
const char* file; /* Path to program to execute. */
/*
* Command line arguments. args[0] should be the path to the program. On
* Windows this uses CreateProcess which concatinates the arguments into a
* Windows this uses CreateProcess which concatenates the arguments into a
* string this can cause some strange errors. See the note at
* windows_verbatim_arguments.
*/
Expand All @@ -962,7 +962,7 @@ typedef struct uv_process_options_s {
/*
* The user should supply pointers to initialized uv_pipe_t structs for
* stdio. This is used to to send or receive input from the subprocess.
* The user is reponsible for calling uv_close on them.
* The user is responsible for calling uv_close on them.
*/
uv_pipe_t* stdin_stream;
uv_pipe_t* stdout_stream;
Expand Down Expand Up @@ -1022,7 +1022,7 @@ UV_EXTERN int uv_queue_work(uv_loop_t* loop, uv_work_t* req,
* uninitialized uv_fs_t object.
*
* uv_fs_req_cleanup() must be called after completion of the uv_fs_
* function to free any internal memory allocations associted with the
* function to free any internal memory allocations associated with the
* request.
*/

Expand Down
6 changes: 3 additions & 3 deletions src/win/cares.c
Expand Up @@ -62,7 +62,7 @@ static void CALLBACK uv_ares_socksignal_tp(void* parameter,
/* do not fail if error, thread may run after socket close */
/* The code assumes that c-ares will write all pending data in the */
/* callback, unless the socket would block. We can clear the state here */
/* to avoid unecessary signals. */
/* to avoid unnecessary signals. */
WSAEnumNetworkEvents(sockhandle->sock,
sockhandle->h_event,
&network_events);
Expand Down Expand Up @@ -113,7 +113,7 @@ static void uv_ares_sockstate_cb(void *data, ares_socket_t sock, int read,
if (read == 0 && write == 0) {
/* if read and write are 0, cleanup existing data */
/* The code assumes that c-ares does a callback with read = 0 and */
/* write = 0 when the socket is closed. After we recieve this we stop */
/* write = 0 when the socket is closed. After we receive this we stop */
/* monitoring the socket. */
if (uv_handle_ares != NULL) {
uv_req_t* uv_ares_req;
Expand Down Expand Up @@ -244,7 +244,7 @@ void uv_process_ares_cleanup_req(uv_loop_t* loop, uv_ares_task_t* handle,
}
}
} else {
/* stil busy - repost and try again */
/* still busy - repost and try again */
POST_COMPLETION_FOR_REQ(loop, req);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/win/core.c
Expand Up @@ -91,7 +91,7 @@ static void uv_loop_init(uv_loop_t* loop) {


static void uv_default_loop_init(void) {
/* Intialize libuv itself first */
/* Initialize libuv itself first */
uv_once(&uv_init_guard_, uv_init);

/* Initialize the main loop */
Expand Down
2 changes: 1 addition & 1 deletion src/win/pipe.c
Expand Up @@ -249,7 +249,7 @@ void uv_pipe_endgame(uv_loop_t* loop, uv_pipe_t* handle) {
return;
}

/* Run FlushFileBuffers in the thhead pool. */
/* Run FlushFileBuffers in the thread pool. */
result = QueueUserWorkItem(pipe_shutdown_thread_proc,
req,
WT_EXECUTELONGFUNCTION);
Expand Down
8 changes: 4 additions & 4 deletions src/win/process.c
Expand Up @@ -254,7 +254,7 @@ static wchar_t* path_search_walk_ext(const wchar_t *dir,
* - CMD does not trim leading/trailing whitespace from path/pathex entries
* nor from the environment variables as a whole.
*
* - When cmd.exe cannot read a directory, it wil just skip it and go on
* - When cmd.exe cannot read a directory, it will just skip it and go on
* searching. However, unlike posix-y systems, it will happily try to run a
* file that is not readable/executable; if the spawn fails it will not
* continue searching.
Expand Down Expand Up @@ -400,7 +400,7 @@ wchar_t* quote_cmd_arg(const wchar_t *source, wchar_t *target) {
}

/*
* Expected intput/output:
* Expected input/output:
* input : hello"world
* output: "hello\"world"
* input : hello""world
Expand Down Expand Up @@ -1018,7 +1018,7 @@ int uv_spawn(uv_loop_t* loop, uv_process_t* process,

} else {
/* CreateProcessW failed, but this failure should be delivered */
/* asynchronously to retain unix compatibility. So pretent spawn */
/* asynchronously to retain unix compatibility. So pretend spawn */
/* succeeded, and start a thread instead that prints an error */
/* to the child's intended stderr. */
process->spawn_errno = GetLastError();
Expand Down Expand Up @@ -1046,7 +1046,7 @@ int uv_spawn(uv_loop_t* loop, uv_process_t* process,
close_child_stdio(process);
} else {
/* We're keeping the handles open, the thread pool is going to have */
/* it's way with them. But at least make them noninheritable. */
/* it's way with them. But at least make them non-inheritable. */
int i;
for (i = 0; i < COUNTOF(process->child_stdio); i++) {
SetHandleInformation(child_stdio[i], HANDLE_FLAG_INHERIT, 0);
Expand Down
4 changes: 2 additions & 2 deletions src/win/tcp.c
Expand Up @@ -1084,7 +1084,7 @@ int uv_tcp_duplicate_socket(uv_tcp_t* handle, int pid,
/*
* We're about to share the socket with another process. Because
* this is a listening socket, we assume that the other process will
* be accepting conections on it. So, before sharing the socket
* be accepting connections on it. So, before sharing the socket
* with another process, we call listen here in the parent process.
* This needs to be modified if the socket is shared with
* another process for anything other than accepting connections.
Expand Down Expand Up @@ -1137,7 +1137,7 @@ int uv_tcp_simultaneous_accepts(uv_tcp_t* handle, int enable) {

handle->flags |= UV_HANDLE_TCP_SINGLE_ACCEPT;

/* Flip the changing flag if we have already queueed multiple accepts. */
/* Flip the changing flag if we have already queued multiple accepts. */
if (handle->flags & UV_HANDLE_LISTENING) {
handle->flags |= UV_HANDLE_TCP_ACCEPT_STATE_CHANGING;
}
Expand Down
2 changes: 1 addition & 1 deletion src/win/timer.c
Expand Up @@ -86,7 +86,7 @@ uint64_t uv_hrtime(void) {
return 0;
}

/* Because we have no guarantee about the order of magniture of the */
/* Because we have no guarantee about the order of magnitude of the */
/* performance counter frequency, and there may not be much headroom to */
/* multiply by NANOSEC without overflowing, we use 128-bit math instead. */
return ((uint64_t) counter.LowPart * NANOSEC / uv_hrtime_frequency_) +
Expand Down
2 changes: 1 addition & 1 deletion src/win/tty.c
Expand Up @@ -739,7 +739,7 @@ int uv_tty_read_start(uv_tty_t* handle, uv_alloc_cb alloc_cb,
handle->read_cb = read_cb;
handle->alloc_cb = alloc_cb;

/* If reading was stopped and then started again, there could stell be a */
/* If reading was stopped and then started again, there could still be a */
/* read request pending. */
if (handle->flags & UV_HANDLE_READ_PENDING) {
return 0;
Expand Down
2 changes: 1 addition & 1 deletion src/win/udp.c
Expand Up @@ -362,7 +362,7 @@ int uv_udp_recv_start(uv_udp_t* handle, uv_alloc_cb alloc_cb,
handle->recv_cb = recv_cb;
handle->alloc_cb = alloc_cb;

/* If reading was stopped and then started again, there could stell be a */
/* If reading was stopped and then started again, there could still be a */
/* recv request pending. */
if (!(handle->flags & UV_HANDLE_READ_PENDING))
uv_udp_queue_recv(loop, handle);
Expand Down
2 changes: 1 addition & 1 deletion test/benchmark-ping-pongs.c
Expand Up @@ -186,7 +186,7 @@ static void pinger_new() {
pinger->state = 0;
pinger->pongs = 0;

/* Try to connec to the server and do NUM_PINGS ping-pongs. */
/* Try to connect to the server and do NUM_PINGS ping-pongs. */
r = uv_tcp_init(loop, &pinger->tcp);
ASSERT(!r);

Expand Down
2 changes: 1 addition & 1 deletion test/runner-win.c
Expand Up @@ -156,7 +156,7 @@ int process_wait(process_info_t *vec, int n, int timeout) {
HANDLE handles[MAXIMUM_WAIT_OBJECTS];
DWORD timeout_api, result;

/* If there's nothing to wait for, return immedately. */
/* If there's nothing to wait for, return immediately. */
if (n == 0)
return 0;

Expand Down
4 changes: 2 additions & 2 deletions test/runner-win.h
Expand Up @@ -19,10 +19,10 @@
* IN THE SOFTWARE.
*/

/* Don't complain about _snprintf being unsecure. */
/* Don't complain about _snprintf being insecure. */
#define _CRT_SECURE_NO_WARNINGS

/* Dont complain about write(), fileno() etc. being deprecated. */
/* Don't complain about write(), fileno() etc. being deprecated. */
#pragma warning(disable : 4996)


Expand Down
2 changes: 1 addition & 1 deletion test/runner.c
Expand Up @@ -218,7 +218,7 @@ int run_test(const char* test, int timeout, int benchmark_output) {
} else if (benchmark_output) {
switch (process_output_size(main_proc)) {
case -1:
LOGF("%s: (unavailabe)\n", test);
LOGF("%s: (unavailable)\n", test);
break;

case 0:
Expand Down
2 changes: 1 addition & 1 deletion test/test-callback-stack.c
Expand Up @@ -138,7 +138,7 @@ static void write_cb(uv_write_t* req, int status) {
/* After the data has been sent, we're going to wait for a while, then */
/* start reading. This makes us certain that the message has been echoed */
/* back to our receive buffer when we start reading. This maximizes the */
/* tempation for the backend to use dirty stack for calling read_cb. */
/* temptation for the backend to use dirty stack for calling read_cb. */
nested++;
r = uv_timer_init(uv_default_loop(), &timer);
ASSERT(r == 0);
Expand Down
2 changes: 1 addition & 1 deletion test/test-connection-fail.c
Expand Up @@ -97,7 +97,7 @@ void connection_fail(uv_connect_cb connect_cb) {
/* There should be no servers listening on this port. */
server_addr = uv_ip4_addr("127.0.0.1", TEST_PORT);

/* Try to connec to the server and do NUM_PINGS ping-pongs. */
/* Try to connect to the server and do NUM_PINGS ping-pongs. */
r = uv_tcp_init(uv_default_loop(), &tcp);
ASSERT(!r);

Expand Down
2 changes: 1 addition & 1 deletion test/test-delayed-accept.c
Expand Up @@ -152,7 +152,7 @@ static void connect_cb(uv_connect_t* req, int status) {
ASSERT(status == 0);

/* Not that the server will send anything, but otherwise we'll never know */
/* when te server closes the connection. */
/* when the server closes the connection. */
r = uv_read_start((uv_stream_t*)(req->handle), alloc_cb, read_cb);
ASSERT(r == 0);

Expand Down
2 changes: 1 addition & 1 deletion test/test-fs.c
Expand Up @@ -19,7 +19,7 @@
* IN THE SOFTWARE.
*/

/* FIXME we shouldnt need to branch in this file */
/* FIXME we shouldn't need to branch in this file */
#define UNIX (defined(__unix__) || defined(__POSIX__) || defined(__APPLE__))

#include "uv.h"
Expand Down
2 changes: 1 addition & 1 deletion test/test-getsockname.c
Expand Up @@ -83,7 +83,7 @@ static void check_sockname(struct sockaddr* addr, const char* compare_ip,
char check_ip[17];
int r;

/* Both adresses should be ipv4 */
/* Both addresses should be ipv4 */
ASSERT(check_addr.sin_family == AF_INET);
ASSERT(compare_addr.sin_family == AF_INET);

Expand Down
2 changes: 1 addition & 1 deletion test/test-loop-handles.c
Expand Up @@ -58,7 +58,7 @@
* being started by a check_1 watcher. It verifies that a watcher is
* implicitly stopped when closed, and that a watcher can close itself
* safely.
* - There is a repeating timer. It does not keep te event loop alive
* - There is a repeating timer. It does not keep the event loop alive
* (ev_unref) but makes sure that the loop keeps polling the system for
* events.
*/
Expand Down
6 changes: 3 additions & 3 deletions test/test-ping-pong.c
Expand Up @@ -154,7 +154,7 @@ static void tcp_pinger_v6_new() {
pinger->state = 0;
pinger->pongs = 0;

/* Try to connec to the server and do NUM_PINGS ping-pongs. */
/* Try to connect to the server and do NUM_PINGS ping-pongs. */
r = uv_tcp_init(uv_default_loop(), &pinger->stream.tcp);
pinger->stream.tcp.data = pinger;
ASSERT(!r);
Expand All @@ -179,7 +179,7 @@ static void tcp_pinger_new() {
pinger->state = 0;
pinger->pongs = 0;

/* Try to connec to the server and do NUM_PINGS ping-pongs. */
/* Try to connect to the server and do NUM_PINGS ping-pongs. */
r = uv_tcp_init(uv_default_loop(), &pinger->stream.tcp);
pinger->stream.tcp.data = pinger;
ASSERT(!r);
Expand All @@ -203,7 +203,7 @@ static void pipe_pinger_new() {
pinger->state = 0;
pinger->pongs = 0;

/* Try to connec to the server and do NUM_PINGS ping-pongs. */
/* Try to connect to the server and do NUM_PINGS ping-pongs. */
r = uv_pipe_init(uv_default_loop(), &pinger->stream.pipe, 0);
pinger->stream.pipe.data = pinger;
ASSERT(!r);
Expand Down
2 changes: 1 addition & 1 deletion test/test-tty.c
Expand Up @@ -28,7 +28,7 @@ TEST_IMPL(tty) {
uv_loop_t* loop = uv_default_loop();

/*
* Not necessarally a problem if this assert goes off. E.G you are piping
* Not necessarily a problem if this assert goes off. E.G you are piping
* this test to a file. 0 == stdin.
*/
ASSERT(UV_TTY == uv_guess_handle(0));
Expand Down

0 comments on commit d513d9b

Please sign in to comment.